fix

2 files changed, 21 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index 4f54f26b..7e7cb6a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+Sun Aug 21 19:57:19 PDT 2005
+        Fixed deadlock in download abort code.
+
 Sun Aug 21 18:42:14 PDT 2005
         Fixed deadlock in gnunet-gtk shutdown.
         
diff --git a/src/plugins/fs/download.c b/src/plugins/fs/download.c
index 5abbd3ae..ed2de800 100644
--- a/src/plugins/fs/download.c
+++ b/src/plugins/fs/download.c
@@ -413,25 +413,16 @@ void on_clearCompletedDownloadsButton_clicked(void * unused,
                                NULL);
 }
 
-static void * shutdownCode(void * it) {
-  GtkTreeModel * model;
-  GtkTreeIter * iter = it; 
+struct aDC_closure {
   struct ECRS_URI * u;
   char * fn;
+};
 
-  model = GTK_TREE_MODEL(summary);
-  gtk_tree_model_get(model,
-                     iter,
-                     DOWNLOAD_URI, &u,
-                     DOWNLOAD_FILENAME, &fn,
-                     -1);
+static void * shutdownCode(void * c) {
+  struct aDC_closure * cls = c;
   FSUI_stopDownload(ctx,
-                    u,
-                    fn);
-  gtk_tree_store_remove(summary,
-                        iter);
-  if (u != NULL)
-    ECRS_freeUri(u);  
+                    cls->u,
+                    cls->fn);
   return NULL;
 }
 
@@ -439,9 +430,20 @@ static void abortDownloadCallback(GtkTreeModel * model,
                                   GtkTreePath * path,
                                   GtkTreeIter * iter,
                                   GtkTreeStore * tree) {
+  struct aDC_closure cls;
+
   GNUNET_ASSERT(model == GTK_TREE_MODEL(summary));
+  gtk_tree_model_get(model,
+                     iter,
+                     DOWNLOAD_URI, &cls.u,
+                     DOWNLOAD_FILENAME, &cls.fn,
+                     -1);
+  gtk_tree_store_remove(summary,
+                        iter);
   run_with_save_calls(&shutdownCode,
-                      iter);
+                      &cls);
+  if (cls.u != NULL)
+    ECRS_freeUri(cls.u); 
 }
 
 void on_abortDownloadButton_clicked(void * unused,