[gtk+/gtk-3-22] Reduce a warning to a message



commit cf4fd0d3e384e525b1f21ec02b898c9d7c14eebc
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Oct 17 15:26:29 2016 -0400

    Reduce a warning to a message
    
    The warning interferes with having a testcase to check this behavior,
    so reduce this to a message.

 gdk/wayland/gdkcursor-wayland.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/gdk/wayland/gdkcursor-wayland.c b/gdk/wayland/gdkcursor-wayland.c
index 35cf8cd..ab50755 100644
--- a/gdk/wayland/gdkcursor-wayland.c
+++ b/gdk/wayland/gdkcursor-wayland.c
@@ -167,7 +167,7 @@ _gdk_wayland_cursor_update (GdkWaylandDisplay *display_wayland,
 
   if (!c)
     {
-      g_warning (G_STRLOC ": Unable to load %s from the cursor theme", cursor->name);
+      g_message ("Unable to load %s from the cursor theme", cursor->name);
       return FALSE;
     }
 
@@ -353,7 +353,10 @@ _gdk_wayland_display_get_cursor_for_name_with_scale (GdkDisplay  *display,
     return GDK_CURSOR (private);
 
   if (!_gdk_wayland_cursor_update (display_wayland, private))
-    return GDK_CURSOR (private);
+    {
+      g_object_unref (private);
+      return NULL;
+    }
 
   /* Insert into cache. */
   g_hash_table_insert (display_wayland->cursor_cache,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]