1 files changed, 183 insertions, 11 deletions

diff --git a/src/main_window_file_publish.c b/src/main_window_file_publish.c
index 58352b77..96fcec38 100644
--- a/src/main_window_file_publish.c
+++ b/src/main_window_file_publish.c
@@ -66,6 +66,7 @@ update_selectivity ()
 {
   GtkTreeView *tv;
   GtkTreeModel *tm;
+  GtkTreeModel *ptm;
   GtkTreeSelection *sel;
   GtkTreeIter iter;
   GtkTreeIter parent;
@@ -79,7 +80,27 @@ update_selectivity ()
   GtkWidget *execute_button;
   int is_dir;
   struct GNUNET_FS_FileInformation *fip;
-
+  int ns_ok;
+  char *namespace_id;
+  
+  tm = GTK_TREE_MODEL (gtk_builder_get_object (master_builder,
+                                               "GNUNET_GTK_file_sharing_publishing_tree_store"));
+  tv = GTK_TREE_VIEW (gtk_builder_get_object (master_builder,
+                                              "GNUNET_GTK_master_publish_dialog_pseudonym_tree_view"));
+  sel = gtk_tree_view_get_selection (tv);
+  ns_ok = GNUNET_YES;
+  if (TRUE == gtk_tree_selection_get_selected (sel, &ptm, &iter))
+    {
+      gtk_tree_model_get (ptm,
+                          &iter,
+                          2, &namespace_id,
+                          -1);
+      if (namespace_id == NULL)
+        {
+          ns_ok = GNUNET_NO;
+          GNUNET_free (namespace_id);
+        }
+    }
   up_button = GTK_WIDGET (gtk_builder_get_object (master_builder,
                                                   "GNUNET_GTK_master_publish_dialog_up_button"));
   down_button = GTK_WIDGET (gtk_builder_get_object (master_builder,
@@ -98,7 +119,8 @@ update_selectivity ()
                                               "GNUNET_GTK_master_publish_dialog_file_information_tree_view"));
   sel = gtk_tree_view_get_selection (tv);
   tm = gtk_tree_view_get_model (tv);
-  if (gtk_tree_model_get_iter_first (tm, &iter))
+  if ( (gtk_tree_model_get_iter_first (tm, &iter)) &&
+       (ns_ok == GNUNET_YES) )
     gtk_widget_set_sensitive (execute_button, TRUE);
   else
     gtk_widget_set_sensitive (execute_button, FALSE);
@@ -526,6 +548,59 @@ move_entry (GtkTreeModel *tm,
   update_selectivity ();
 }
 
+/**
+ * User has changed the "current" identifier for the content in
+ * the GtkTreeView.  Update the model.
+ */
+void
+GNUNET_GTK_master_publish_dialog_pseudonym_updates_renderer_edited_cb (GtkCellRendererText *renderer,
+                                                                       gchar *cpath,
+                                                                       gchar *new_text,
+                                                                       gpointer user_data)
+{
+  GtkTreeIter iter;
+  GtkTreeStore *ts;
+
+  ts = GTK_TREE_STORE (gtk_builder_get_object (master_builder,
+                                               "GNUNET_GTK_pseudonym_tree_store"));
+  
+  if (TRUE !=
+      gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (ts), &iter, cpath))
+    {
+      GNUNET_break (0);
+      return;
+    }
+  gtk_tree_store_set (ts, &iter, 5, new_text, -1);
+  update_selectivity ();
+}
+
+
+/**
+ * User has changed the "current" identifier for the content in
+ * the GtkTreeView.  Update the model.
+ */
+void
+GNUNET_GTK_master_publish_dialog_pseudonym_identifier_renderer_edited_cb (GtkCellRendererText *renderer,
+                                                                          gchar *cpath,
+                                                                          gchar *new_text,
+                                                                          gpointer user_data)
+{
+  GtkTreeIter iter;
+  GtkTreeStore *ts;
+
+  ts = GTK_TREE_STORE (gtk_builder_get_object (master_builder,
+                                               "GNUNET_GTK_pseudonym_tree_store"));
+  
+  if (TRUE !=
+      gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (ts), &iter, cpath))
+    {
+      GNUNET_break (0);
+      return;
+    }
+  gtk_tree_store_set (ts, &iter, 2, new_text, -1);
+  update_selectivity ();
+}
+
 
 void
 GNUNET_GTK_master_publish_dialog_right_button_clicked_cb (GtkWidget * dummy, 
@@ -640,7 +715,7 @@ GNUNET_GTK_master_publish_dialog_up_button_clicked_cb (GtkWidget * dummy,
   if (TRUE != gtk_tree_selection_get_selected (sel,
                                                &tm,
                                                &iter))
-    {
+   {
       GNUNET_break (0);
       return;
     }
@@ -1055,6 +1130,77 @@ get_file_information (GtkTreeModel *tm,
 }
 
 
+struct UpdateableContext
+{
+  GtkTreeIter parent;
+  GtkTreeStore *ts;
+  const char *namespace_name;
+  struct GNUNET_FS_Namespace *ns;
+};
+
+
+static void
+add_updateable_to_ts (void *cls,
+                      const char *last_id,
+                      const struct GNUNET_FS_Uri *last_uri,
+                      const struct GNUNET_CONTAINER_MetaData *last_meta,
+                      const char *next_id)
+{
+  struct UpdateableContext *uc = cls;
+  GtkTreeIter iter;
+  char *desc;
+
+  desc = GNUNET_CONTAINER_meta_data_get_by_type (last_meta,
+                                                 EXTRACTOR_METATYPE_DESCRIPTION);
+  gtk_tree_store_insert_with_values (uc->ts, 
+                                     &iter,
+                                     &uc->parent,
+                                     G_MAXINT,
+                                     0, uc->namespace_name,
+                                     1, uc->ns,
+                                     2, last_id,
+                                     3, GNUNET_FS_uri_dup (last_uri),
+                                     4, GNUNET_CONTAINER_meta_data_duplicate (last_meta),
+                                     5, next_id,
+                                     6, desc,
+                                     7, FALSE /* current not editable (only for top-level) */,
+                                     8, TRUE /* update editable (always) */,
+                                     -1);  
+  GNUNET_free_non_null (desc);
+}
+
+
+static void
+add_namespace_to_ts (void *cls,
+                     const char *name,
+                     const GNUNET_HashCode *id)
+{
+  GtkTreeStore *ts = cls;
+  struct UpdateableContext uc;
+
+  uc.namespace_name = name;
+  uc.ts = ts;
+  uc.ns = GNUNET_FS_namespace_create (GNUNET_GTK_get_fs_handle (),
+                                      name);
+  gtk_tree_store_insert_with_values (ts, &uc.parent,
+                                     NULL,
+                                     G_MAXINT,
+                                     0, name,
+                                     1, uc.ns,
+                                     2, NULL /* last-id */,
+                                     3, NULL /* last-uri */,
+                                     4, NULL /* meta */,
+                                     5, NULL /* next-ID */,
+                                     6, NULL /* last-description */,
+                                     7, TRUE /* current editable */,
+                                     8, TRUE /* update editable */,
+                                     -1);  
+  /* FIXME: maybe we want to build the real tree here?
+     => FS API should be different... */
+  GNUNET_FS_namespace_list_updateable (uc.ns, &add_updateable_to_ts, &uc);
+}
+
+
 /**
  */
 void
@@ -1062,13 +1208,17 @@ GNUNET_GTK_main_menu_file_publish_activate_cb (GtkWidget * dummy,
                                                gpointer data)
 {
   GtkWidget *ad;
-  GtkTreeStore *ls;
+  GtkTreeStore *ts;
   gint ret;
   GtkTreeView *tv;
   GtkTreeSelection *sel;
   GtkTreeIter iter;
   struct GNUNET_FS_FileInformation *fi;
   GtkTreeModel *tm;
+  GtkTreeModel *ptm;
+  struct GNUNET_FS_Namespace *namespace;
+  char *namespace_id;
+  char *namespace_uid;
   
   GNUNET_assert (master_builder == NULL);
   master_builder = GNUNET_GTK_get_new_builder ("publish_dialog.glade");
@@ -1081,29 +1231,51 @@ GNUNET_GTK_main_menu_file_publish_activate_cb (GtkWidget * dummy,
                    G_CALLBACK(selection_changed_cb), NULL); 
   ad = GTK_WIDGET (gtk_builder_get_object (master_builder,
                                            "GNUNET_GTK_master_publish_dialog"));
-  ls = GTK_TREE_STORE (gtk_builder_get_object (master_builder,
+  ts = GTK_TREE_STORE (gtk_builder_get_object (master_builder,
                                                "GNUNET_GTK_pseudonym_tree_store"));
-  /* FIXME: populate 'ls' */
+  GNUNET_FS_namespace_list (GNUNET_GTK_get_fs_handle (),
+                            &add_namespace_to_ts,
+                            ts);
   ret = gtk_dialog_run (GTK_DIALOG (ad));
   if (ret == GTK_RESPONSE_OK)
     {
-      /* FIXME: grab namespace from ls! */
       tm = GTK_TREE_MODEL (gtk_builder_get_object (master_builder,
                                                    "GNUNET_GTK_file_sharing_publishing_tree_store"));
+      tv = GTK_TREE_VIEW (gtk_builder_get_object (master_builder,
+                                                  "GNUNET_GTK_master_publish_dialog_pseudonym_tree_view"));
+      sel = gtk_tree_view_get_selection (tv);
+      if (TRUE == gtk_tree_selection_get_selected (sel, &ptm, &iter))
+        {
+          gtk_tree_model_get (ptm,
+                              &iter,
+                              1, &namespace,
+                              2, &namespace_id,
+                              5, &namespace_uid,
+                              -1);
+        }
+      else
+        {
+          namespace = NULL;
+          namespace_id = NULL;
+          namespace_uid = NULL;
+        }
       if (gtk_tree_model_get_iter_first (tm, &iter))
         do
           {
             fi = get_file_information (tm, &iter);
             GNUNET_FS_publish_start (GNUNET_GTK_get_fs_handle (),
                                      fi,
-                                     NULL /* FIXME: namespace */,
-                                     NULL /* FIXME: namespace id */,
-                                     NULL /* FIXME: namespace uid */,
+                                     namespace,
+                                     namespace_id,
+                                     namespace_uid,
                                      GNUNET_FS_PUBLISH_OPTION_NONE);
           }
         while (gtk_tree_model_iter_next (tm, &iter));
-    }
+      GNUNET_free_non_null (namespace_uid);
+      GNUNET_free_non_null (namespace_id);      
+    }  
   /* FIXME: free state from 'ls' */
+  /* FIXME: free state from 'tm' */
   gtk_widget_destroy (ad);
   g_object_unref (G_OBJECT (master_builder));
   master_builder = NULL;