AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-25 05:01:09 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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)
This commit is contained in:
Matthias Clasen 2003-10-13 19:00:19 +00:00 committed by Matthias Clasen
parent a450820237
commit 2baa63a100
6 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
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> Mon Oct 13 20:21:38 2003 Kristian Rietveld <kris@gtk.org>
* gtk/gtkentry.c (gtk_entry_set_text): I overlooked a return when * gtk/gtkentry.c (gtk_entry_set_text): I overlooked a return when

5
ChangeLog.pre-2-10
View File

@ -1,3 +1,8 @@
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> Mon Oct 13 20:21:38 2003 Kristian Rietveld <kris@gtk.org>
* gtk/gtkentry.c (gtk_entry_set_text): I overlooked a return when * gtk/gtkentry.c (gtk_entry_set_text): I overlooked a return when

5
ChangeLog.pre-2-4
View File

@ -1,3 +1,8 @@
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> Mon Oct 13 20:21:38 2003 Kristian Rietveld <kris@gtk.org>
* gtk/gtkentry.c (gtk_entry_set_text): I overlooked a return when * gtk/gtkentry.c (gtk_entry_set_text): I overlooked a return when

5
ChangeLog.pre-2-6
View File

@ -1,3 +1,8 @@
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> Mon Oct 13 20:21:38 2003 Kristian Rietveld <kris@gtk.org>
* gtk/gtkentry.c (gtk_entry_set_text): I overlooked a return when * gtk/gtkentry.c (gtk_entry_set_text): I overlooked a return when

5
ChangeLog.pre-2-8
View File

@ -1,3 +1,8 @@
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> Mon Oct 13 20:21:38 2003 Kristian Rietveld <kris@gtk.org>
* gtk/gtkentry.c (gtk_entry_set_text): I overlooked a return when * gtk/gtkentry.c (gtk_entry_set_text): I overlooked a return when

8
gdk/x11/gdkwindow-x11.c
View File

@ -3373,16 +3373,20 @@ gdk_window_set_icon (GdkWindow *window,
if (toplevel->icon_pixmap != pixmap) if (toplevel->icon_pixmap != pixmap)
{ {
if (pixmap)
g_object_ref (pixmap);
if (toplevel->icon_pixmap) if (toplevel->icon_pixmap)
g_object_unref (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 (toplevel->icon_mask != mask)
{ {
if (mask)
g_object_ref (mask);
if (toplevel->icon_mask) if (toplevel->icon_mask)
g_object_unref (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); update_wm_hints (window, FALSE);