Update for swaywm/wlroots#1126

6 files changed, 11 insertions, 11 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."
diff --git a/common/ipc-client.c b/common/ipc-client.c
index a88df080..4d2d88cc 100644
--- a/common/ipc-client.c
+++ b/common/ipc-client.c
@@ -97,7 +97,7 @@ struct ipc_response *ipc_recv_response(int socketfd) {
 error_2:
         free(response);
 error_1:
-        wlr_log(L_ERROR, "Unable to allocate memory for IPC response");
+        wlr_log(WLR_ERROR, "Unable to allocate memory for IPC response");
         return NULL;
 }
 
diff --git a/common/log.c b/common/log.c
index 2cc7289c..847f3952 100644
--- a/common/log.c
+++ b/common/log.c
@@ -8,7 +8,7 @@ void sway_terminate(int code);
 void _sway_abort(const char *format, ...) {
         va_list args;
         va_start(args, format);
-        _wlr_vlog(L_ERROR, format, args);
+        _wlr_vlog(WLR_ERROR, format, args);
         va_end(args);
         sway_terminate(EXIT_FAILURE);
 }
@@ -20,7 +20,7 @@ bool _sway_assert(bool condition, const char *format, ...) {
 
         va_list args;
         va_start(args, format);
-        _wlr_vlog(L_ERROR, format, args);
+        _wlr_vlog(WLR_ERROR, format, args);
         va_end(args);
 
 #ifndef NDEBUG
diff --git a/common/pango.c b/common/pango.c
index c88e50ce..92703f80 100644
--- a/common/pango.c
+++ b/common/pango.c
@@ -81,7 +81,7 @@ PangoLayout *get_pango_layout(cairo_t *cairo, const char *font,
                         pango_layout_set_markup(layout, buf, -1);
                         free(buf);
                 } else {
-                        wlr_log(L_ERROR, "pango_parse_markup '%s' -> error %s", text,
+                        wlr_log(WLR_ERROR, "pango_parse_markup '%s' -> error %s", text,
                                         error->message);
                         g_error_free(error);
                         markup = false; // fallback to plain text
diff --git a/common/readline.c b/common/readline.c
index 1c396a90..a2c69018 100644
--- a/common/readline.c
+++ b/common/readline.c
@@ -9,7 +9,7 @@ char *read_line(FILE *file) {
         char *string = malloc(size);
         char lastChar = '\0';
         if (!string) {
-                wlr_log(L_ERROR, "Unable to allocate memory for read_line");
+                wlr_log(WLR_ERROR, "Unable to allocate memory for read_line");
                 return NULL;
         }
         while (1) {
@@ -30,7 +30,7 @@ char *read_line(FILE *file) {
                         char *new_string = realloc(string, size *= 2);
                         if (!new_string) {
                                 free(string);
-                                wlr_log(L_ERROR, "Unable to allocate memory for read_line");
+                                wlr_log(WLR_ERROR, "Unable to allocate memory for read_line");
                                 return NULL;
                         }
                         string = new_string;
diff --git a/common/util.c b/common/util.c
index 678926ed..e8a88772 100644
--- a/common/util.c
+++ b/common/util.c
@@ -113,7 +113,7 @@ uint32_t parse_color(const char *color) {
 
         int len = strlen(color);
         if (len != 6 && len != 8) {
-                wlr_log(L_DEBUG, "Invalid color %s, defaulting to color 0xFFFFFFFF", color);
+                wlr_log(WLR_DEBUG, "Invalid color %s, defaulting to color 0xFFFFFFFF", color);
                 return 0xFFFFFFFF;
         }
         uint32_t res = (uint32_t)strtoul(color, NULL, 16);