Only unblock the handlers if they are blocked.

2004-12-16  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkfilechooserbutton.c (dialog_response_cb): Only unblock the handlers
	if they are blocked.
This commit is contained in:
Matthias Clasen 2004-12-16 14:18:52 +00:00 committed by Matthias Clasen
parent 860228fa36
commit 6cd1c58c92
5 changed files with 23 additions and 7 deletions

View File

@ -1,5 +1,8 @@
2004-12-16 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkfilechooserbutton.c (dialog_response_cb): Only unblock the handlers
if they are blocked.
* gtk/gtktreeview.c (gtk_tree_view_real_start_interactive_search): Don't
crash if enable_search is FALSE. (#161267, Jorn Baayen)

View File

@ -1,5 +1,8 @@
2004-12-16 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkfilechooserbutton.c (dialog_response_cb): Only unblock the handlers
if they are blocked.
* gtk/gtktreeview.c (gtk_tree_view_real_start_interactive_search): Don't
crash if enable_search is FALSE. (#161267, Jorn Baayen)

View File

@ -1,5 +1,8 @@
2004-12-16 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkfilechooserbutton.c (dialog_response_cb): Only unblock the handlers
if they are blocked.
* gtk/gtktreeview.c (gtk_tree_view_real_start_interactive_search): Don't
crash if enable_search is FALSE. (#161267, Jorn Baayen)

View File

@ -1,5 +1,8 @@
2004-12-16 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkfilechooserbutton.c (dialog_response_cb): Only unblock the handlers
if they are blocked.
* gtk/gtktreeview.c (gtk_tree_view_real_start_interactive_search): Don't
crash if enable_search is FALSE. (#161267, Jorn Baayen)

View File

@ -2158,14 +2158,18 @@ dialog_response_cb (GtkDialog *dialog,
update_label_and_image (user_data);
update_combo_box (user_data);
if (priv->active)
{
g_signal_handler_unblock (priv->dialog,
priv->dialog_folder_changed_id);
g_signal_handler_unblock (priv->dialog,
priv->dialog_file_activated_id);
g_signal_handler_unblock (priv->dialog,
priv->dialog_selection_changed_id);
priv->active = FALSE;
}
g_signal_handler_unblock (priv->dialog,
priv->dialog_folder_changed_id);
g_signal_handler_unblock (priv->dialog,
priv->dialog_file_activated_id);
g_signal_handler_unblock (priv->dialog,
priv->dialog_selection_changed_id);
priv->active = FALSE;
gtk_widget_set_sensitive (priv->combo_box, TRUE);
gtk_widget_hide (priv->dialog);
}