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

[grothoff]

Author: grothoff
Date: 2005-07-16 12:25:51 -0700 (Sat, 16 Jul 2005)
New Revision: 1559

Modified:
   gnunet-gtk/src/plugins/fs/collection.c
   gnunet-gtk/src/plugins/fs/namespace.c
Log:
parse update interval

Modified: gnunet-gtk/src/plugins/fs/collection.c
===================================================================
--- gnunet-gtk/src/plugins/fs/collection.c      2005-07-16 19:20:38 UTC (rev 
1558)
+++ gnunet-gtk/src/plugins/fs/collection.c      2005-07-16 19:25:51 UTC (rev 
1559)
@@ -27,6 +27,7 @@
 #include "platform.h"
 #include "gnunetgtk_common.h"
 #include "fs.h"
+#include "helper.h"
 #include "meta.h"
 #include "collection.h"
 #include <extractor.h>
@@ -70,11 +71,6 @@
   gtk_dialog_set_default_response(GTK_DIALOG(dialog),
                                  GTK_RESPONSE_OK);
   if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK) {
-    meta = getMetaDataFromList(metaXML,
-                              "collectionMetaDataTreeView",
-                              NULL);
-    spin = glade_xml_get_widget(metaXML,
-                               "collectionAnonymityLevel");    
     nameLine
       = glade_xml_get_widget(metaXML,
                             "collectionUpdateIntervalComboBoxEntry");
@@ -82,7 +78,32 @@
       = gtk_bin_get_child(GTK_BIN(nameLine));
     updateIntervalString 
       = gtk_entry_get_text(GTK_ENTRY(nameLine));
-    updateInterval = 0; /* FIXME */
+    if (0 == strcmp(_("--sporadic update--"),
+                   updateIntervalString))
+      updateInterval = ECRS_SBLOCK_UPDATE_SPORADIC;
+    else if (0 == strcmp(_("--no update--"),
+                        updateIntervalString))
+      updateInterval = ECRS_SBLOCK_UPDATE_NONE;
+    else if (OK != parseTime(updateIntervalString,
+                            &updateInterval)) {
+      gtk_widget_destroy(dialog);
+      UNREF(metaXML);
+      metaXML = NULL;
+      dialog = gtk_message_dialog_new 
+       (NULL,
+        GTK_DIALOG_MODAL,
+        GTK_MESSAGE_ERROR,
+        GTK_BUTTONS_CLOSE,
+        _("Failed to parse given time interval!"));
+      gtk_dialog_run(GTK_DIALOG(dialog));
+      gtk_widget_destroy(dialog);      
+      return;
+    }
+    meta = getMetaDataFromList(metaXML,
+                              "collectionMetaDataTreeView",
+                              NULL);
+    spin = glade_xml_get_widget(metaXML,
+                               "collectionAnonymityLevel");    
     nameLine = glade_xml_get_widget(metaXML,
                                    "collectionIdentifierEntry");
     collectionName 

Modified: gnunet-gtk/src/plugins/fs/namespace.c
===================================================================
--- gnunet-gtk/src/plugins/fs/namespace.c       2005-07-16 19:20:38 UTC (rev 
1558)
+++ gnunet-gtk/src/plugins/fs/namespace.c       2005-07-16 19:25:51 UTC (rev 
1559)
@@ -734,6 +734,9 @@
       cls.updateInterval = ECRS_SBLOCK_UPDATE_NONE;
     else if (OK != parseTime(timeSpec,
                             &cls.updateInterval)) {
+      gtk_widget_destroy(dialog);
+      UNREF(metaXML);
+      metaXML = NULL;
       dialog = gtk_message_dialog_new 
        (NULL,
         GTK_DIALOG_MODAL,