1 files changed, 44 insertions, 8 deletions

diff --git a/src/fs/gnunet-fs-gtk_event-handler.c b/src/fs/gnunet-fs-gtk_event-handler.c
index bd2378e1..a7aef9ba 100644
--- a/src/fs/gnunet-fs-gtk_event-handler.c
+++ b/src/fs/gnunet-fs-gtk_event-handler.c
@@ -156,6 +156,26 @@ static struct SearchTab *current_context_search_tab;
 
 /* ***************** Search event handling ****************** */
 
+
+/**
+ * Clear the metadata list and the preview widget.
+ */
+static void
+clear_metadata_display ()
+{
+  GtkImage *image;
+  GtkListStore *ms;
+
+  image =
+      GTK_IMAGE (GNUNET_FS_GTK_get_main_window_object
+                 ("GNUNET_GTK_main_window_preview_image"));
+  gtk_image_clear (image);
+  ms = GTK_LIST_STORE (GNUNET_FS_GTK_get_main_window_object
+                       ("GNUNET_GTK_meta_data_list_store"));
+  gtk_list_store_clear (ms);
+}
+
+
 /**
  * This should get the default download directory (so that GNUnet
  * won't offer the user to download files to the 'bin' subdirectory,
@@ -605,11 +625,6 @@ search_list_popup (GtkTreeModel *tm,
   struct SearchResult *sr;
   struct GNUNET_FS_Uri *uri;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Creating a menu for SR=%p, DE=%p\n", 
-              sr,
-              sr->download);
-
   /* FIXME-UNCLEAN: move these to some menu context struct
      (de-globalize) */
   current_context_search_tab = tab;
@@ -623,7 +638,13 @@ search_list_popup (GtkTreeModel *tm,
   gtk_tree_path_free (path);
 
   gtk_tree_model_get (tm, iter, 1, &uri, 9, &sr, -1);
-
+  /* FIXME-BUG: 'sr' can be NULL here, somehow some code fails to setup the record.. */
+  if (NULL == sr)
+  {
+    /* FIXME-BUG: this prevents the crash for now, but does not solve the problem */
+    GNUNET_break (0);
+    return FALSE;
+  }
   menu = GTK_MENU (gtk_menu_new ());
   if ( (NULL == sr->download) &&
        (NULL != uri) )
@@ -787,6 +808,7 @@ close_search_tab (struct SearchTab *tab)
     GNUNET_free (tab);
     return;
   }
+  clear_metadata_display ();
   notebook =
       GTK_NOTEBOOK (GNUNET_FS_GTK_get_main_window_object
                     ("GNUNET_GTK_main_window_notebook"));
@@ -1617,6 +1639,13 @@ stop_download (struct DownloadEntry *de)
   }
   gtk_tree_path_free (path);
   gtk_tree_model_get (tm, &iter, 9, &search_result, -1);
+  /* FIXME-BUG: 'search_result' can be NULL here, somehow some code fails to setup the record.. */
+  if (NULL == search_result)
+  {
+    /* FIXME-BUG: this prevents the crash for now, but does not solve the problem */
+    GNUNET_break (0);
+    return;
+  }
   GNUNET_assert (search_result->download == de); 
   search_result->download = NULL;
   change_download_color (de, "white");
@@ -1763,11 +1792,17 @@ mark_download_progress (struct DownloadEntry *de, uint64_t size,
     return;
   }
   gtk_tree_path_free (path);
-  /* FIXME-FEATURE: update availability-score here as well! */
+  /* FIXME-DESIGN: should we replace the 'availability' with
+     'progress' once the download has started and re-use the
+     space in the display? Probably yes, at least once we have
+     a custom CellRenderer... */
   gtk_tree_store_set (de->ts, &iter, 
                       4, (guint) ((size >
                                    0) ? (100 * completed /
-                                         size) : 100) /* progress */ ,
+                                         size) : 100) /* progress */,
+                      5, (guint) ((size >
+                                   0) ? (100 * completed /
+                                         size) : 100) /* availability == progress */,
                       14, completed, 
                       -1);
   if ( (depth == 0) &&
@@ -2287,6 +2322,7 @@ GNUNET_FS_GTK_publish_label_close_button_clicked (GtkButton * button,
     }
     while (TRUE == gtk_tree_model_iter_next (tm, &iter));
   }
+  clear_metadata_display ();
 
   /* remove tab from notebook */
   notebook =