]> Pileus Git - ~andy/gtk/commitdiff
filechooserentry: Merge function
authorBenjamin Otte <otte@redhat.com>
Sun, 6 Nov 2011 01:47:36 +0000 (02:47 +0100)
committerBenjamin Otte <otte@redhat.com>
Fri, 16 Dec 2011 19:09:13 +0000 (20:09 +0100)
gtk/gtkfilechooserentry.c

index e2a8a546145990ff1f71412a9569723586aa157f..2f6112e0b85683eb3a34eb88159ecb2e65480d2e 100644 (file)
@@ -1367,14 +1367,6 @@ perform_load_complete_action (GtkFileChooserEntry *chooser_entry)
   chooser_entry->load_complete_action = LOAD_COMPLETE_NOTHING;
 }
 
-static void
-finish_folder_load (GtkFileChooserEntry *chooser_entry)
-{
-  perform_load_complete_action (chooser_entry);
-
-  gtk_widget_set_tooltip_text (GTK_WIDGET (chooser_entry), NULL);
-}
-
 /* Callback when the current folder finishes loading */
 static void
 finished_loading_cb (GtkFileSystemModel  *model,
@@ -1403,7 +1395,9 @@ finished_loading_cb (GtkFileSystemModel  *model,
       return;
     }
 
-  finish_folder_load (chooser_entry);
+  perform_load_complete_action (chooser_entry);
+
+  gtk_widget_set_tooltip_text (GTK_WIDGET (chooser_entry), NULL);
 }
 
 static RefreshStatus