1 files changed, 50 insertions, 36 deletions

diff --git a/src/fs/gnunet-fs-gtk_publish-dialog.c b/src/fs/gnunet-fs-gtk_publish-dialog.c
index 14a855ea..975db8c0 100644
--- a/src/fs/gnunet-fs-gtk_publish-dialog.c
+++ b/src/fs/gnunet-fs-gtk_publish-dialog.c
@@ -1,10 +1,10 @@
 /*
      This file is part of GNUnet
-     (C) 2005, 2006, 2010, 2012 Christian Grothoff (and other contributing authors)
+     (C) 2005-2013 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 2, or (at your
+     by the Free Software Foundation; either version 3, or (at your
      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
@@ -27,6 +27,8 @@
 #include "gnunet-fs-gtk_publish-edit-dialog.h"
 #include <gnunet/gnunet_util_lib.h>
 #include <gnunet/gnunet_fs_service.h>
+#include <gnunet/gnunet_identity_service.h>
+
 
 #define MARKER_DIR_FILE_SIZE "-"
 
@@ -246,7 +248,7 @@ struct MainPublishingDialogContext
   /**
    * Default namespace. May be NULL.
    */
-  struct GNUNET_FS_Namespace *ns;
+  struct GNUNET_IDENTITY_Ego *ns;
 
   /**
    * Stores the value that was in identifier_entry previously.
@@ -390,13 +392,13 @@ struct AddDirClientContext
 };
 
 
-static void clear_keywords_from_tm (struct MainPublishingDialogContext *ctx);
+static void 
+clear_keywords_from_tm (struct MainPublishingDialogContext *ctx);
 
 
 /* ************************ editing operations inside the master dialog ********************* */
 
 
-
 /**
  * Check if two GtkTreeIters refer to the same element.
  *
@@ -406,9 +408,9 @@ static void clear_keywords_from_tm (struct MainPublishingDialogContext *ctx);
  * @return GNUNET_YES if they are equal
  */
 static int
-gtk_tree_iter_equals (GtkTreeModel * tm,
-                      GtkTreeIter * i1, 
-                      GtkTreeIter * i2)
+gtk_tree_iter_equals (GtkTreeModel *tm,
+                      GtkTreeIter *i1, 
+                      GtkTreeIter *i2)
 {
   GtkTreePath *p1;
   GtkTreePath *p2;
@@ -2041,8 +2043,6 @@ close_master_publish_dialog (struct MainPublishingDialogContext *ctx)
   gtk_widget_destroy (GTK_WIDGET (ctx->master_pubdialog));
   g_object_unref (G_OBJECT (ctx->builder));
   GNUNET_free_non_null (ctx->ns_name);
-  if (ctx->ns)
-    GNUNET_FS_namespace_delete (ctx->ns, GNUNET_NO);
   g_free (ctx->previous_id);
   GNUNET_free (ctx);
   return GNUNET_YES;
@@ -2073,17 +2073,12 @@ insert_advertisement (void *cls, struct GNUNET_FS_FileInformation *fi,
     void **client_info)
 {
   struct MainPublishingDialogContext *ctx = cls;
-
+  struct GNUNET_CRYPTO_EccPublicKey pub;
   struct GNUNET_FS_Uri *sks_uri;
-  char *emsg;
   char *sks_uri_string;
 
-  emsg = NULL;
-  sks_uri = GNUNET_FS_uri_sks_create (ctx->ns, "/", &emsg);
-  GNUNET_free_non_null (emsg);
-  if (NULL == sks_uri)
-    return GNUNET_SYSERR;
-
+  GNUNET_IDENTITY_ego_get_public_key (ctx->ns, &pub);
+  sks_uri = GNUNET_FS_uri_sks_create (&pub, "/");
   sks_uri_string = GNUNET_FS_uri_to_string (sks_uri);
   GNUNET_FS_uri_destroy (sks_uri);
   if (NULL == sks_uri_string)
@@ -2110,7 +2105,7 @@ GNUNET_GTK_master_publish_dialog_execute_button_clicked_cb (GtkButton * button,
 {
   struct MainPublishingDialogContext *ctx = user_data;
   gchar *namespace_id;
-  struct GNUNET_FS_Namespace *ns;
+  struct GNUNET_IDENTITY_Ego *ns;
   const gchar *namespace_uid;
   struct GNUNET_FS_FileInformation *fi;
   GtkTreeIter iter;
@@ -2144,7 +2139,8 @@ GNUNET_GTK_master_publish_dialog_execute_button_clicked_cb (GtkButton * button,
     if (NULL != (id_entry_text = gtk_entry_get_text (GTK_ENTRY (ctx->identifier_entry))))
       namespace_id = g_strdup (id_entry_text);
     else if (!do_global)
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Global publication is disabled, but namespace_id is not available\n");
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 
+                  "Global publication is disabled, but namespace_id is not available\n");
     if ((NULL != namespace_id) && ('\0' == namespace_id[0]))
     {
       g_free (namespace_id);
@@ -2158,10 +2154,12 @@ GNUNET_GTK_master_publish_dialog_execute_button_clicked_cb (GtkButton * button,
       ns = ctx->ns;
     }
     else if (!do_global)
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Global publication is disabled, but namespace_id unavailable or zero-length\n");
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Global publication is disabled, but namespace_id unavailable or zero-length\n");
   }
   else if (!do_global)
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Global publication is disabled, ns is either NULL or disabled, yet 'Execute' was pressed\n");
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Global publication is disabled, ns is either NULL or disabled, yet 'Execute' was pressed\n");
   if ((!do_global) && (NULL == ns))
   {
     g_free (namespace_id);
@@ -2179,7 +2177,8 @@ GNUNET_GTK_master_publish_dialog_execute_button_clicked_cb (GtkButton * button,
         GNUNET_FS_file_information_inspect (fi, insert_advertisement, ctx);
       /* FIXME-FEATURE-BUG-MINOR: should we convert namespace id and uid from UTF8? */
       GNUNET_FS_publish_start (GNUNET_FS_GTK_get_fs_handle (), 
-                               fi, ns,
+                               fi,
+                               GNUNET_IDENTITY_ego_get_private_key (ns),
                                namespace_id, namespace_uid,
                                GNUNET_FS_PUBLISH_OPTION_NONE);
     }
@@ -2384,7 +2383,7 @@ struct UpdateableContext
   /**
    * Handle to the namespace.
    */
-  struct GNUNET_FS_Namespace *ns;
+  struct GNUNET_IDENTITY_Ego *ns;
 
   /**
    * Hash codes of identifiers already added to tree store.
@@ -2531,7 +2530,10 @@ add_updateable_to_ts (void *cls, const char *last_id,
   sc.ns = uc->ns;
   sc.seen = uc->seen;
   sc.update_called = GNUNET_NO;
-  GNUNET_FS_namespace_list_updateable (uc->ns, next_id, &add_updateable_to_ts,
+  GNUNET_FS_namespace_list_updateable (GNUNET_FS_GTK_get_fs_handle (), 
+                                       GNUNET_IDENTITY_ego_get_private_key (uc->ns),
+                                       next_id,
+                                       &add_updateable_to_ts,
                                        &sc);
   if ((sc.update_called == GNUNET_NO) && (next_id != NULL) &&
       (strlen (next_id) > 0))
@@ -2560,12 +2562,15 @@ add_updateable_to_ts (void *cls, const char *last_id,
  * @return GNUNET_YES, always.
  */
 static int
-free_seen_paths (void *cls, const struct GNUNET_HashCode * key, void *value)
+free_seen_paths (void *cls, 
+                 const struct GNUNET_HashCode *key, 
+                 void *value)
 {
   GNUNET_free_non_null (value);
   return GNUNET_YES;
 }
 
+
 /**
  * Add all updateable entries of the current namespace to the
  * tree store.
@@ -2575,7 +2580,8 @@ free_seen_paths (void *cls, const struct GNUNET_HashCode * key, void *value)
  * @param id identity of the namespace to add
  */
 static void
-add_namespace_to_ts (GtkTreeStore *ts, struct GNUNET_FS_Namespace *ns)
+add_namespace_to_ts (GtkTreeStore *ts, 
+                     struct GNUNET_IDENTITY_Ego *ns)
 {
   struct UpdateableContext uc;
 
@@ -2584,13 +2590,15 @@ add_namespace_to_ts (GtkTreeStore *ts, struct GNUNET_FS_Namespace *ns)
   uc.ns = ns;
   uc.update_called = GNUNET_NO;
   uc.seen = GNUNET_CONTAINER_multihashmap_create (128, GNUNET_NO);
-  GNUNET_FS_namespace_list_updateable (uc.ns, NULL, &add_updateable_to_ts, &uc);
+  GNUNET_FS_namespace_list_updateable (GNUNET_FS_GTK_get_fs_handle (), 
+                                       GNUNET_IDENTITY_ego_get_private_key (uc.ns),
+                                       NULL,
+                                       &add_updateable_to_ts, &uc);
   GNUNET_CONTAINER_multihashmap_iterate (uc.seen, free_seen_paths, NULL);
   GNUNET_CONTAINER_multihashmap_destroy (uc.seen);
 }
 
 
-
 /**
  * Run the file-publishing operation (by opening the master publishing dialog).
  * 
@@ -2598,7 +2606,8 @@ add_namespace_to_ts (GtkTreeStore *ts, struct GNUNET_FS_Namespace *ns)
  * @param user_data builder of the main window
  */
 void
-GNUNET_GTK_main_menu_file_publish_activate_cb (GtkWidget * dummy, gpointer user_data)
+GNUNET_GTK_main_menu_file_publish_activate_cb (GtkWidget * dummy, 
+                                               gpointer user_data)
 {
   struct MainPublishingDialogContext *ctx;
 /*  GtkTreeView *pseudonym_treeview;*/
@@ -2608,9 +2617,9 @@ GNUNET_GTK_main_menu_file_publish_activate_cb (GtkWidget * dummy, gpointer user_
   int own_enabled;
   int global_enabled;
 
-  ctx = GNUNET_malloc (sizeof (struct MainPublishingDialogContext));
+  ctx = GNUNET_new (struct MainPublishingDialogContext);
   ctx->builder = GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_publish_dialog.glade", ctx);
-  if (ctx->builder == NULL)
+  if (NULL == ctx->builder)
   {
     GNUNET_break (0);
     GNUNET_free (ctx);
@@ -2678,16 +2687,21 @@ GNUNET_GTK_main_menu_file_publish_activate_cb (GtkWidget * dummy, gpointer user_
                     G_CALLBACK (identifiers_selection_changed_cb), ctx);
 
   cfg = GNUNET_FS_GTK_get_configuration ();
-  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (cfg,
-      "gnunet-fs-gtk", "DEFAULT_NAMESPACE", &ctx->ns_name))
+#if FIXME_MIGRATE_TO_IDENTITY_SERVICE
+  if (GNUNET_OK != 
+      GNUNET_CONFIGURATION_get_value_string (cfg,
+                                             "gnunet-fs-gtk",
+                                             "DEFAULT_NAMESPACE",
+                                             &ctx->ns_name))
     ctx->ns_name = NULL;
   else
   {
-    ctx->ns = GNUNET_FS_namespace_open_existing (GNUNET_FS_GTK_get_fs_handle (), ctx->ns_name);
+    ctx->ns = GNUNET_FS_namespace_open_existing (GNUNET_FS_GTK_get_fs_handle (), 
+                                                 ctx->ns_name);
     if (NULL == ctx->ns)
       GNUNET_free (ctx->ns_name);
   }
-
+#endif
   have_ns = (NULL != ctx->ns);
 
   gtk_widget_set_sensitive (ctx->own_checkbox, have_ns);