Commit 2baa63a1 authored by Matthias Clasen's avatar Matthias Clasen Committed by Matthias Clasen

Make it work as documented when pixmap or mask is NULL. (#124081)

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)
parent a4508202
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
......
......@@ -3373,16 +3373,20 @@ gdk_window_set_icon (GdkWindow *window,
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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment