sync

6 files changed, 54 insertions, 54 deletions

diff --git a/ChangeLog b/ChangeLog
index 18b6cbc2..bd786dd9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+Sat Apr  1 16:24:27 PST 2006
+        Improved shutdown code.
+
 Sat Mar 25 10:14:44 PST 2006
         Adding .desktop support.
 
diff --git a/README b/README
index 2f1416c8..9f021db3 100644
--- a/README
+++ b/README
@@ -2,24 +2,15 @@ This is the GNUnet GTK user interface.  In order to compile or run
 this code, you need to first install the main GNUnet codebase.  
 
 Then you may need to tell configure where the GNUnet installation
-is located:
+is located.  The following command will install gnunet-gtk in the
+$HOME directory.
 
 $ ./configure --prefix=$HOME --with-gnunet=$GNUNET_PREFIX
 
 gnunet-gtk requires GTK 2.6 or higher and libglade 2.5.1 or higher.
 glade-2.10 is used to edit the UI.  Debian users please note that
-these versions are currently only available in experimental (!).
+these versions are currently only available in unstable.
  
-This software is currently alpha quality: 
-* we're using glade for the first time
-* we're shipping gnunet-gtk seperately from GNUnet
-  for the first time
-* the UI code was largely rewritten
-* the GNUnet core was largely rewritten
-
-So, please don't expect everything to just work and report bugs (or
-better, send patches :-)).
-
 
 Stay tuned
 ==========
diff --git a/TODO b/TODO
index 717288e2..2785d158 100644
--- a/TODO
+++ b/TODO
@@ -10,7 +10,7 @@
 - highlight active downloads in search list [ easy ]
 
 0.7.2:
-- various minor memory leaks (see FIXME in search.c,
+- various minor memory leaks (see
   #if 0 code in namespace.c)
 
 0.7.3:
diff --git a/src/plugins/fs/namespace.c b/src/plugins/fs/namespace.c
index 176dc5fe..2322d2fa 100644
--- a/src/plugins/fs/namespace.c
+++ b/src/plugins/fs/namespace.c
@@ -265,7 +265,11 @@ static void clearContentList(void * mdl) {
                          -1);
       ECRS_freeUri(uri);
       ECRS_freeMetaData(meta);
-
+      gtk_list_store_set(GTK_LIST_STORE(model),
+                         &iter,
+                         NAMESPACE_URI, NULL,
+                         NAMESPACE_META, NULL,
+                         -1);
     } while (gtk_list_store_remove(GTK_LIST_STORE(model),
                                    &iter));
   }
diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c
index 9985c4c3..e06a9204 100644
--- a/src/plugins/fs/search.c
+++ b/src/plugins/fs/search.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2005 Christian Grothoff (and other contributing authors)
+     (C) 2005, 2006 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -192,8 +192,6 @@ static void freeIterSubtree(GtkTreeModel * tree,
       freeIterSubtree(tree, &child);
   } while (gtk_tree_model_iter_next(tree,
                                     iter));
-
-                                
 }
 
 /**
@@ -1025,6 +1023,36 @@ void fs_search_start() {
                     NULL);
 }
 
+static void freeSearchModel(GtkTreeModel * model,
+                            GtkTreeIter * parent) {
+  struct ECRS_URI * u;
+  struct ECRS_MetaData * m;
+  GtkTreeIter iter;
+
+  if (gtk_tree_model_iter_children(model,
+                                   &iter,
+                                   parent)) {
+    do {
+      gtk_tree_model_get(model,
+                         &iter,
+                         SEARCH_URI, &u,
+                         SEARCH_META, &m,
+                         -1);
+      gtk_tree_store_set(GTK_TREE_STORE(model),
+                         &iter,
+                         SEARCH_URI, NULL,
+                         SEARCH_META, NULL,
+                         -1);
+      if (u != NULL)
+        ECRS_freeUri(u);
+      if (m != NULL)
+        ECRS_freeMetaData(m);
+      freeSearchModel(model, &iter);
+    } while (gtk_tree_model_iter_next(model,
+                                      &iter));
+  }  
+}
+
 void fs_search_stop() {
   SearchList * list;
   GtkTreeIter iter;
@@ -1037,33 +1065,7 @@ void fs_search_stop() {
     list = head;
     head = head->next;
     ECRS_freeUri(list->uri);
-
-#if 0
-  /* FIXME - memory leak.  The following is still incorrect;
-     it does not free entire tree (need to recurse!)
-  */
-    if (gtk_tree_model_get_iter_first(head->model,
-                                      &iter)) {
-      struct ECRS_MetaData * m;
-      do {
-        gtk_tree_model_get(head->model,
-                           &iter,
-                           SEARCH_URI, &u,
-                           SEARCH_META, &m,
-                           -1);
-        gtk_tree_store_set(GTK_TREE_STORE(head->model),
-                           &iter,
-                           SEARCH_URI, NULL,
-                           SEARCH_META, NULL,
-                           -1);
-        if (u != NULL)
-          ECRS_freeUri(u);
-        if (m != NULL)
-          ECRS_freeMetaData(m);
-      } while (gtk_tree_model_iter_next(head->model,
-                                        &iter));
-    }
-#endif
+    freeSearchModel(list->model, NULL);
     FREE(list);
   }
 
diff --git a/src/plugins/fs/upload.c b/src/plugins/fs/upload.c
index 034bc6f8..202f8253 100644
--- a/src/plugins/fs/upload.c
+++ b/src/plugins/fs/upload.c
@@ -502,19 +502,19 @@ void fs_upload_start() {
                                               "value", UPLOAD_PROGRESS,
                                               NULL);
   gtk_tree_view_column_set_resizable(gtk_tree_view_get_column(GTK_TREE_VIEW(uploadList),
-                                              col - 1),
-                                              TRUE);
+                                                              col - 1),
+                                     TRUE);
   renderer = gtk_cell_renderer_text_new();
   col = gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(uploadList),
-                                              -1,
-                                              _("URI"),
-                                              renderer,
-                                              "text", UPLOAD_URISTRING,
-                                              NULL);
+                                                    -1,
+                                                    _("URI"),
+                                                    renderer,
+                                                    "text", UPLOAD_URISTRING,
+                                                    NULL);
   gtk_tree_view_column_set_resizable(gtk_tree_view_get_column(GTK_TREE_VIEW(uploadList),
-                                              col - 1),
-                                              TRUE);
-
+                                                              col - 1),
+                                     TRUE);
+  
   uploadEntry
     = glade_xml_get_widget(getMainXML(),
                            "uploadFilenameComboBoxEntry");