diff options
| author | Ryan Dwyer <RyanDwyer@users.noreply.github.com> | 2018-07-18 09:32:03 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-18 09:32:03 +1000 |
| commit | 8ce7e3b44eea0a270ecc35a9da2ae801aaf6bce1 (patch) | |
| tree | 6badffb0c6ee33b4e23e914c4c9f9b39a625b5f3 /common/background-image.c | |
| parent | 621d2666b1ac214c63628bbe0ac8f5d6485cb501 (diff) | |
| parent | 48b911a4596f50b585a1073d32413236d9defb60 (diff) | |
Merge branch 'master' into destroy-output-destroy-empty-workspaces
Diffstat (limited to 'common/background-image.c')
| -rw-r--r-- | common/background-image.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/common/background-image.c b/common/background-image.c index e5fb4433..f3d2551e 100644 --- a/common/background-image.c +++ b/common/background-image.c @@ -18,7 +18,7 @@ enum background_mode parse_background_mode(const char *mode) { } else if (strcmp(mode, "solid_color") == 0) { return BACKGROUND_MODE_SOLID_COLOR; } - wlr_log(L_ERROR, "Unsupported background mode: %s", mode); + wlr_log(WLR_ERROR, "Unsupported background mode: %s", mode); return BACKGROUND_MODE_INVALID; } @@ -28,7 +28,7 @@ cairo_surface_t *load_background_image(const char *path) { GError *err = NULL; GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file(path, &err); if (!pixbuf) { - wlr_log(L_ERROR, "Failed to load background image (%s).", + wlr_log(WLR_ERROR, "Failed to load background image (%s).", err->message); return false; } @@ -38,11 +38,11 @@ cairo_surface_t *load_background_image(const char *path) { image = cairo_image_surface_create_from_png(path); #endif //HAVE_GDK_PIXBUF if (!image) { - wlr_log(L_ERROR, "Failed to read background image."); + wlr_log(WLR_ERROR, "Failed to read background image."); return NULL; } if (cairo_surface_status(image) != CAIRO_STATUS_SUCCESS) { - wlr_log(L_ERROR, "Failed to read background image: %s." + wlr_log(WLR_ERROR, "Failed to read background image: %s." #ifndef HAVE_GDK_PIXBUF "\nSway was compiled without gdk_pixbuf support, so only" "\nPNG images can be loaded. This is the likely cause." |