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

[gnunet]

Author: grothoff
Date: 2011-09-15 19:48:42 +0200 (Thu, 15 Sep 2011)
New Revision: 16871

Modified:
   gnunet-gtk/src/fs/gnunet-fs-gtk-event_handler.c
Log:
fixing 1761

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk-event_handler.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-event_handler.c     2011-09-15 15:55:16 UTC 
(rev 16870)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-event_handler.c     2011-09-15 17:48:42 UTC 
(rev 16871)
@@ -121,6 +121,7 @@
   GtkTreePath *path;
 
   path = gtk_tree_row_reference_get_path (de->rr);
+  GNUNET_assert (NULL != path);
   if (TRUE != gtk_tree_model_get_iter (GTK_TREE_MODEL (de->ts), &iter, path))
   {
     GNUNET_break (0);
@@ -464,13 +465,16 @@
   GtkTreeRowReference *rr_old;
   GtkTreeModel *tm_old;
   GtkTreeIter iter_old;
+  GtkTreeIter child;
+  GtkTreeModel * model;
 
   rr_old = de->rr;
   de->sr = NULL;
   tab = GNUNET_GTK_add_to_uri_tab (&iter, NULL, de->meta, de->uri);
   de->ts = 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);
+  model = GTK_TREE_MODEL (de->ts);
+  path = gtk_tree_model_get_path (model, &iter);
+  de->rr = gtk_tree_row_reference_new (model, path);
   gtk_tree_path_free (path);
   mark_download_progress (de, size, completed, NULL, 0, 0, 0);
   tm_old = gtk_tree_row_reference_get_model (rr_old);
@@ -478,9 +482,10 @@
   gtk_tree_row_reference_free (rr_old);
   gtk_tree_model_get_iter (tm_old, &iter_old, path);
   gtk_tree_path_free (path);
-  move_children (tm_old, &iter_old, GTK_TREE_MODEL (de->ts), &iter);
-  delete_stale_subtree (tm_old, &iter_old);
-  if (size > completed)
+  move_children (tm_old, &iter_old, model, &iter);
+  while (TRUE == gtk_tree_model_iter_children (model, &child, &iter))    
+    delete_stale_subtree (model, &child);
+   if (size > completed)
   {
     if (is_active)
       change_download_colour (de, "yellow");
@@ -1800,7 +1805,7 @@
   case GNUNET_FS_STATUS_SEARCH_CONTINUED:
     return info->value.search.cctx;
   case GNUNET_FS_STATUS_SEARCH_RESULT_STOPPED:
-    free_search_result (info->value.search.specifics.result_suspend.cctx);
+    free_search_result (info->value.search.specifics.result_stopped.cctx);
     return NULL;
   case GNUNET_FS_STATUS_SEARCH_RESULT_SUSPEND:
     free_search_result (info->value.search.specifics.result_suspend.cctx);