more event handlers and proper save calling

4 files changed, 179 insertions, 21 deletions

diff --git a/gnunet-gtk.glade b/gnunet-gtk.glade
index 40c192ac..6117e3c1 100644
--- a/gnunet-gtk.glade
+++ b/gnunet-gtk.glade
@@ -1236,7 +1236,7 @@ This release fixes downloads of files from directories.  The previous version ha
                                   <property name="use_stock">True</property>
                                   <property name="relief">GTK_RELIEF_NORMAL</property>
                                   <property name="focus_on_click">True</property>
-                                  <signal name="clicked" handler="on_abortDownloadButton_clicked" last_modification_time="Wed, 01 Jun 2005 19:54:07 GMT"/>
+                                  <signal name="clicked" handler="on_abortDownloadButton_clicked_" last_modification_time="Wed, 01 Jun 2005 19:54:07 GMT"/>
                                 </widget>
                                 <packing>
                                   <property name="padding">0</property>
@@ -1414,7 +1414,7 @@ This release fixes downloads of files from directories.  The previous version ha
                                   <property name="use_stock">True</property>
                                   <property name="relief">GTK_RELIEF_NORMAL</property>
                                   <property name="focus_on_click">True</property>
-                                  <signal name="clicked" handler="on_clearCompletedDownloadsButton_clicked_" last_modification_time="Wed, 01 Jun 2005 19:53:58 GMT"/>
+                                  <signal name="clicked" handler="on_clearCompletedUploadsButton_clicked_" last_modification_time="Mon, 30 Oct 2006 00:26:29 GMT"/>
                                 </widget>
                                 <packing>
                                   <property name="padding">0</property>
diff --git a/src/plugins/fs/download.c b/src/plugins/fs/download.c
index b58bb5ef..b77615d6 100644
--- a/src/plugins/fs/download.c
+++ b/src/plugins/fs/download.c
@@ -639,6 +639,18 @@ void on_statusDownloadURIEntry_editing_done_fs(GtkWidget * entry,
   FREE(urid);
 }
 
+struct FCBC {
+  int (*method)(struct FSUI_Context * ctx,
+                struct FSUI_DownloadList * list);
+  struct FSUI_DownloadList * argument;
+};
+
+static void * fsui_callback(void * cls) {
+  struct FCBC * fcbc = cls;
+  fcbc->method(ctx,
+               fcbc->argument);
+  return NULL;
+}
 
 static void 
 clearCompletedDownloadCallback(GtkTreeModel * model,
@@ -646,6 +658,7 @@ clearCompletedDownloadCallback(GtkTreeModel * model,
                                GtkTreeIter * iter,
                                gpointer unused) {
   DownloadList * dl;
+  struct FCBC fcbc;
 
   GE_ASSERT(ectx,
             model == GTK_TREE_MODEL(download_summary));
@@ -653,9 +666,12 @@ clearCompletedDownloadCallback(GtkTreeModel * model,
                      iter,
                      DOWNLOAD_INTERNAL, &dl,
                      -1);
-  if (dl->has_terminated)
-    FSUI_stopDownload(ctx,
-                      dl->fsui_list);
+  if (dl->has_terminated) {
+    fcbc.method = &FSUI_stopDownload;
+    fcbc.argument = dl->fsui_list;
+    run_with_save_calls(&fsui_callback,
+                        &fcbc);
+  }
 }
 
 void on_clearCompletedDownloadsButton_clicked_fs(void * unused,
@@ -673,11 +689,12 @@ void on_clearCompletedDownloadsButton_clicked_fs(void * unused,
 }
 
 static void 
-abortDownloadCallback(GtkTreeModel * model,
-                      GtkTreePath * path,
-                      GtkTreeIter * iter,
-                      gpointer unused) {
+fsuiCallDownloadCallback(GtkTreeModel * model,
+                         GtkTreePath * path,
+                         GtkTreeIter * iter,
+                         gpointer fsui_call) {
   DownloadList * dl;
+  struct FCBC fcbc;
 
   GE_ASSERT(ectx,
             model == GTK_TREE_MODEL(download_summary));
@@ -685,8 +702,10 @@ abortDownloadCallback(GtkTreeModel * model,
                      iter,
                      DOWNLOAD_INTERNAL, &dl,
                      -1);
-  FSUI_abortDownload(ctx,
-                     dl->fsui_list);
+  fcbc.method = fsui_call;
+  fcbc.argument = dl->fsui_list;
+  run_with_save_calls(&fsui_callback,
+                      &fcbc);
 }
 
 void on_abortDownloadButton_clicked_fs(void * unused,
@@ -699,8 +718,22 @@ void on_abortDownloadButton_clicked_fs(void * unused,
   selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(downloadList));
   gtk_tree_selection_selected_foreach
     (selection,
-     &abortDownloadCallback,
-     NULL);
+     &fsuiCallDownloadCallback,
+     &FSUI_abortDownload);
+}
+
+void on_stopDownloadButton_clicked_fs(void * unused,
+                                      GtkWidget * clearButton) {
+  GtkTreeSelection * selection;
+  GtkWidget * downloadList;
+
+  downloadList = glade_xml_get_widget(getMainXML(),
+                                      "activeDownloadsList");
+  selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(downloadList));
+  gtk_tree_selection_selected_foreach
+    (selection,
+     &fsuiCallDownloadCallback,
+     &FSUI_stopDownload);
 }
 
 /* end of download.c */
diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c
index acb046c6..71744feb 100644
--- a/src/plugins/fs/search.c
+++ b/src/plugins/fs/search.c
@@ -588,6 +588,19 @@ void on_fssearchbutton_clicked_fs(gpointer dummy2,
                    uri);
 }
 
+struct FCBC {
+  int (*method)(struct FSUI_Context * ctx,
+                struct FSUI_SearchList * list);
+  struct FSUI_SearchList * argument;
+};
+
+static void * fsui_callback(void * cls) {
+  struct FCBC * fcbc = cls;
+  fcbc->method(ctx,
+               fcbc->argument);
+  return NULL;
+}
+
 /**
  * This method is called when the user clicks on either
  * the "CLOSE" button (at the bottom of the search page)
@@ -599,6 +612,7 @@ void on_fssearchbutton_clicked_fs(gpointer dummy2,
 void on_closeSearchButton_clicked_fs(GtkWidget * searchPage,
                                      GtkWidget * closeButton) {
   SearchList * list;
+  struct FCBC fcbc;
 
   list = search_head;
   while (list != NULL) {
@@ -608,8 +622,10 @@ void on_closeSearchButton_clicked_fs(GtkWidget * searchPage,
     list = list->next;
   }
   GE_ASSERT(ectx, list != NULL);
-  FSUI_stopSearch(ctx,
-                  list->fsui_list);
+  fcbc.method = &FSUI_stopSearch;
+  fcbc.argument = list->fsui_list;
+  run_with_save_calls(&fsui_callback,
+                      &fcbc);
 }
 
 /**
@@ -635,15 +651,19 @@ static void stopSearch(GtkTreeModel * model,
                        GtkTreeIter * iter,
                        gpointer unused) {
   SearchList * s;
+  struct FCBC fcbc;
 
   s = NULL;
   gtk_tree_model_get(model,
                      iter,
                      SEARCH_SUMMARY_INTERNAL, &s,
                      -1);
-  if (s != NULL)
-    FSUI_stopSearch(ctx,
-                    s->fsui_list);
+  if (s != NULL) {
+    fcbc.method = &FSUI_stopSearch;
+    fcbc.argument = s->fsui_list;
+    run_with_save_calls(&fsui_callback,
+                        &fcbc);
+  }
 }
 
 /**
@@ -665,15 +685,19 @@ static void abortSearch(GtkTreeModel * model,
                         GtkTreeIter * iter,
                         gpointer unused) {
   SearchList * s;
+  struct FCBC fcbc;
 
   s = NULL;
   gtk_tree_model_get(model,
                      iter,
                      SEARCH_SUMMARY_INTERNAL, &s,
                      -1);
-  if (s != NULL)
-    FSUI_abortSearch(ctx,
-                     s->fsui_list);
+  if (s != NULL) {
+    fcbc.method = &FSUI_abortSearch;
+    fcbc.argument = s->fsui_list;
+    run_with_save_calls(&fsui_callback,
+                        &fcbc);
+  }
 }
 
 /**
diff --git a/src/plugins/fs/upload.c b/src/plugins/fs/upload.c
index 500830ba..103cdce9 100644
--- a/src/plugins/fs/upload.c
+++ b/src/plugins/fs/upload.c
@@ -390,4 +390,105 @@ void on_mainFileSharingInsertBrowseButton_clicked_fs(GtkWidget * browseButton,
   free(filename); 
 }
 
+/* FIXME: handlers for clear and stop! */
+
+struct FCBC {
+  int (*method)(struct FSUI_Context * ctx,
+                struct FSUI_UploadList * list);
+  struct FSUI_UploadList * argument;
+};
+
+static void * fsui_callback(void * cls) {
+  struct FCBC * fcbc = cls;
+  fcbc->method(ctx,
+               fcbc->argument);
+  return NULL;
+}
+
+static void 
+clearCompletedUploadCallback(GtkTreeModel * model,
+                             GtkTreePath * path,
+                             GtkTreeIter * iter,
+                             gpointer unused) {
+  UploadList * ul;
+  struct FCBC fcbc;
+
+  GE_ASSERT(ectx,
+            model == GTK_TREE_MODEL(upload_summary));
+  gtk_tree_model_get(model,
+                     iter,
+                     UPLOAD_INTERNAL, &ul,
+                     -1);
+  if (ul->has_terminated) {
+    fcbc.method = &FSUI_stopUpload;
+    fcbc.argument = ul->fsui_list;
+    run_with_save_calls(&fsui_callback,
+                        &fcbc);
+  }
+}
+
+void on_clearCompletedUploadsButton_clicked_fs(void * unused,
+                                               GtkWidget * clearButton) { 
+  GtkTreeSelection * selection;
+  GtkWidget * uploadList;
+
+  uploadList = glade_xml_get_widget(getMainXML(),
+                                    "activeUploadsList");
+  selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(uploadList));
+  gtk_tree_selection_selected_foreach
+    (selection,
+     &clearCompletedUploadCallback,
+     NULL);
+}
+
+static void 
+fsuiCallUploadCallback(GtkTreeModel * model,
+                       GtkTreePath * path,
+                       GtkTreeIter * iter,
+                       gpointer fsui_call) {
+  UploadList * ul;
+  struct FCBC fcbc;
+
+  GE_ASSERT(ectx,
+            model == GTK_TREE_MODEL(upload_summary));
+  gtk_tree_model_get(model,
+                     iter,
+                     UPLOAD_INTERNAL, &ul,
+                     -1);
+  fcbc.method = fsui_call;
+  fcbc.argument = ul->fsui_list;
+  run_with_save_calls(&fsui_callback,
+                      &fcbc);
+}
+
+void on_abortUploadButton_clicked_fs(void * unused,
+                                     GtkWidget * clearButton) {
+  GtkTreeSelection * selection;
+  GtkWidget * uploadList;
+
+  uploadList = glade_xml_get_widget(getMainXML(),
+                                    "activeUploadsList");
+  selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(uploadList));
+  gtk_tree_selection_selected_foreach
+    (selection,
+     &fsuiCallUploadCallback,
+     &FSUI_abortUpload);
+}
+
+void on_stopUploadButton_clicked_fs(void * unused,
+                                    GtkWidget * clearButton) {
+  GtkTreeSelection * selection;
+  GtkWidget * uploadList;
+
+  uploadList = glade_xml_get_widget(getMainXML(),
+                                    "activeUploadsList");
+  selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(uploadList));
+  gtk_tree_selection_selected_foreach
+    (selection,
+     &fsuiCallUploadCallback,
+     &FSUI_stopUpload);
+}
+
+
+
 /* end of upload.c */