cleanup

7 files changed, 27 insertions, 37 deletions

diff --git a/src/common/helper.c b/src/common/helper.c
index 01a26825..c9f218e8 100644
--- a/src/common/helper.c
+++ b/src/common/helper.c
@@ -698,4 +698,20 @@ GNUNET_GTK_run_gnunet_setup (gchar * conffile, gboolean run_wizard)
   return TRUE;
 }
 
+GtkWidget *GNUNET_GTK_extract_main_widget_from_window (GladeXML * xml,
+                                                       const char *windowName) 
+{
+  GtkContainer *window;
+  GtkWidget *ret;
+
+  window = GTK_CONTAINER (glade_xml_get_widget (xml, windowName));
+  ret = gtk_bin_get_child (GTK_BIN (window));
+  gtk_widget_ref (ret);
+  gtk_container_remove (window, ret);
+  gtk_widget_destroy (GTK_WIDGET (window));
+  return ret;
+}
+
+
+
 /* end of helper.c */
diff --git a/src/include/gnunetgtk_common.h b/src/include/gnunetgtk_common.h
index d70009f6..b0cce179 100644
--- a/src/include/gnunetgtk_common.h
+++ b/src/include/gnunetgtk_common.h
@@ -173,4 +173,11 @@ void GNUNET_GTK_tree_model_foreach (GtkTreeModel * model,
 
 struct GNUNET_CronManager *GNUNET_GTK_get_cron_manager (void);
 
+
+GtkWidget *GNUNET_GTK_extract_main_widget_from_window (GladeXML * xml,
+                                                       const char *windowName);
+
+
+
+
 #endif
diff --git a/src/plugins/chat/chat.c b/src/plugins/chat/chat.c
index a7e8c038..6db7bbfa 100644
--- a/src/plugins/chat/chat.c
+++ b/src/plugins/chat/chat.c
@@ -242,21 +242,6 @@ on_chat_frame_send_button_click_event_chat (GtkWidget * widget, gpointer data)
   GNUNET_mutex_unlock (lock);
 }
 
-/** FIXME: move to gtkcommon! */
-static GtkWidget *
-extractMainWidgetFromWindow (GladeXML * xml, const char *windowName)
-{
-  GtkContainer *window;
-  GtkWidget *ret;
-
-  window = GTK_CONTAINER (glade_xml_get_widget (xml, windowName));
-  ret = gtk_bin_get_child (GTK_BIN (window));
-  gtk_widget_ref (ret);
-  gtk_container_remove (window, ret);
-  gtk_widget_destroy (GTK_WIDGET (window));
-  return ret;
-}
-
 static void
 create_chat_room_tab (const char *room_name, const char *nick)
 {
@@ -277,7 +262,7 @@ create_chat_room_tab (const char *room_name, const char *nick)
     glade_xml_new (GNUNET_GTK_get_glade_filename (),
                    "chatFrame", PACKAGE_NAME);
   GNUNET_GTK_connect_glade_with_plugins (client->chatXML);
-  client->chatFrame = extractMainWidgetFromWindow (client->chatXML,
+  client->chatFrame = GNUNET_GTK_extract_main_widget_from_window (client->chatXML,
                                                    "chatFrame");
   chatLabel = gtk_label_new (room_name);
   gtk_notebook_append_page (GTK_NOTEBOOK (chatnotebook),
diff --git a/src/plugins/fs/meta.c b/src/plugins/fs/meta.c
index 11ec6449..ee4bfdd9 100644
--- a/src/plugins/fs/meta.c
+++ b/src/plugins/fs/meta.c
@@ -505,20 +505,6 @@ getThumbnailFromMetaData (const struct GNUNET_MetaData * meta)
   return pixbuf;
 }
 
-GtkWidget *
-extractMainWidgetFromWindow (GladeXML * xml, const char *windowName)
-{
-  GtkContainer *window;
-  GtkWidget *ret;
-
-  window = GTK_CONTAINER (glade_xml_get_widget (xml, windowName));
-  ret = gtk_bin_get_child (GTK_BIN (window));
-  gtk_widget_ref (ret);
-  gtk_container_remove (window, ret);
-  gtk_widget_destroy (GTK_WIDGET (window));
-  return ret;
-}
-
 int
 getToggleButtonValue (GladeXML * xml, const char *widgetName)
 {
diff --git a/src/plugins/fs/meta.h b/src/plugins/fs/meta.h
index d9ab6293..756d1667 100644
--- a/src/plugins/fs/meta.h
+++ b/src/plugins/fs/meta.h
@@ -81,9 +81,5 @@ const char *getEntryLineValue (GladeXML * xml, const char *widgetName);
 
 GdkPixbuf *getThumbnailFromMetaData (const struct GNUNET_MetaData *meta);
 
-GtkWidget *extractMainWidgetFromWindow (GladeXML * xml,
-                                        const char *windowName);
-
-
 /* end of meta.h */
 #endif
diff --git a/src/plugins/fs/namespace.c b/src/plugins/fs/namespace.c
index 9aec5622..987d0264 100644
--- a/src/plugins/fs/namespace.c
+++ b/src/plugins/fs/namespace.c
@@ -120,7 +120,7 @@ makeNamespaceFrame (NamespaceList * entry)
     = glade_xml_new (GNUNET_GTK_get_glade_filename (),
                      "namespaceContentFrame", PACKAGE_NAME);
   GNUNET_GTK_connect_glade_with_plugins (namespaceXML);
-  child = extractMainWidgetFromWindow (namespaceXML, "namespaceContentFrame");
+  child = GNUNET_GTK_extract_main_widget_from_window (namespaceXML, "namespaceContentFrame");
   resultList = glade_xml_get_widget (namespaceXML,
                                      "namespaceContentFrameTreeView");
   entry->addButton = glade_xml_get_widget (namespaceXML, "addButton");
diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c
index 92329cb9..aaabb079 100644
--- a/src/plugins/fs/search.c
+++ b/src/plugins/fs/search.c
@@ -711,7 +711,7 @@ fs_search_started (struct GNUNET_FSUI_SearchList * fsui_list,
                    PACKAGE_NAME);
   GNUNET_GTK_connect_glade_with_plugins (list->searchXML);
   list->searchpage
-    = extractMainWidgetFromWindow (list->searchXML, "searchResultsFrame");
+    = GNUNET_GTK_extract_main_widget_from_window (list->searchXML, "searchResultsFrame");
   /* setup tree view and renderers */
   list->treeview = GTK_TREE_VIEW (glade_xml_get_widget (list->searchXML,
                                                         "searchResults"));
@@ -935,7 +935,7 @@ fs_search_started (struct GNUNET_FSUI_SearchList * fsui_list,
                      "searchTabLabelWindow", PACKAGE_NAME);
   GNUNET_GTK_connect_glade_with_plugins (list->labelXML);
   list->tab_label
-    = extractMainWidgetFromWindow (list->labelXML, "searchTabLabelWindow");
+    = GNUNET_GTK_extract_main_widget_from_window (list->labelXML, "searchTabLabelWindow");
   /* process existing results */
   for (i = 0; i < resultCount; i++)
     fs_search_result_received (list, &results[i], uri);