1 files changed, 14 insertions, 3 deletions

diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c
index 669477f6..f062dc88 100644
--- a/src/plugins/fs/search.c
+++ b/src/plugins/fs/search.c
@@ -318,10 +318,10 @@ fs_search_started(struct FSUI_SearchList * fsui_list,
     = glade_xml_new(getGladeFileName(),
                     "searchTabLabelWindow",
                     PACKAGE_NAME);
+  connectGladeWithPlugins(list->labelXML);
   list->tab_label 
     = extractMainWidgetFromWindow(list->labelXML,
                                   "searchTabLabelWindow");
-
   /* process existing results */
   for (i=0;i<resultCount;i++)
     fs_search_result_received(list,
@@ -385,6 +385,7 @@ static void freeIterSubtree(GtkTreeModel * tree,
  * Update views accordingly.
  */
 void fs_search_aborted(SearchList * list) {
+  printf("search aborted\n");
   /* FIXME: show aborted status somehow! */
 }
 
@@ -616,6 +617,7 @@ void on_closeSearchButton_clicked_fs(GtkWidget * searchPage,
   SearchList * list;
   struct FCBC fcbc;
 
+  printf("close button clicked\n");
   list = search_head;
   while (list != NULL) {
     if ( (list->searchpage == searchPage) ||
@@ -624,10 +626,13 @@ void on_closeSearchButton_clicked_fs(GtkWidget * searchPage,
     list = list->next;
   }
   GE_ASSERT(ectx, list != NULL);
-  fcbc.method = &FSUI_stopSearch;
+  fcbc.method = &FSUI_abortSearch;
   fcbc.argument = list->fsui_list;
   run_with_save_calls(&fsui_callback,
                       &fcbc);
+  fcbc.method = &FSUI_stopSearch;
+  run_with_save_calls(&fsui_callback,
+                      &fcbc);
 }
 
 /**
@@ -637,6 +642,7 @@ void on_abortSearchButton_clicked_fs(GtkWidget * searchPage,
                                      GtkWidget * closeButton) {
   SearchList * list;
 
+  printf("abort button clicked\n");
   list = search_head;
   while (list != NULL) {
     if (list->searchpage == searchPage)
@@ -661,10 +667,13 @@ static void stopSearch(GtkTreeModel * model,
                      SEARCH_SUMMARY_INTERNAL, &s,
                      -1);
   if (s != NULL) {
-    fcbc.method = &FSUI_stopSearch;
+    fcbc.method = &FSUI_abortSearch;
     fcbc.argument = s->fsui_list;
     run_with_save_calls(&fsui_callback,
                         &fcbc);
+    fcbc.method = &FSUI_stopSearch;
+    run_with_save_calls(&fsui_callback,
+                        &fcbc);
   }
 }
 
@@ -675,6 +684,7 @@ void on_closeSearchSummaryButton_clicked_fs(GtkWidget * closeButton,
                                             GtkWidget * treeview) {
   GtkTreeSelection * selection;
 
+  printf("stop summary button clicked\n");  
   selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
   ggc_tree_selection_selected_foreach
     (selection,
@@ -709,6 +719,7 @@ void on_abortSearchSummaryButton_clicked_fs(GtkWidget * closeButton,
                                             GtkWidget * treeview) {
   GtkTreeSelection * selection;
 
+  printf("abort summary button clicked\n");  
   selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
   ggc_tree_selection_selected_foreach
     (selection,