1 files changed, 19 insertions, 14 deletions

diff --git a/src/fs/gnunet-fs-gtk_event-handler.c b/src/fs/gnunet-fs-gtk_event-handler.c
index 376fba44..f49795cf 100644
--- a/src/fs/gnunet-fs-gtk_event-handler.c
+++ b/src/fs/gnunet-fs-gtk_event-handler.c
@@ -391,11 +391,11 @@ start_download (GtkTreeView *tree_view,
   de = GNUNET_malloc (sizeof (struct DownloadEntry));
   de->uri = GNUNET_FS_uri_dup (uri);
   de->filename = buf;
-  de->meta = GNUNET_CONTAINER_meta_data_duplicate (meta);
   de->sr = sr;
   sr->download = de;
   de->anonymity = anonymity;
   de->is_recursive = is_recursive;
+  de->is_directory = GNUNET_FS_meta_data_test_for_directory (meta);
   fprintf (stderr,
            "lp %d, have-sug: %d\n",
            local_parents,
@@ -1710,7 +1710,7 @@ mark_download_progress (struct DownloadEntry *de, uint64_t size,
                       -1);
   if ( (depth == 0) &&
        (block_size > 0) &&
-       (GNUNET_YES == GNUNET_FS_meta_data_test_for_directory (de->meta)) )
+       (GNUNET_YES == de->is_directory) )
   {
     /* got a data block of a directory, list its contents */
     struct AddDirectoryEntryContext ade;
@@ -1723,9 +1723,7 @@ mark_download_progress (struct DownloadEntry *de, uint64_t size,
                                            offset, &add_directory_entry, &ade))
     {
       /* Mime type was wrong, this is not a directory, update model! */
-      GNUNET_break (GNUNET_OK ==
-                    GNUNET_CONTAINER_meta_data_delete (de->meta,
-                                                       EXTRACTOR_METATYPE_MIMETYPE, NULL, 0));
+      de->is_directory = GNUNET_SYSERR;
       gtk_tree_store_set (de->sr->tab->ts, &iter, 
                           10, "" /* unknown mime type */, -1);
     }
@@ -1782,7 +1780,7 @@ mark_download_completed (struct DownloadEntry *de, uint64_t size,
 
   de->is_done = GNUNET_YES;
   mark_download_progress (de, size, size, NULL, 0, 0, 0);
-  if ( (GNUNET_YES == GNUNET_FS_meta_data_test_for_directory (de->meta)) &&
+  if ( (GNUNET_NO != de->is_directory) &&
        (filename != NULL) )
   {
     /* download was for a directory (and we have a temp file for scanning);
@@ -1790,7 +1788,9 @@ mark_download_completed (struct DownloadEntry *de, uint64_t size,
     ade.tab = de->sr->tab;
     ade.prr = de->sr->rr;
     ade.check_duplicates = GNUNET_YES;
-    GNUNET_FS_GTK_mmap_and_scan (filename, &add_directory_entry, &ade);
+    if (GNUNET_OK !=
+        GNUNET_FS_GTK_mmap_and_scan (filename, &add_directory_entry, &ade))
+      de->is_directory = GNUNET_NO;
   }
   change_download_color (de, "green");
 }
@@ -1911,13 +1911,11 @@ download_lost_parent (struct DownloadEntry *de)
   GtkTreeIter iter_old;
   GtkTreeIter child;
   GtkTreeModel *model;
+  struct GNUNET_CONTAINER_MetaData *meta;
+  struct GNUNET_FS_Uri *uri;
 
-  /* first, move the root of the respective 'de'-tree */
+  /* find the 'old' root */
   rr_old = de->sr->rr;
-  de->sr = GNUNET_GTK_add_to_uri_tab (de->meta, de->uri);
-  de->sr->download = de;
-
-
   tm_old = gtk_tree_row_reference_get_model (rr_old);
   path = gtk_tree_row_reference_get_path (rr_old);
   gtk_tree_row_reference_free (rr_old);
@@ -1928,7 +1926,16 @@ download_lost_parent (struct DownloadEntry *de)
     return;
   }
   gtk_tree_path_free (path);
+  gtk_tree_model_get (tm_old, &iter_old, 
+                      0, &meta,
+                      1, &uri,
+                      -1);
+  
+  /* create the target root */
+  de->sr = GNUNET_GTK_add_to_uri_tab (meta, uri);
+  de->sr->download = de;
 
+  /* get positions of the 'new' root */
   model = GTK_TREE_MODEL (de->sr->tab->ts);
   path = gtk_tree_row_reference_get_path (de->sr->rr);
   if (! gtk_tree_model_get_iter (model, &iter, path))
@@ -1986,8 +1993,6 @@ setup_download (struct DownloadEntry *de, struct DownloadEntry *pde,
   }
   de->dc = dc;
   de->pde = pde;
-  if ( (meta != NULL) && (de->meta == NULL) )
-    de->meta = GNUNET_CONTAINER_meta_data_duplicate (meta);
   if (NULL != sr) 
   {
     /* have a search result, establish mapping de <--> sr */