summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFederico Mena Quintero <federico@gnome.org>2011-07-27 16:52:12 -0500
committerFederico Mena Quintero <federico@gnome.org>2011-07-27 18:46:27 -0500
commit14b9b2f3e0c3f6987bb0c2f72733c03cafea3dce (patch)
tree0842360d676a08f5e1343c10dd40f7954c391bc5
parentf52cee3bd290fd8e1c3b586d783f853ce104f20b (diff)
downloadgtk+-14b9b2f3e0c3f6987bb0c2f72733c03cafea3dce.tar.gz
Discard the search widgets in a separate function
Signed-off-by: Federico Mena Quintero <federico@gnome.org>
-rw-r--r--gtk/gtkfilechooserdefault.c16
1 files changed, 13 insertions, 3 deletions
diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index a7f7eb9056..754115801a 100644
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -5226,6 +5226,18 @@ path_bar_update (GtkFileChooserDefault *impl)
path_bar_set_mode (impl, mode);
}
+static void
+operation_mode_discard_search_widgets (GtkFileChooserDefault *impl)
+{
+ if (impl->search_hbox)
+ {
+ gtk_widget_destroy (impl->search_hbox);
+
+ impl->search_hbox = NULL;
+ impl->search_entry = NULL;
+ }
+}
+
/* Stops running operations like populating the browse model, searches, and the recent-files model */
static void
operation_mode_stop (GtkFileChooserDefault *impl, OperationMode mode)
@@ -5240,9 +5252,7 @@ operation_mode_stop (GtkFileChooserDefault *impl, OperationMode mode)
search_stop_searching (impl, FALSE);
search_clear_model (impl, TRUE);
- gtk_widget_destroy (impl->search_hbox);
- impl->search_hbox = NULL;
- impl->search_entry = NULL;
+ operation_mode_discard_search_widgets (impl);
break;
case OPERATION_MODE_RECENT: