parse update interval

2 files changed, 30 insertions, 6 deletions

diff --git a/src/plugins/fs/collection.c b/src/plugins/fs/collection.c
index 53e51e47..56dddd2e 100644
--- a/src/plugins/fs/collection.c
+++ b/src/plugins/fs/collection.c
@@ -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 @@ void createCollection_clicked(GtkWidget * dummy1,
   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 @@ void createCollection_clicked(GtkWidget * dummy1,
       = 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 
diff --git a/src/plugins/fs/namespace.c b/src/plugins/fs/namespace.c
index b0749096..4cba7dc1 100644
--- a/src/plugins/fs/namespace.c
+++ b/src/plugins/fs/namespace.c
@@ -734,6 +734,9 @@ void on_namespaceInsertButton_clicked(GtkWidget * dummy1,
       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,