summaryrefslogtreecommitdiff
path: root/gdk/x11
diff options
context:
space:
mode:
authorMatthias Clasen <maclas@gmx.de>2003-10-13 19:00:19 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2003-10-13 19:00:19 +0000
commit2baa63a100d76110915133c7fcb728c8545b11ca (patch)
treeab5cb95e21eecfd0da6a1b721c952133a584e561 /gdk/x11
parenta4508202375ba69f8534c6a94116b73b0c5b8656 (diff)
downloadgdk-pixbuf-2baa63a100d76110915133c7fcb728c8545b11ca.tar.gz
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)
Diffstat (limited to 'gdk/x11')
-rw-r--r--gdk/x11/gdkwindow-x11.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index ce7804b3a..6366c8531 100644
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -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);