fix

6 files changed, 34 insertions, 41 deletions

diff --git a/TODO b/TODO
index 1174b102..fe9d0580 100644
--- a/TODO
+++ b/TODO
@@ -1,16 +1,18 @@
 0.7.1:
 - support new FSUI apis: [pre0]
+  * insert 21.pdf, search 21, search application/pdf, stop insert, abort search (summary), stop search (search), exit => crash
+  * (inserted 21.pdf), search application/pdf, download => no progress!
   * test, test, test!
-  * fix memory leaks!
-- create directory from known file IDs [ medium ] [pre1]
-  in Assemble Directory's Files Available/Selected
-  + have sortability
-  + have multiselection
-  + print filenames as well
 - disable inactive buttons (if no search/download 
   is selected to operate on) [ medium ] [pre1]
 - highlight active downloads in search list [ easy ] [pre1]
 - highlight completed downloads [ easy ] [pre1]
+- allow deletion of keywords and metadata [pre1]
+- create directory from known file IDs [ medium ] [pre2]
+  in Assemble Directory's Files Available/Selected
+  + have sortability
+  + have multiselection
+  + print filenames as well
 - more help-texts (glade) [ easy ] [pre2]
 - re-enable advanced/namespace menus [RC]
 
diff --git a/gnunet-gtk.glade b/gnunet-gtk.glade
index c95ada13..60c59a1c 100644
--- a/gnunet-gtk.glade
+++ b/gnunet-gtk.glade
@@ -3120,24 +3120,6 @@ This release fixes downloads of files from directories.  The previous version ha
                           </child>
 
                           <child>
-                            <widget class="GtkButton" id="refreshContentListButton">
-                              <property name="visible">True</property>
-                              <property name="tooltip" translatable="yes">Refresh the available content list now (otherwise this is done automatically roughly every 5 minutes)</property>
-                              <property name="can_focus">True</property>
-                              <property name="label">gtk-refresh</property>
-                              <property name="use_stock">True</property>
-                              <property name="relief">GTK_RELIEF_NONE</property>
-                              <property name="focus_on_click">True</property>
-                              <signal name="clicked" handler="on_refreshContentListButton_clicked_" last_modification_time="Sun, 21 Aug 2005 03:29:32 GMT"/>
-                            </widget>
-                            <packing>
-                              <property name="padding">0</property>
-                              <property name="expand">False</property>
-                              <property name="fill">False</property>
-                            </packing>
-                          </child>
-
-                          <child>
                             <widget class="GtkButton" id="clearAvailableContentButton">
                               <property name="visible">True</property>
                               <property name="tooltip" translatable="yes">deletes the tracked available content shown below</property>
diff --git a/src/plugins/daemon/daemon.c b/src/plugins/daemon/daemon.c
index c23a087e..4004f3f4 100644
--- a/src/plugins/daemon/daemon.c
+++ b/src/plugins/daemon/daemon.c
@@ -54,14 +54,12 @@ static void * updateAppModelSafe(void * unused) {
   model = gtk_list_store_new(2,
                              G_TYPE_STRING,
                              G_TYPE_STRING);
+  apps = NULL;
   sock = client_connection_create(ectx, cfg);
-  if (sock == NULL) {
-    apps = STRDUP("");
-  } else {
+  if (sock != NULL) 
     apps = getConfigurationOptionValue(sock,
                                        "GNUNETD",
                                        "APPLICATIONS");
-  }
   if (apps != NULL) {
     next = apps;
     do {
diff --git a/src/plugins/fs/fs.c b/src/plugins/fs/fs.c
index fb819df1..3498f7d3 100644
--- a/src/plugins/fs/fs.c
+++ b/src/plugins/fs/fs.c
@@ -150,28 +150,22 @@ saveEventProcessor(void * cls) {
                      event->data.UploadProgress.completed);
     break;
   case FSUI_upload_completed:
-    printf("FSUI: Upload completed\n");
     fs_upload_complete(event->data.UploadCompleted.uc.cctx,
                        event->data.UploadCompleted.uri);
     break;
   case FSUI_upload_error:
-    printf("FSUI: Upload error\n");
     fs_upload_error(event->data.UploadError.uc.cctx);
     break;
   case FSUI_upload_aborted:
-    printf("FSUI: Upload aborted\n");
     fs_upload_error(event->data.UploadAborted.uc.cctx);
     break;
   case FSUI_upload_stopped:
-    printf("FSUI: Upload stopped\n");
     fs_upload_stopped(event->data.UploadStopped.uc.cctx);
     break;
   case FSUI_upload_suspended:
-    printf("FSUI: Upload suspended\n");
     fs_upload_stopped(event->data.UploadSuspended.uc.cctx);
     break;
   case FSUI_upload_started:
-    printf("FSUI: Upload started\n");
     ret = fs_upload_started(event->data.UploadStarted.uc.pos,
                             event->data.UploadStarted.uc.pcctx,
                             event->data.UploadStarted.filename,
@@ -181,7 +175,6 @@ saveEventProcessor(void * cls) {
                             FSUI_ACTIVE);
     break;
   case FSUI_upload_resumed:
-    printf("FSUI: Upload resumed\n");
     ret = fs_upload_started(event->data.UploadResumed.uc.pos,
                             event->data.UploadResumed.uc.pcctx,
                             event->data.UploadResumed.filename,
@@ -233,7 +226,6 @@ static void fs_summary_start() {
                              G_TYPE_STRING, /* what we show */
                              G_TYPE_STRING, /* EncName of namespace */
                              G_TYPE_POINTER, /* ECRS MetaData */
-                             G_TYPE_POINTER, /* FSUI search list */
                              G_TYPE_INT);  /* Meta-data about namespace */
   gtk_combo_box_set_model(GTK_COMBO_BOX(searchCB),
                           GTK_TREE_MODEL(model));
@@ -395,15 +387,33 @@ static void fs_summary_start() {
  * Shutdown the summary dialogs.
  */
 static void fs_summary_stop() {
+  struct ECRS_MetaData * meta;
   GtkComboBox * searchCB;
-  GtkListStore * model;
+  GtkTreeModel * model;
+  GtkTreeIter iter;
 
   searchCB
     = GTK_COMBO_BOX(glade_xml_get_widget(getMainXML(),
                                          "fssearchKeywordComboBoxEntry"));
-  model = GTK_LIST_STORE(gtk_combo_box_get_model(searchCB));
-  /* FIXME: iterate over model entries
-     and free URIs and MetaData! */
+  model = gtk_combo_box_get_model(searchCB);
+  if (gtk_tree_model_get_iter_first(model,
+                                    &iter)) {
+    do {        
+      gtk_tree_model_get(model,
+                         &iter,
+                         NS_SEARCH_METADATA, &meta,
+                         NAMESPACE_META, &meta,
+                         -1);
+      gtk_list_store_set(GTK_LIST_STORE(model),
+                         &iter,
+                         NAMESPACE_META, NULL,
+                         -1);
+      if (meta != NULL)
+        ECRS_freeMetaData(meta);
+    } while (gtk_list_store_remove(GTK_LIST_STORE(model),
+                                   &iter));
+  }
+
 }
 
 
diff --git a/src/plugins/fs/fs.h b/src/plugins/fs/fs.h
index 39ff7c1d..88a1f59a 100644
--- a/src/plugins/fs/fs.h
+++ b/src/plugins/fs/fs.h
@@ -39,7 +39,6 @@ enum {
   NS_SEARCH_DESCRIPTION = 0,
   NS_SEARCH_ENCNAME,
   NS_SEARCH_METADATA,
-  NS_SEARCH_FSUI,
   NS_SEARCH_RATING,
   NS_SEARCH_NUM,
 };
diff --git a/src/plugins/fs/search_namespace.c b/src/plugins/fs/search_namespace.c
index 22da212d..4e4f08d2 100644
--- a/src/plugins/fs/search_namespace.c
+++ b/src/plugins/fs/search_namespace.c
@@ -62,6 +62,8 @@ static int addNamespace(void * arg,
 /**
  * cron job that periodically updates the model for the
  * namespace selection in the search vbox.
+ *
+ * FIXME: replace with callback!
  */
 static void updateNCBModelSafe(void * unused) {
   GtkWidget * searchNamespaceCB;