Don't cause lots of X traffic when the icon name doesn't actually change.

        * gtk/gtkwindow.c (gtk_window_set_icon_name): Don't cause lots
        of X traffic when the icon name doesn't actually change. Some
        apps like to reset their window icon frequently, without actually
        changing the icon name...

svn path=/trunk/; revision=22103

diff --git a/ChangeLog b/ChangeLog
index 807bcf394605bdba870ef71987ab86eeb1f8412f..9b7dbf45de484a142ef3eadfe6e1c7c6a2b98115 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-01-12  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_set_icon_name): Don't cause lots
+       of X traffic when the icon name doesn't actually change. Some
+       apps like to reset their window icon frequently, without actually
+       changing the icon name...
+
 2009-01-12  Paolo Borelli  <pborelli@katamail.com>
 
        Bug 492794 – Pasting external text at end of view yields wrong

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index e0c76c43f8e46943e9b333bf8ee5c64234735418..095a11a796ea5c84f28a2442d72429f02c25bd8a 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -3507,6 +3507,9 @@ gtk_window_set_icon_name (GtkWindow   *window,
 
   info = ensure_icon_info (window);
 
+  if (g_strcmp0 (info->icon_name, name) == 0)
+    return;
+
   tmp = info->icon_name;
   info->icon_name = g_strdup (name);
   g_free (tmp);