1 files changed, 17 insertions, 28 deletions

diff --git a/src/fs_event_handler.c b/src/fs_event_handler.c
index 6a8da393..035e2a48 100644
--- a/src/fs_event_handler.c
+++ b/src/fs_event_handler.c
@@ -108,24 +108,6 @@ struct SearchResult
 };
 
 
-struct DownloadEntry
-{
-  struct DownloadEntry *pde;
-
-  struct SearchResult *sr;
-
-  struct GNUNET_FS_DownloadContext *dc;
-
-  struct GNUNET_FS_Uri *uri;
-
-  struct GNUNET_CONTAINER_MetaData *meta;
-
-  GtkTreeRowReference *rr;
-
-  GtkTreeStore *ts;
-};
-
-
 static struct DownloadEntry *
 change_download_colour (struct DownloadEntry *de,
                        const char *colour)
@@ -284,6 +266,7 @@ download_lost_parent (struct DownloadEntry *de,
 /**
  * Setup a new download entry.
  *
+ * @param de existing download entry for the download, or NULL
  * @param pde parent download entry, or NULL
  * @param sr search result, or NULL
  * @param dc download context (for stopping)
@@ -293,7 +276,8 @@ download_lost_parent (struct DownloadEntry *de,
  * @param completed current progress
  */
 static struct DownloadEntry *
-setup_download (struct DownloadEntry *pde,
+setup_download (struct DownloadEntry *de,
+                struct DownloadEntry *pde,
                 struct SearchResult *sr,
                 struct GNUNET_FS_DownloadContext *dc,
                 const struct GNUNET_FS_Uri *uri,
@@ -301,17 +285,20 @@ setup_download (struct DownloadEntry *pde,
                 uint64_t size,
                 uint64_t completed)
 {
-  struct DownloadEntry *de;
   GtkTreeIter iter;
   GtkTreePath *path;
   struct SearchTab *tab;
 
-  de = GNUNET_malloc (sizeof (struct DownloadEntry));
+  if (de == NULL)
+    {
+      de = GNUNET_malloc (sizeof (struct DownloadEntry));
+      de->sr = sr;
+      de->dc = dc;
+      de->uri = GNUNET_FS_uri_dup (uri);
+    }
   de->pde = pde;
-  de->sr = sr;
-  de->dc = dc;
-  de->uri = GNUNET_FS_uri_dup (uri);
-  if (meta != NULL)
+  if ( (meta != NULL) &&
+       (de->meta == NULL) )
     de->meta = GNUNET_CONTAINER_meta_data_duplicate (meta);
   if (pde != NULL)
     {
@@ -323,7 +310,7 @@ setup_download (struct DownloadEntry *pde,
       de->rr = gtk_tree_row_reference_copy (sr->rr);      
       de->ts = sr->tab->ts;
     }
-  else
+  else if (de->rr == NULL)
     {
       tab = GNUNET_GTK_add_to_uri_tab (&iter,
                                        NULL,
@@ -335,7 +322,7 @@ setup_download (struct DownloadEntry *pde,
       de->rr = gtk_tree_row_reference_new (GTK_TREE_MODEL (de->ts),
                                            path);
       gtk_tree_path_free (path);
-    }
+    }    
   path = gtk_tree_row_reference_get_path (de->rr);
   if (TRUE != gtk_tree_model_get_iter (GTK_TREE_MODEL (de->ts), 
                                        &iter, path))
@@ -389,6 +376,7 @@ start_download (GtkTreeView *tree_view,
   dlc->uri = GNUNET_FS_uri_dup (uri);
   dlc->mime = mime;
   dlc->filename = GNUNET_FS_meta_data_suggest_filename (meta);
+  dlc->meta = GNUNET_CONTAINER_meta_data_duplicate (meta);
   dlc->rr = gtk_tree_row_reference_new (tm, path);
   dlc->sr = sr->result;
   dlc->anonymity = 1; /* FIXME: grab from search? */
@@ -1291,7 +1279,8 @@ GNUNET_GTK_fs_event_handler (void *cls,
       close_publish_tab (info->value.publish.cctx);
       return NULL;
     case GNUNET_FS_STATUS_DOWNLOAD_START: 
-      return setup_download (info->value.download.pctx,
+      return setup_download (info->value.download.cctx,
+                             info->value.download.pctx,
                              info->value.download.sctx,
                              info->value.download.dc,
                              info->value.download.uri,