]> Pileus Git - ~andy/gtk/commitdiff
Discard the search widgets in a separate function
authorFederico Mena Quintero <federico@gnome.org>
Wed, 27 Jul 2011 21:52:12 +0000 (16:52 -0500)
committerFederico Mena Quintero <federico@gnome.org>
Wed, 27 Jul 2011 23:56:06 +0000 (18:56 -0500)
Signed-off-by: Federico Mena Quintero <federico@gnome.org>
gtk/gtkfilechooserdefault.c

index 4b51c6ba559578346e26010cbdb0cabff0ef438b..2952fd85f0f4872e8812e8d46d7ceb12f90a669c 100644 (file)
@@ -5236,6 +5236,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)
@@ -5250,9 +5262,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: