summaryrefslogtreecommitdiff
path: root/gtk
diff options
context:
space:
mode:
authorMatthias Clasen <matthiasc@src.gnome.org>2004-08-13 18:09:29 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2004-08-13 18:09:29 +0000
commit766d78659c91fe65f3595a54abfa0dfd50790432 (patch)
tree4dc5ae5d7e9979eb4617703d500aadd9eafcecf7 /gtk
parent45c766084d054c59e8b740ea2686f5984bf0f040 (diff)
downloadgtk+-766d78659c91fe65f3595a54abfa0dfd50790432.tar.gz
Don't install the settings_notify_cb from here, since it may be called
* gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_style_set): Don't install the settings_notify_cb from here, since it may be called before the first screen_changed signal, confusing the logic in gtk_file_chooser_screen_changed(). (#148803, Abel Daniel)
Diffstat (limited to 'gtk')
-rw-r--r--gtk/gtkfilechooserdefault.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 9264cffeb5..bdb7e84f6d 100644
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -3810,8 +3810,8 @@ check_icon_theme (GtkFileChooserDefault *impl)
}
static void
-gtk_file_chooser_default_style_set (GtkWidget *widget,
- GtkStyle *previous_style)
+gtk_file_chooser_default_style_set (GtkWidget *widget,
+ GtkStyle *previous_style)
{
GtkFileChooserDefault *impl;
@@ -3820,7 +3820,8 @@ gtk_file_chooser_default_style_set (GtkWidget *widget,
if (GTK_WIDGET_CLASS (parent_class)->style_set)
GTK_WIDGET_CLASS (parent_class)->style_set (widget, previous_style);
- check_icon_theme (impl);
+ if (gtk_widget_has_screen (GTK_WIDGET (impl)))
+ change_icon_theme (impl);
g_signal_emit_by_name (widget, "default-size-changed");
}