[GNUnet-SVN] r18708 - gnunet-gtk/src/fs

[gnunet]

Author: grothoff
Date: 2011-12-19 23:35:19 +0100 (Mon, 19 Dec 2011)
New Revision: 18708

Modified:
   gnunet-gtk/src/fs/gnunet-fs-gtk-event_handler.c
Log:
fixing #2001 (cleanup button for download-by-uri)

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk-event_handler.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-event_handler.c     2011-12-19 22:34:59 UTC 
(rev 18707)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-event_handler.c     2011-12-19 22:35:19 UTC 
(rev 18708)
@@ -332,7 +332,7 @@
                          const char *filename)
 {
   struct AddDirectoryEntryContext ade;
-
+  
   de->is_done = GNUNET_YES;
   (void) mark_download_progress (de, size, size, NULL, 0, 0, 0);
   if ((GNUNET_YES == GNUNET_FS_meta_data_test_for_directory (de->meta)) &&
@@ -537,6 +537,7 @@
 {
   GtkTreeIter iter;
   GtkTreePath *path;
+  struct SearchResult *srp;
 
   if (de == NULL)
   {
@@ -561,11 +562,12 @@
   }
   else if (de->rr == NULL)
   {
-    de->tab = GNUNET_GTK_add_to_uri_tab (&iter, NULL, meta, uri);
+    de->tab = GNUNET_GTK_add_to_uri_tab (&iter, &srp, meta, uri);
     de->ts = de->tab->ts;
     path = gtk_tree_model_get_path (GTK_TREE_MODEL (de->ts), &iter);
     de->rr = gtk_tree_row_reference_new (GTK_TREE_MODEL (de->ts), path);
     gtk_tree_path_free (path);
+    srp->download = de;
   }
   path = gtk_tree_row_reference_get_path (de->rr);
   if (TRUE != gtk_tree_model_get_iter (GTK_TREE_MODEL (de->ts), &iter, path))
@@ -1026,7 +1028,7 @@
   do
   {
     gtk_tree_model_get (tm, &iter, 9, &sr, -1);
-    if ((sr->download != NULL) && (sr->download->is_done == GNUNET_YES))
+    if ((sr->download != NULL) && (sr->download->is_done == GNUNET_YES))    
       GNUNET_FS_download_stop (sr->download->dc, GNUNET_YES);      
   }
   while (TRUE == gtk_tree_model_iter_next (tm, &iter));