Merge branch 'master' into focus-mode-toggle

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."