From ad88e6d5c6afb4ed1727e41e5cbdec6e21f2121e Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Sun, 6 Nov 2011 02:47:36 +0100
Subject: [PATCH] filechooserentry: Merge function

---
 gtk/gtkfilechooserentry.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/gtk/gtkfilechooserentry.c b/gtk/gtkfilechooserentry.c
index 04e8771e5b..d658fa2ef6 100644
--- a/gtk/gtkfilechooserentry.c
+++ b/gtk/gtkfilechooserentry.c
@@ -1366,14 +1366,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,
@@ -1402,7 +1394,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