[GNUnet-SVN] r4899 - in gnunet-gtk: . src/plugins/fs

[gnunet]

Author: grothoff
Date: 2007-06-02 02:38:25 -0600 (Sat, 02 Jun 2007)
New Revision: 4899

Modified:
   gnunet-gtk/TODO
   gnunet-gtk/gnunet-gtk.glade
   gnunet-gtk/src/plugins/fs/namespace.c
   gnunet-gtk/src/plugins/fs/namespace_create.c
Log:
fixing namespace creation/deletion bugs

Modified: gnunet-gtk/TODO
===================================================================
--- gnunet-gtk/TODO     2007-06-02 08:23:57 UTC (rev 4898)
+++ gnunet-gtk/TODO     2007-06-02 08:38:25 UTC (rev 4899)
@@ -15,21 +15,20 @@
   => currently, "infoMessage" opens a window that cannot be closed
      and that does not have a frame!!! [RC]
 - re-enable advanced/namespace menus  [RC]
-  + namespace creation
-    => currently fails (in ECRS!)
+  + namespace addition
+    => untested
   + namespace update
     => FIX implementation!
-  + namespace addition
-    => currently fails (in ECRS!)
   + namespace search
-    => untested
+    => FIX implementation (list namespaces!)
+  + design and start use of short/nice namespace names/search URIs
+- re-enable advanced/collection menus
   + collection creation
     => untested
   + collection abortion
     => untested
-  + enable "delete" menu item sensitivity when it makes sense!
+  + enable collection "start"/"delete" menu item sensitivity when it makes 
sense!
     => untested
-  + design and start use of short/nice namespace names/search URIs
   + show content of current collection (where!?)
 
 

Modified: gnunet-gtk/gnunet-gtk.glade
===================================================================
--- gnunet-gtk/gnunet-gtk.glade 2007-06-02 08:23:57 UTC (rev 4898)
+++ gnunet-gtk/gnunet-gtk.glade 2007-06-02 08:38:25 UTC (rev 4899)
@@ -5000,7 +5000,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_namespaceContentFrameTreeView_destroy_" 
last_modification_time="Fri, 01 Jun 2007 06:55:02 GMT"/>
            </widget>
          </child>
        </widget>

Modified: gnunet-gtk/src/plugins/fs/namespace.c
===================================================================
--- gnunet-gtk/src/plugins/fs/namespace.c       2007-06-02 08:23:57 UTC (rev 
4898)
+++ gnunet-gtk/src/plugins/fs/namespace.c       2007-06-02 08:38:25 UTC (rev 
4899)
@@ -458,6 +458,63 @@
 }
 
 
+static void frame_destroy(GtkWidget * tree) {  
+  GtkTreeIter iter;
+  struct ECRS_URI * u;
+  struct ECRS_MetaData * m;
+  NamespaceList * prev;
+  NamespaceList * pos;
+  NamespaceList * next;
+  GtkWidget * del_menu;
+
+  pos = head;
+  prev = NULL;
+  while (pos != NULL) {
+    next = pos->next;
+    if (pos->treeview == tree) 
+      break;
+    prev = pos;
+    pos = next;
+  }
+  if (pos == NULL) {
+    GE_BREAK(NULL, 0);
+    return; 
+  }
+  if (prev == NULL)
+    head = pos->next;
+  else
+    prev->next = pos->next;
+  FREE(pos->name);
+  ECRS_freeMetaData(pos->meta);
+  if (gtk_tree_model_get_iter_first(pos->model,
+                                   &iter)) {
+    do {
+      gtk_tree_model_get(pos->model,
+                        &iter,
+                        IN_NAMESPACE_URI, &u,
+                        IN_NAMESPACE_META, &m,
+                        -1);
+      gtk_list_store_set(GTK_LIST_STORE(pos->model),
+                        &iter,
+                        IN_NAMESPACE_URI, NULL,
+                        IN_NAMESPACE_META, NULL,
+                        -1);
+      if (u != NULL)
+       ECRS_freeUri(u);
+      if (m != NULL)
+       ECRS_freeMetaData(m);
+    } while (gtk_tree_model_iter_next(pos->model,
+                                     &iter));
+  }
+  FREE(pos);
+  del_menu = glade_xml_get_widget(getMainXML(),
+                                 "namespaceDelete");
+  gtk_widget_set_sensitive(del_menu,
+                          head != NULL);
+}
+
+
+
 void namespaceDelete_clicked_fs(GtkWidget * dummy1,
                                GtkWidget * dummy2) {
   GtkWidget * notebook;
@@ -522,7 +579,7 @@
   NS_deleteNamespace(ectx,
                     cfg,
                     list->name);
-
+  frame_destroy(list->treeview);
   DEBUG_END();
 }
 
@@ -565,7 +622,7 @@
                                cfg,
                                cls->anonymityLevel,
                                1000, /* FIXME: priority */
-                               999999, /* FIXME: expiration */
+                               get_time() + 999999, /* FIXME: expiration */
                                cls->namespaceName,
                                cls->updateInterval,
                                cls->lastId,
@@ -986,66 +1043,9 @@
 }
 
 
-void on_localNamespaceContentFrameTreeView_destroy_fs(GtkWidget * tree,
-                                                     GtkWidget * dummy2) {  
-  GtkTreeIter iter;
-  struct ECRS_URI * u;
-  struct ECRS_MetaData * m;
-  NamespaceList * prev;
-  NamespaceList * pos;
-  NamespaceList * next;
-  GtkWidget * del_menu;
-
-  fprintf(stderr,
-         "DESTROYING!\n");
-  pos = head;
-  while (pos != NULL) {
-    next = pos->next;
-    if (pos->treeview == tree) 
-      break;
-    prev = pos;
-    pos = next;
-  }
-  if (pos == NULL) {
-    GE_BREAK(NULL, 0);
-    return; 
-  }
-  if (prev == NULL)
-    head = pos->next;
-  else
-    prev->next = pos->next;
-  FREE(pos->name);
-  ECRS_freeMetaData(pos->meta);
-  if (gtk_tree_model_get_iter_first(pos->model,
-                                   &iter)) {
-    do {
-      gtk_tree_model_get(pos->model,
-                        &iter,
-                        IN_NAMESPACE_URI, &u,
-                        IN_NAMESPACE_META, &m,
-                        -1);
-      gtk_list_store_set(GTK_LIST_STORE(pos->model),
-                        &iter,
-                        IN_NAMESPACE_URI, NULL,
-                        IN_NAMESPACE_META, NULL,
-                        -1);
-      if (u != NULL)
-       ECRS_freeUri(u);
-      if (m != NULL)
-       ECRS_freeMetaData(m);
-    } while (gtk_tree_model_iter_next(pos->model,
-                                     &iter));
-  }
-  FREE(pos);
-  fprintf(stderr,
-         "DESTROYED %p!\n", head);
-  del_menu = glade_xml_get_widget(getMainXML(),
-                                 "namespaceDelete");
-  gtk_widget_set_sensitive(del_menu,
-                          head != NULL);
-}
-
 void fs_namespace_stop() {
+  while (head != NULL)
+    frame_destroy(head->treeview);
   URITRACK_unregisterTrackCallback(&updateViewSave,
                                   NULL);
 }

Modified: gnunet-gtk/src/plugins/fs/namespace_create.c
===================================================================
--- gnunet-gtk/src/plugins/fs/namespace_create.c        2007-06-02 08:23:57 UTC 
(rev 4898)
+++ gnunet-gtk/src/plugins/fs/namespace_create.c        2007-06-02 08:38:25 UTC 
(rev 4899)
@@ -216,11 +216,11 @@
                              gtk_spin_button_get_value_as_int
                              (GTK_SPIN_BUTTON(spin)),
                              1000, /* FIXME: priority */
-                             999999, /* FIXME: expiration */
+                             get_time() + 999999, /* FIXME: expiration */
                              namespaceName,
-                               meta,
-                               keywordURI,
-                               &rootEntry);
+                             meta,
+                             keywordURI,
+                             &rootEntry);
     if (root != NULL) {
       ECRS_getNamespaceId(root,
                          &namespaceId);