[GNUnet-SVN] r3966 - gnunet-gtk/src/plugins/fs

[grothoff]

Author: grothoff
Date: 2006-12-17 17:26:44 -0800 (Sun, 17 Dec 2006)
New Revision: 3966

Modified:
   gnunet-gtk/src/plugins/fs/download.c
Log:
code cleanup

Modified: gnunet-gtk/src/plugins/fs/download.c
===================================================================
--- gnunet-gtk/src/plugins/fs/download.c        2006-12-18 00:19:08 UTC (rev 
3965)
+++ gnunet-gtk/src/plugins/fs/download.c        2006-12-18 01:26:44 UTC (rev 
3966)
@@ -198,6 +198,7 @@
   char * uri_name;
   gboolean valid;
   struct ECRS_URI * u;
+  GtkTreeModel * model;
 
   /* setup visualization */
   list = MALLOC(sizeof(DownloadList));
@@ -259,55 +260,57 @@
   list->searchList = sl_parent;
   list->searchViewRowReference = NULL;
   if (sl_parent != NULL) {
+    model = GTK_TREE_MODEL(sl_parent->tree);
     if (dl_parent != NULL) {
-
       /* have parent, must be download from
         directory inside of search */
+      GE_BREAK(ectx,
+              
gtk_tree_row_reference_get_model(dl_parent->searchViewRowReference)
+              == model);
       path = 
gtk_tree_row_reference_get_path(dl_parent->searchViewRowReference);
       if (path != NULL) {
-       valid = gtk_tree_model_get_iter(GTK_TREE_MODEL(sl_parent->tree),
+       valid = gtk_tree_model_get_iter(model,
                                        &piter,
                                        path);
-       if (valid == TRUE)
-         valid = gtk_tree_model_iter_children(GTK_TREE_MODEL(sl_parent->tree),
+       GE_BREAK(ectx, valid == TRUE);
+       if (valid == TRUE) {
+         valid = gtk_tree_model_iter_children(model,
                                               &iter,
                                               &piter);
+         GE_BREAK(ectx, valid == TRUE);
+       }
       } else {
        GE_BREAK(ectx, 0);
        valid = FALSE;
       }
     } else {
-      /* must be top-level entry in search */
-      valid = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(sl_parent->tree),
+      /* no download-parent, must be top-level entry in search */
+      valid = gtk_tree_model_get_iter_first(model,
                                            &iter);
+      GE_BREAK(ectx, valid == TRUE);
     }
-    if (valid == TRUE) {
-      valid = FALSE;
+    while (valid == TRUE) {
       /* find matching entry */
-      do {
-       gtk_tree_model_get(GTK_TREE_MODEL(sl_parent->tree),
+      gtk_tree_model_get(model,
+                        &iter,
+                        SEARCH_URI, &u,
+                        -1);
+      if (ECRS_equalsUri(u,
+                        fi->uri)) {
+       path = gtk_tree_model_get_path(model,
+                                      &iter);
+       list->searchViewRowReference
+         = gtk_tree_row_reference_new(model,
+                                      path);
+       gtk_tree_path_free(path);
+       gtk_tree_store_set(sl_parent->tree,
                           &iter,
-                          SEARCH_URI, &u,
+                          SEARCH_CELL_BG_COLOR, "yellow",
                           -1);
-       if (ECRS_equalsUri(u,
-                          fi->uri)) {
-         valid = TRUE;
-         path = gtk_tree_model_get_path(GTK_TREE_MODEL(sl_parent->tree),
-                                        &iter);
-         list->searchViewRowReference
-           = gtk_tree_row_reference_new(GTK_TREE_MODEL(sl_parent->tree),
-                                        path);
-         gtk_tree_path_free(path);
-         gtk_tree_store_set(sl_parent->tree,
-                            &iter,
-                            SEARCH_CELL_BG_COLOR, "yellow",
-                            -1);
-         break;
-       }
-      } while (TRUE == 
gtk_tree_model_iter_next(GTK_TREE_MODEL(sl_parent->tree),
-                                               &iter));
-    } else {
-      GE_BREAK(ectx, 0);
+       break;
+      }
+      valid = gtk_tree_model_iter_next(model,
+                                      &iter);
     }
     if (valid == FALSE) {
       /* did not find matching entry in search list -- bug!  Continue