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)
This commit is contained in:
Matthias Clasen 2004-08-13 18:09:29 +00:00
parent 45c766084d
commit 766d78659c
5 changed files with 28 additions and 3 deletions

View File

@ -1,5 +1,11 @@
2004-08-13 Matthias Clasen <mclasen@redhat.com>
* 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)
* gtk/gtkcombobox.c: Make re-sensitivation work
in menu mode.

View File

@ -1,5 +1,11 @@
2004-08-13 Matthias Clasen <mclasen@redhat.com>
* 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)
* gtk/gtkcombobox.c: Make re-sensitivation work
in menu mode.

View File

@ -1,5 +1,11 @@
2004-08-13 Matthias Clasen <mclasen@redhat.com>
* 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)
* gtk/gtkcombobox.c: Make re-sensitivation work
in menu mode.

View File

@ -1,5 +1,11 @@
2004-08-13 Matthias Clasen <mclasen@redhat.com>
* 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)
* gtk/gtkcombobox.c: Make re-sensitivation work
in menu mode.

View File

@ -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");
}