callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only set using_themed_icon if we actually got an icon list from the theme.

Browse Source 
2004-10-04  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkwindow.c (gtk_window_realize_icon): Only set
	using_themed_icon if we actually got an icon list from the
	theme.  (#154472, Morten Welinder)
This commit is contained in:
Matthias Clasen 2004-10-04 15:16:57 +00:00 committed by Matthias Clasen
parent ce2ddb38d7
commit 9de1565a99
5 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -3,6 +3,9 @@
* gtk/gtkwindow.c (gtk_window_set_icon_list): * gtk/gtkwindow.c (gtk_window_set_icon_list):
(gtk_window_set_default_icon_list): Ref the new icons (gtk_window_set_default_icon_list): Ref the new icons
before unreffing the old ones. (#154468, Morten Welinder) before unreffing the old ones. (#154468, Morten Welinder)
(gtk_window_realize_icon): Only set using_themed_icon if
we actually got an icon list from the theme. (#154472, Morten
Welinder)
2004-10-03 Matthias Clasen <mclasen@redhat.com> 2004-10-03 Matthias Clasen <mclasen@redhat.com>

3
ChangeLog.pre-2-10
View File

@ -3,6 +3,9 @@
* gtk/gtkwindow.c (gtk_window_set_icon_list): * gtk/gtkwindow.c (gtk_window_set_icon_list):
(gtk_window_set_default_icon_list): Ref the new icons (gtk_window_set_default_icon_list): Ref the new icons
before unreffing the old ones. (#154468, Morten Welinder) before unreffing the old ones. (#154468, Morten Welinder)
(gtk_window_realize_icon): Only set using_themed_icon if
we actually got an icon list from the theme. (#154472, Morten
Welinder)
2004-10-03 Matthias Clasen <mclasen@redhat.com> 2004-10-03 Matthias Clasen <mclasen@redhat.com>

3
ChangeLog.pre-2-6
View File

@ -3,6 +3,9 @@
* gtk/gtkwindow.c (gtk_window_set_icon_list): * gtk/gtkwindow.c (gtk_window_set_icon_list):
(gtk_window_set_default_icon_list): Ref the new icons (gtk_window_set_default_icon_list): Ref the new icons
before unreffing the old ones. (#154468, Morten Welinder) before unreffing the old ones. (#154468, Morten Welinder)
(gtk_window_realize_icon): Only set using_themed_icon if
we actually got an icon list from the theme. (#154472, Morten
Welinder)
2004-10-03 Matthias Clasen <mclasen@redhat.com> 2004-10-03 Matthias Clasen <mclasen@redhat.com>

3
ChangeLog.pre-2-8
View File

@ -3,6 +3,9 @@
* gtk/gtkwindow.c (gtk_window_set_icon_list): * gtk/gtkwindow.c (gtk_window_set_icon_list):
(gtk_window_set_default_icon_list): Ref the new icons (gtk_window_set_default_icon_list): Ref the new icons
before unreffing the old ones. (#154468, Morten Welinder) before unreffing the old ones. (#154468, Morten Welinder)
(gtk_window_realize_icon): Only set using_themed_icon if
we actually got an icon list from the theme. (#154472, Morten
Welinder)
2004-10-03 Matthias Clasen <mclasen@redhat.com> 2004-10-03 Matthias Clasen <mclasen@redhat.com>

1
gtk/gtkwindow.c
View File

@ -2713,6 +2713,7 @@ gtk_window_realize_icon (GtkWindow *window)
if (icon_list == NULL && info->icon_name) if (icon_list == NULL && info->icon_name)
{ {
icon_list = icon_list_from_theme (widget, info->icon_name); icon_list = icon_list_from_theme (widget, info->icon_name);
if (icon_list)
info->using_themed_icon = TRUE; info->using_themed_icon = TRUE;
} }