[GNUnet-SVN] r3570 - in gnunet-gtk: . src/common src/include src/plugins/daemon src/plugins/fs

[grothoff]

Author: grothoff
Date: 2006-10-29 18:58:05 -0800 (Sun, 29 Oct 2006)
New Revision: 3570

Modified:
   gnunet-gtk/gnunet-gtk.glade
   gnunet-gtk/src/common/helper.c
   gnunet-gtk/src/include/gnunetgtk_common.h
   gnunet-gtk/src/plugins/daemon/daemon.c
   gnunet-gtk/src/plugins/fs/Makefile.am
   gnunet-gtk/src/plugins/fs/download.c
   gnunet-gtk/src/plugins/fs/fs.c
   gnunet-gtk/src/plugins/fs/namespace.c
   gnunet-gtk/src/plugins/fs/search.c
   gnunet-gtk/src/plugins/fs/upload.c
Log:
fixes

Modified: gnunet-gtk/gnunet-gtk.glade
===================================================================
--- gnunet-gtk/gnunet-gtk.glade 2006-10-30 01:24:32 UTC (rev 3569)
+++ gnunet-gtk/gnunet-gtk.glade 2006-10-30 02:58:05 UTC (rev 3570)
@@ -4353,7 +4353,6 @@
                      <property name="fixed_height_mode">False</property>
                      <property name="hover_selection">False</property>
                      <property name="hover_expand">False</property>
-                     <signal name="destroy" 
handler="on_closeSearchButton_clicked_" object="searchResults" 
last_modification_time="Sat, 28 May 2005 13:55:09 GMT"/>
                    </widget>
                  </child>
                </widget>
@@ -4542,7 +4541,7 @@
                      <property name="use_stock">True</property>
                      <property name="relief">GTK_RELIEF_NORMAL</property>
                      <property name="focus_on_click">False</property>
-                     <signal name="clicked" 
handler="on_searchCancelButton_clicked_" object="searchResultsFrame" 
last_modification_time="Sun, 22 Oct 2006 06:14:18 GMT"/>
+                     <signal name="clicked" 
handler="on_closeSearchButton_clicked_" object="searchResultsFrame" 
last_modification_time="Sun, 22 Oct 2006 06:14:18 GMT"/>
                      <accelerator key="Return" modifiers="GDK_CONTROL_MASK" 
signal="activate"/>
                    </widget>
                    <packing>
@@ -4561,7 +4560,7 @@
                      <property name="use_stock">True</property>
                      <property name="relief">GTK_RELIEF_NORMAL</property>
                      <property name="focus_on_click">False</property>
-                     <signal name="clicked" 
handler="on_searchClosedButton_clicked_" object="searchResultsFrame" 
last_modification_time="Sun, 22 Oct 2006 06:14:02 GMT"/>
+                     <signal name="clicked" 
handler="on_closeSearchButton_clicked_" object="searchResultsFrame" 
last_modification_time="Sun, 22 Oct 2006 06:14:02 GMT"/>
                      <accelerator key="Return" modifiers="GDK_CONTROL_MASK" 
signal="activate"/>
                    </widget>
                    <packing>
@@ -6032,6 +6031,7 @@
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="focus_on_map">True</property>
   <property name="urgency_hint">False</property>
+
   <child>
     <widget class="GtkVBox" id="vbox16">
       <property name="visible">True</property>
@@ -7851,6 +7851,7 @@
          <property name="yalign">0.5</property>
          <property name="xpad">5</property>
          <property name="ypad">0</property>
+         <property name="mnemonic_widget">searchCloseButton</property>
          <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
          <property name="width_chars">-1</property>
          <property name="single_line_mode">True</property>
@@ -7867,6 +7868,7 @@
        <widget class="GtkButton" id="searchCloseButton">
          <property name="visible">True</property>
          <property name="tooltip" translatable="yes">Stop the 
search.</property>
+         <property name="can_focus">True</property>
          <property name="relief">GTK_RELIEF_NONE</property>
          <property name="focus_on_click">True</property>
          <signal name="clicked" handler="on_closeSearchButton_clicked_fs" 
object="searchTabHBox" last_modification_time="Sun, 29 Oct 2006 06:09:02 GMT"/>

Modified: gnunet-gtk/src/common/helper.c
===================================================================
--- gnunet-gtk/src/common/helper.c      2006-10-30 01:24:32 UTC (rev 3569)
+++ gnunet-gtk/src/common/helper.c      2006-10-30 02:58:05 UTC (rev 3570)
@@ -625,6 +625,10 @@
   FREE(msg);
   msg = STRDUP(ret);
   g_free(ret);
+  GE_BREAK(NULL,
+          TRUE == g_utf8_validate(msg,
+                                  -1,
+                                  &end));
   return msg;
 }
 
@@ -685,4 +689,53 @@
   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 */

Modified: gnunet-gtk/src/include/gnunetgtk_common.h
===================================================================
--- gnunet-gtk/src/include/gnunetgtk_common.h   2006-10-30 01:24:32 UTC (rev 
3569)
+++ gnunet-gtk/src/include/gnunetgtk_common.h   2006-10-30 02:58:05 UTC (rev 
3570)
@@ -142,4 +142,13 @@
 */
 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

Modified: gnunet-gtk/src/plugins/daemon/daemon.c
===================================================================
--- gnunet-gtk/src/plugins/daemon/daemon.c      2006-10-30 01:24:32 UTC (rev 
3569)
+++ gnunet-gtk/src/plugins/daemon/daemon.c      2006-10-30 02:58:05 UTC (rev 
3570)
@@ -56,13 +56,11 @@
                             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;

Modified: gnunet-gtk/src/plugins/fs/Makefile.am
===================================================================
--- gnunet-gtk/src/plugins/fs/Makefile.am       2006-10-30 01:24:32 UTC (rev 
3569)
+++ gnunet-gtk/src/plugins/fs/Makefile.am       2006-10-30 02:58:05 UTC (rev 
3570)
@@ -20,7 +20,7 @@
   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 \

Modified: gnunet-gtk/src/plugins/fs/download.c
===================================================================
--- gnunet-gtk/src/plugins/fs/download.c        2006-10-30 01:24:32 UTC (rev 
3569)
+++ gnunet-gtk/src/plugins/fs/download.c        2006-10-30 02:58:05 UTC (rev 
3570)
@@ -213,12 +213,18 @@
   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 @@
   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 @@
   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 @@
   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 @@
   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);

Modified: gnunet-gtk/src/plugins/fs/fs.c
===================================================================
--- gnunet-gtk/src/plugins/fs/fs.c      2006-10-30 01:24:32 UTC (rev 3569)
+++ gnunet-gtk/src/plugins/fs/fs.c      2006-10-30 02:58:05 UTC (rev 3570)
@@ -414,6 +414,9 @@
   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 @@
                   YES,
                   &eventProcessor,
                   NULL);
-  fs_collection_start();
-  fs_summary_start();
-  fs_namespace_start();
 }
 
 void done_fs() {
@@ -433,9 +433,9 @@
     = 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 */

Modified: gnunet-gtk/src/plugins/fs/namespace.c
===================================================================
--- gnunet-gtk/src/plugins/fs/namespace.c       2006-10-30 01:24:32 UTC (rev 
3569)
+++ gnunet-gtk/src/plugins/fs/namespace.c       2006-10-30 02:58:05 UTC (rev 
3570)
@@ -936,7 +936,7 @@
       cls.nextId = &nextId;
     }
     cls.meta = meta;
-    gtk_tree_selection_selected_foreach
+    ggc_tree_selection_selected_foreach
       (selection,
        &initiateUpload,
        &cls);
@@ -1161,7 +1161,7 @@
     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);

Modified: gnunet-gtk/src/plugins/fs/search.c
===================================================================
--- gnunet-gtk/src/plugins/fs/search.c  2006-10-30 01:24:32 UTC (rev 3569)
+++ gnunet-gtk/src/plugins/fs/search.c  2006-10-30 02:58:05 UTC (rev 3570)
@@ -183,7 +183,6 @@
         sizeof(SearchList));
   list->searchString
     = STRDUP(dhead);
-  FREE(description);
   list->uri
     = ECRS_dupUri(uri);
   list->fsui_list 
@@ -306,6 +305,7 @@
                     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_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 @@
 /**
  * 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 @@
 /**
  * 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 */

Modified: gnunet-gtk/src/plugins/fs/upload.c
===================================================================
--- gnunet-gtk/src/plugins/fs/upload.c  2006-10-30 01:24:32 UTC (rev 3569)
+++ gnunet-gtk/src/plugins/fs/upload.c  2006-10-30 02:58:05 UTC (rev 3570)
@@ -365,6 +365,7 @@
 void on_mainFileSharingInsertBrowseButton_clicked_fs(GtkWidget * browseButton,
                                                     gpointer dummy) {
   char * filename;
+  char * ofn;
   const char *oldfilename;
   GtkWidget * uploadLine;
   GtkEntry * entry;
@@ -375,8 +376,17 @@
                                    "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 @@
   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 @@
   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 @@
   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);