+Mon Oct 13 20:58:07 2003 Matthias Clasen <maclas@gmx.de>
+
+ * gdk/x11/gdkwindow-x11.c (gdk_window_set_icon): Make it work
+ as documented when pixmap or mask is NULL. (#124081)
+
Mon Oct 13 20:21:38 2003 Kristian Rietveld <kris@gtk.org>
* gtk/gtkentry.c (gtk_entry_set_text): I overlooked a return when
+Mon Oct 13 20:58:07 2003 Matthias Clasen <maclas@gmx.de>
+
+ * gdk/x11/gdkwindow-x11.c (gdk_window_set_icon): Make it work
+ as documented when pixmap or mask is NULL. (#124081)
+
Mon Oct 13 20:21:38 2003 Kristian Rietveld <kris@gtk.org>
* gtk/gtkentry.c (gtk_entry_set_text): I overlooked a return when
+Mon Oct 13 20:58:07 2003 Matthias Clasen <maclas@gmx.de>
+
+ * gdk/x11/gdkwindow-x11.c (gdk_window_set_icon): Make it work
+ as documented when pixmap or mask is NULL. (#124081)
+
Mon Oct 13 20:21:38 2003 Kristian Rietveld <kris@gtk.org>
* gtk/gtkentry.c (gtk_entry_set_text): I overlooked a return when
+Mon Oct 13 20:58:07 2003 Matthias Clasen <maclas@gmx.de>
+
+ * gdk/x11/gdkwindow-x11.c (gdk_window_set_icon): Make it work
+ as documented when pixmap or mask is NULL. (#124081)
+
Mon Oct 13 20:21:38 2003 Kristian Rietveld <kris@gtk.org>
* gtk/gtkentry.c (gtk_entry_set_text): I overlooked a return when
+Mon Oct 13 20:58:07 2003 Matthias Clasen <maclas@gmx.de>
+
+ * gdk/x11/gdkwindow-x11.c (gdk_window_set_icon): Make it work
+ as documented when pixmap or mask is NULL. (#124081)
+
Mon Oct 13 20:21:38 2003 Kristian Rietveld <kris@gtk.org>
* gtk/gtkentry.c (gtk_entry_set_text): I overlooked a return when
if (toplevel->icon_pixmap != pixmap)
{
+ if (pixmap)
+ g_object_ref (pixmap);
if (toplevel->icon_pixmap)
g_object_unref (toplevel->icon_pixmap);
- toplevel->icon_pixmap = g_object_ref (pixmap);
+ toplevel->icon_pixmap = pixmap;
}
if (toplevel->icon_mask != mask)
{
+ if (mask)
+ g_object_ref (mask);
if (toplevel->icon_mask)
g_object_unref (toplevel->icon_mask);
- toplevel->icon_mask = g_object_ref (mask);
+ toplevel->icon_mask = mask;
}
update_wm_hints (window, FALSE);