From: Jonas Ådahl <jadahl@gmail.com>
Date: Fri, 13 Mar 2015 07:43:49 +0000 (+0800)
Subject: wayland: Ignore setting the same cursor theme as was already set
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~24^2~10177
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7372ddd2a1bed3c085cd8a23765aaa442735f48b;p=gtk4.git

wayland: Ignore setting the same cursor theme as was already set

If the name and size of the theme is identical to the current
configuration, do nothing.

https://bugzilla.gnome.org/show_bug.cgi?id=746141
---

diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c
index 5caf0e1684..dd06018e51 100644
--- a/gdk/wayland/gdkdisplay-wayland.c
+++ b/gdk/wayland/gdkdisplay-wayland.c
@@ -586,6 +586,10 @@ gdk_wayland_display_set_cursor_theme (GdkDisplay  *display,
   g_assert (wayland_display);
   g_assert (wayland_display->shm);
 
+  if (g_strcmp0 (name, wayland_display->cursor_theme_name) == 0 &&
+      wayland_display->cursor_theme_size == size)
+    return;
+
   theme = wl_cursor_theme_load (name, size, wayland_display->shm);
   if (theme == NULL)
     {