diff --git a/ChangeLog b/ChangeLog
index 807bcf3946..9b7dbf45de 100644
--- 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 e0c76c43f8..095a11a796 100644
--- 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);