9 files changed, 109 insertions, 32 deletions

diff --git a/src/common/helper.c b/src/common/helper.c
index 97ec690c..7ffc84a5 100644
--- a/src/common/helper.c
+++ b/src/common/helper.c
@@ -625,6 +625,10 @@ char * validate_utf8(char * msg) {
   FREE(msg);
   msg = STRDUP(ret);
   g_free(ret);
+  GE_BREAK(NULL,
+           TRUE == g_utf8_validate(msg,
+                                   -1,
+                                   &end));
   return msg;
 }
 
@@ -685,4 +689,53 @@ gboolean startGNUnetSetup (gboolean run_wizard) {
   return code;
 }
 
+/**
+ * Identical to "gtk_tree_selection_selected_foreach",
+ * except that modifications of the underlying model
+ * during the iteration are tolerated.
+ */
+void ggc_tree_selection_selected_foreach(GtkTreeSelection *selection,
+                                         GtkTreeSelectionForeachFunc func,
+                                         gpointer data) {
+  unsigned int i;
+  unsigned int size;
+  GList * selected;
+  GtkTreeRowReference ** refs;
+  GtkTreeModel * model;
+  GtkTreePath * path;
+  GtkTreeIter iter;
+
+  selected = gtk_tree_selection_get_selected_rows(selection,
+                                                  &model);
+  
+  i = g_list_length(selected);
+  size = 0;
+  refs = NULL;
+  GROW(refs,
+       size,
+       i);
+  for (i=0;i<size;i++) 
+    refs[i] = gtk_tree_row_reference_new(model,
+                                         g_list_nth_data(selected, i));
+  g_list_foreach(selected, 
+                 (GFunc) &gtk_tree_path_free,
+                 NULL);
+  g_list_free(selected);
+  for (i=0;i<size;i++) {
+    path = gtk_tree_row_reference_get_path(refs[i]);
+    gtk_tree_row_reference_free(refs[i]);
+    if (TRUE == gtk_tree_model_get_iter(model,
+                                        &iter,
+                                        path))      
+      func(model,
+           path,
+           &iter,
+           data);
+    gtk_tree_path_free(path);    
+  }
+  GROW(refs,
+       size,
+       0);
+}
+
 /* end of helper.c */
diff --git a/src/include/gnunetgtk_common.h b/src/include/gnunetgtk_common.h
index 4f139f59..6f0402b8 100644
--- a/src/include/gnunetgtk_common.h
+++ b/src/include/gnunetgtk_common.h
@@ -142,4 +142,13 @@ void gnunet_gtk_main_quit();
 */
 gboolean startGNUnetSetup (gboolean run_wizard);
 
+/**
+ * Identical to "gtk_tree_selection_selected_foreach",
+ * except that modifications of the underlying model
+ * during the iteration are tolerated.
+ */
+void ggc_tree_selection_selected_foreach(GtkTreeSelection *selection,
+                                         GtkTreeSelectionForeachFunc func,
+                                         gpointer data);
+
 #endif
diff --git a/src/plugins/daemon/daemon.c b/src/plugins/daemon/daemon.c
index 9d89b4c9..c23a087e 100644
--- a/src/plugins/daemon/daemon.c
+++ b/src/plugins/daemon/daemon.c
@@ -56,13 +56,11 @@ static void * updateAppModelSafe(void * unused) {
                              G_TYPE_STRING);
   sock = client_connection_create(ectx, cfg);
   if (sock == NULL) {
-    apps = NULL;
+    apps = STRDUP("");
   } else {
-    GC_get_configuration_value_string(cfg,                                    
-                                      "GNUNETD",
-                                      "APPLICATIONS",
-                                      "about daemon fs stats",
-                                      &apps);
+    apps = getConfigurationOptionValue(sock,
+                                       "GNUNETD",
+                                       "APPLICATIONS");
   }
   if (apps != NULL) {
     next = apps;
diff --git a/src/plugins/fs/Makefile.am b/src/plugins/fs/Makefile.am
index fae720d5..52d85aa7 100644
--- a/src/plugins/fs/Makefile.am
+++ b/src/plugins/fs/Makefile.am
@@ -20,7 +20,7 @@ libgnunetgtkmodule_fs_la_SOURCES = \
   upload.c upload.h
 libgnunetgtkmodule_fs_la_LIBADD = \
   $(top_builddir)/src/common/libgnunetgtk_common.la \
-  @GTK_LIBS@ \
+  @GTK_LIBS@ -lgsf-1 \
   @GNUNETGTK_LIBS@ \
   $(INTLLIBS) \
   -lgthread-2.0 \
diff --git a/src/plugins/fs/download.c b/src/plugins/fs/download.c
index b77615d6..d7ac628e 100644
--- a/src/plugins/fs/download.c
+++ b/src/plugins/fs/download.c
@@ -213,12 +213,18 @@ fs_download_started(struct FSUI_DownloadList * fsui_dl,
   list->searchList = sl_parent;
   if (sl_parent != NULL) {
     if (dl_parent != NULL) {
+      GtkTreeIter piter;
+
       /* have parent, must be download from
          directory inside of search */
       path = gtk_tree_row_reference_get_path(dl_parent->searchViewRowReference);
       valid = gtk_tree_model_get_iter(GTK_TREE_MODEL(sl_parent->tree),
-                                      &iter,
+                                      &piter,
                                       path);      
+      if (valid == TRUE)
+        valid = gtk_tree_model_iter_children(GTK_TREE_MODEL(sl_parent->tree),
+                                             &iter,
+                                             &piter);      
     } else {
       /* must be top-level entry in search */
       valid = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(sl_parent->tree),
@@ -563,7 +569,7 @@ void on_downloadButton_clicked_fs(GtkWidget * treeview,
   GtkTreeSelection * selection;
 
   selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
-  gtk_tree_selection_selected_foreach
+  ggc_tree_selection_selected_foreach
     (selection,
      &initiateDownload,
      NULL);
@@ -682,7 +688,8 @@ void on_clearCompletedDownloadsButton_clicked_fs(void * unused,
   downloadList = glade_xml_get_widget(getMainXML(),
                                       "activeDownloadsList");
   selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(downloadList));
-  gtk_tree_selection_selected_foreach
+  
+  ggc_tree_selection_selected_foreach
     (selection,
      &clearCompletedDownloadCallback,
      NULL);
@@ -716,7 +723,7 @@ void on_abortDownloadButton_clicked_fs(void * unused,
   downloadList = glade_xml_get_widget(getMainXML(),
                                       "activeDownloadsList");
   selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(downloadList));
-  gtk_tree_selection_selected_foreach
+  ggc_tree_selection_selected_foreach
     (selection,
      &fsuiCallDownloadCallback,
      &FSUI_abortDownload);
@@ -730,7 +737,7 @@ void on_stopDownloadButton_clicked_fs(void * unused,
   downloadList = glade_xml_get_widget(getMainXML(),
                                       "activeDownloadsList");
   selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(downloadList));
-  gtk_tree_selection_selected_foreach
+  ggc_tree_selection_selected_foreach
     (selection,
      &fsuiCallDownloadCallback,
      &FSUI_stopDownload);
diff --git a/src/plugins/fs/fs.c b/src/plugins/fs/fs.c
index 19e83929..ccd0584c 100644
--- a/src/plugins/fs/fs.c
+++ b/src/plugins/fs/fs.c
@@ -414,6 +414,9 @@ void init_fs(struct GE_Context * e,
   gtk_notebook_set_current_page(GTK_NOTEBOOK(book), 1);
   gtk_notebook_set_current_page(GTK_NOTEBOOK(book), num);
 
+  fs_summary_start();
+  fs_collection_start();
+  fs_namespace_start();
   ctx = FSUI_start(ectx,
                    cfg,
                    "gnunet-gtk",
@@ -421,9 +424,6 @@ void init_fs(struct GE_Context * e,
                    YES,
                    &eventProcessor,
                    NULL);
-  fs_collection_start();
-  fs_summary_start();
-  fs_namespace_start();
 }
 
 void done_fs() {
@@ -433,9 +433,9 @@ void done_fs() {
     = glade_xml_get_widget(getMainXML(),
                            "fsnotebook");
   gtk_widget_hide(tab);
+  FSUI_stop(ctx);
   fs_summary_stop();
   fs_namespace_stop();
-  FSUI_stop(ctx);
 }
 
 /* end of fs.c */
diff --git a/src/plugins/fs/namespace.c b/src/plugins/fs/namespace.c
index e0c1808f..88d9ec86 100644
--- a/src/plugins/fs/namespace.c
+++ b/src/plugins/fs/namespace.c
@@ -936,7 +936,7 @@ void on_namespaceInsertButton_clicked_fs(GtkWidget * dummy1,
       cls.nextId = &nextId;
     }
     cls.meta = meta;
-    gtk_tree_selection_selected_foreach
+    ggc_tree_selection_selected_foreach
       (selection,
        &initiateUpload,
        &cls);
@@ -1161,7 +1161,7 @@ void on_namespaceUpdateButton_clicked_fs(GtkWidget * dummy1,
     cls.anonymityLevel
       = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(spin));
 
-    gtk_tree_selection_selected_foreach
+    ggc_tree_selection_selected_foreach
       (selection,
        &initiateUpload,
        &cls);
diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c
index 71744feb..669477f6 100644
--- a/src/plugins/fs/search.c
+++ b/src/plugins/fs/search.c
@@ -183,7 +183,6 @@ fs_search_started(struct FSUI_SearchList * fsui_list,
          sizeof(SearchList));
   list->searchString
     = STRDUP(dhead);
-  FREE(description);
   list->uri
     = ECRS_dupUri(uri);
   list->fsui_list 
@@ -306,6 +305,7 @@ fs_search_started(struct FSUI_SearchList * fsui_list,
                      SEARCH_SUMMARY_RESULT_COUNT, 0,
                      SEARCH_SUMMARY_INTERNAL, list,
                      -1);
+  FREE(description);
   path = gtk_tree_model_get_path(GTK_TREE_MODEL(search_summary),
                                  &iter);
   list->summaryViewRowReference
@@ -327,6 +327,8 @@ fs_search_started(struct FSUI_SearchList * fsui_list,
     fs_search_result_received(list,
                               &results[i],
                               uri);
+  if (resultCount == 0) /* otherwise already done! */
+    updateSearchSummary(list);
   
   /* insert new page into search notebook */
   notebook
@@ -669,12 +671,12 @@ static void stopSearch(GtkTreeModel * model,
 /**
  * The stop button in the search summary was clicked.
  */
-void on_closeSearchSummaryButton_clicked_fs(GtkWidget * treeview,
-                                            GtkWidget * closeButton) {
+void on_closeSearchSummaryButton_clicked_fs(GtkWidget * closeButton,
+                                            GtkWidget * treeview) {
   GtkTreeSelection * selection;
 
   selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
-  gtk_tree_selection_selected_foreach
+  ggc_tree_selection_selected_foreach
     (selection,
      &stopSearch,
      NULL);
@@ -703,17 +705,15 @@ static void abortSearch(GtkTreeModel * model,
 /**
  * The abort button in the search summary was clicked.
  */
-void on_abortSearchSummaryButton_clicked_fs(GtkWidget * treeview,
-                                            GtkWidget * closeButton) {
+void on_abortSearchSummaryButton_clicked_fs(GtkWidget * closeButton,
+                                            GtkWidget * treeview) {
   GtkTreeSelection * selection;
 
   selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
-  gtk_tree_selection_selected_foreach
+  ggc_tree_selection_selected_foreach
     (selection,
      &abortSearch,
      NULL);
 }
 
-
-
 /* end of search.c */
diff --git a/src/plugins/fs/upload.c b/src/plugins/fs/upload.c
index 103cdce9..c742bd13 100644
--- a/src/plugins/fs/upload.c
+++ b/src/plugins/fs/upload.c
@@ -365,6 +365,7 @@ selectFile(const char * oldfilename) {
 void on_mainFileSharingInsertBrowseButton_clicked_fs(GtkWidget * browseButton,
                                                      gpointer dummy) {
   char * filename;
+  char * ofn;
   const char *oldfilename;
   GtkWidget * uploadLine;
   GtkEntry * entry;
@@ -375,8 +376,17 @@ void on_mainFileSharingInsertBrowseButton_clicked_fs(GtkWidget * browseButton,
                                     "uploadFilenameComboBoxEntry");
   entry = GTK_ENTRY(gtk_bin_get_child(GTK_BIN(uploadLine)));
   oldfilename = gtk_entry_get_text(entry);
-  if (NULL == (filename = selectFile(oldfilename)))
-    return;  
+  if (oldfilename == NULL) 
+    oldfilename = getenv("PWD");
+  if (oldfilename == NULL)
+    oldfilename = getenv("HOME");
+  if (oldfilename == NULL)
+    oldfilename = "/";
+  ofn = string_expandFileName(ectx, oldfilename);
+  filename = selectFile(ofn);
+  FREE(ofn);
+  if (NULL == filename)
+    return;    
   gtk_entry_set_text(entry,
                      filename);
   model = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(uploadLine)));
@@ -435,7 +445,7 @@ void on_clearCompletedUploadsButton_clicked_fs(void * unused,
   uploadList = glade_xml_get_widget(getMainXML(),
                                     "activeUploadsList");
   selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(uploadList));
-  gtk_tree_selection_selected_foreach
+  ggc_tree_selection_selected_foreach
     (selection,
      &clearCompletedUploadCallback,
      NULL);
@@ -469,7 +479,7 @@ void on_abortUploadButton_clicked_fs(void * unused,
   uploadList = glade_xml_get_widget(getMainXML(),
                                     "activeUploadsList");
   selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(uploadList));
-  gtk_tree_selection_selected_foreach
+  ggc_tree_selection_selected_foreach
     (selection,
      &fsuiCallUploadCallback,
      &FSUI_abortUpload);
@@ -483,7 +493,7 @@ void on_stopUploadButton_clicked_fs(void * unused,
   uploadList = glade_xml_get_widget(getMainXML(),
                                     "activeUploadsList");
   selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(uploadList));
-  gtk_tree_selection_selected_foreach
+  ggc_tree_selection_selected_foreach
     (selection,
      &fsuiCallUploadCallback,
      &FSUI_stopUpload);