From 9de1565a99be70346075599fb6f03b9eb0872554 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 4 Oct 2004 15:16:57 +0000 Subject: [PATCH] Only set using_themed_icon if we actually got an icon list from the theme. 2004-10-04 Matthias Clasen * 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) --- ChangeLog | 3 +++ ChangeLog.pre-2-10 | 3 +++ ChangeLog.pre-2-6 | 3 +++ ChangeLog.pre-2-8 | 3 +++ gtk/gtkwindow.c | 3 ++- 5 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2bc45dcdf6..6be20206a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,9 @@ * gtk/gtkwindow.c (gtk_window_set_icon_list): (gtk_window_set_default_icon_list): Ref the new icons 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 diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 2bc45dcdf6..6be20206a9 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -3,6 +3,9 @@ * gtk/gtkwindow.c (gtk_window_set_icon_list): (gtk_window_set_default_icon_list): Ref the new icons 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 diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 2bc45dcdf6..6be20206a9 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -3,6 +3,9 @@ * gtk/gtkwindow.c (gtk_window_set_icon_list): (gtk_window_set_default_icon_list): Ref the new icons 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 diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 2bc45dcdf6..6be20206a9 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -3,6 +3,9 @@ * gtk/gtkwindow.c (gtk_window_set_icon_list): (gtk_window_set_default_icon_list): Ref the new icons 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 diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index b61efceb9d..41c64cb5b0 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -2713,7 +2713,8 @@ gtk_window_realize_icon (GtkWindow *window) if (icon_list == NULL && info->icon_name) { icon_list = icon_list_from_theme (widget, info->icon_name); - info->using_themed_icon = TRUE; + if (icon_list) + info->using_themed_icon = TRUE; } /* Inherit from transient parent */