1 files changed, 25 insertions, 49 deletions

diff --git a/src/fs/gnunet-fs-gtk_event-handler.c b/src/fs/gnunet-fs-gtk_event-handler.c
index 3df59cf1..93e5c27a 100644
--- a/src/fs/gnunet-fs-gtk_event-handler.c
+++ b/src/fs/gnunet-fs-gtk_event-handler.c
@@ -440,9 +440,11 @@ search_list_popup_selection_done (GtkMenuShell *menushell,
  * @param column unused entry specifying which column the mouse was in
  * @param user_data the 'struct SearchTab' that was activated
  */
-static void
-start_download_row_activated (GtkTreeView * tree_view, GtkTreePath * path,
-                              GtkTreeViewColumn * column, gpointer user_data)
+void
+GNUNET_FS_GTK_search_treeview_row_activated (GtkTreeView * tree_view, 
+                                             GtkTreePath * path,
+                                             GtkTreeViewColumn * column, 
+                                             gpointer user_data)
 {
   struct SearchTab *tab = user_data;
 
@@ -681,8 +683,9 @@ search_list_popup (GtkTreeModel *tm,
  * @return FALSE if no menu could be popped up,
  *         TRUE if there is now a pop-up menu
  */
-static gboolean
-search_list_on_popup (GtkWidget *widget, gpointer user_data)
+gboolean
+GNUNET_FS_GTK_search_treeview_popup_menu (GtkWidget *widget, 
+                                          gpointer user_data)
 {
   GtkTreeView *tv = GTK_TREE_VIEW (widget);
   struct SearchTab *tab = user_data;
@@ -707,10 +710,10 @@ search_list_on_popup (GtkWidget *widget, gpointer user_data)
  * @return FALSE if no menu could be popped up,
  *         TRUE if there is now a pop-up menu
  */
-static gboolean
-search_list_on_menu (GtkWidget * widget, 
-                     GdkEvent * event,
-                     gpointer user_data)
+gboolean
+GNUNET_FS_GTK_search_treeview_button_press_event (GtkWidget * widget, 
+                                                  GdkEvent * event,
+                                                  gpointer user_data)
 {
   GtkTreeView *tv = GTK_TREE_VIEW (widget);
   GdkEventButton *event_button = (GdkEventButton *) event;
@@ -854,8 +857,9 @@ free_search_result (struct SearchResult *sr)
  * @param tv the tree view in a search tab where the selection changed
  * @param user_data the 'struct SearchTab' that contains the tree view
  */
-static void
-update_meta_data_views (GtkTreeView *tv, gpointer user_data)
+void
+GNUNET_FS_GTK_search_treeview_cursor_changed (GtkTreeView *tv, 
+                                              gpointer user_data)
 {
   struct SearchTab *tab = user_data;
   GtkImage *image;
@@ -925,7 +929,7 @@ GNUNET_GTK_main_window_notebook_switch_page_cb (GtkWidget * dummy,
       continue;
     tv = GTK_TREE_VIEW (gtk_builder_get_object
                         (tab->builder, "_search_result_frame"));
-    update_meta_data_views (tv, tab);
+    GNUNET_FS_GTK_search_treeview_cursor_changed (tv, tab);
     return;
   }
   /* active tab is not a search tab (likely the 'publish' tab), 
@@ -946,8 +950,8 @@ GNUNET_GTK_main_window_notebook_switch_page_cb (GtkWidget * dummy,
  * @param button the 'close' button
  * @param user_data the 'struct SearchTab' of the tab to close
  */
-static void
-stop_search (GtkButton *button, gpointer user_data)
+void
+GNUNET_FS_GTK_search_result_close_button_clicked (GtkButton *button, gpointer user_data)
 {
   struct SearchTab *tab = user_data;
   struct GNUNET_FS_SearchContext *sc;
@@ -972,8 +976,8 @@ stop_search (GtkButton *button, gpointer user_data)
  * @param button the 'pause' button
  * @param user_data the 'struct SearchTab' of the tab to pause
  */
-static void
-pause_search (GtkButton *button, gpointer user_data)
+void
+GNUNET_FS_GTK_search_result_pause_button_clicked (GtkButton *button, gpointer user_data)
 {
   struct SearchTab *tab = user_data;
 
@@ -994,8 +998,8 @@ pause_search (GtkButton *button, gpointer user_data)
  * @param button the 'resume' button
  * @param user_data the 'struct SearchTab' of the tab to resume
  */
-static void
-continue_search (GtkButton * button, gpointer user_data)
+void
+GNUNET_FS_GTK_search_result_play_button_clicked (GtkButton * button, gpointer user_data)
 {
   struct SearchTab *tab = user_data;
 
@@ -1021,8 +1025,8 @@ continue_search (GtkButton * button, gpointer user_data)
  * @param button the button pressed by the user
  * @param user_data the 'struct SearchTab' of the respective tab to clean up
  */
-static void
-clear_downloads (GtkButton * button, gpointer user_data)
+void
+GNUNET_FS_GTK_search_result_clear_button_clicked (GtkButton * button, gpointer user_data)
 {
   struct SearchTab *tab = user_data;
   struct SearchResult *sr;
@@ -1204,7 +1208,7 @@ update_search_result (struct SearchResult *sr,
   {
     tv = GTK_TREE_VIEW (gtk_builder_get_object
                         (sr->tab->builder, "_search_result_frame"));
-    update_meta_data_views (tv, sr->tab);
+    GNUNET_FS_GTK_search_treeview_cursor_changed (tv, sr->tab);
   }
 }
 
@@ -1399,7 +1403,6 @@ setup_search_tab (struct GNUNET_FS_SearchContext *sc,
                   const struct GNUNET_FS_Uri *query)
 {
   struct SearchTab *tab;
-  GtkTreeView *tv;
   GtkNotebook *notebook;
   GtkWindow *sf;
   gint pages;
@@ -1446,44 +1449,18 @@ setup_search_tab (struct GNUNET_FS_SearchContext *sc,
   tab->label =
       GTK_LABEL (gtk_builder_get_object
                  (tab->builder, "_search_result_label_window_label"));
-
-  /* FIXME-UNCLEAN: connect these signals using glade!!! */
   tab->close_button =
       GTK_WIDGET (gtk_builder_get_object
                   (tab->builder, "_search_result_label_close_button"));
-  g_signal_connect (G_OBJECT (tab->close_button), "clicked",
-                    G_CALLBACK (stop_search), tab);
-  tab->clear_button =
-      GTK_WIDGET (gtk_builder_get_object
-                  (tab->builder, "_search_result_label_clear_button"));
-  g_signal_connect (G_OBJECT (tab->clear_button), "clicked",
-                    G_CALLBACK (clear_downloads), tab);
   tab->play_button =
       GTK_WIDGET (gtk_builder_get_object
                   (tab->builder, "_search_result_label_play_button"));
-  g_signal_connect (G_OBJECT (tab->play_button), "clicked",
-                    G_CALLBACK (continue_search), tab);
   tab->pause_button =
       GTK_WIDGET (gtk_builder_get_object
                   (tab->builder, "_search_result_label_pause_button"));
-  g_signal_connect (G_OBJECT (tab->pause_button), "clicked",
-                    G_CALLBACK (pause_search), tab);
   /* patch text */
   update_search_label (tab);
 
-  /* add signal handlers; FIXME-UNCLEAN: again, connect these with glade...  */
-  tv = GTK_TREE_VIEW (gtk_builder_get_object
-                      (tab->builder, "_search_result_frame"));
-  g_signal_connect (G_OBJECT (tv), "row-activated", 
-                    G_CALLBACK (start_download_row_activated), tab);
-  g_signal_connect (G_OBJECT (tv), "cursor-changed",
-                    G_CALLBACK (update_meta_data_views), tab);
-  g_signal_connect (G_OBJECT (tv), "button_press_event",
-                    G_CALLBACK (search_list_on_menu), tab);
-  g_signal_connect (G_OBJECT (tv), "popup-menu",
-                    G_CALLBACK (search_list_on_popup), tab);
-
-
   /* make visible */
   notebook =
       GTK_NOTEBOOK (GNUNET_FS_GTK_get_main_window_object
@@ -1534,7 +1511,6 @@ setup_inner_search (struct GNUNET_FS_SearchContext *sc,
   ret->frame = parent->tab->frame;
   ret->tab_label = parent->tab->tab_label;
   ret->close_button = parent->tab->close_button;
-  ret->clear_button = parent->tab->clear_button;
   ret->play_button = parent->tab->play_button;
   ret->label = parent->tab->label;