gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r29085 - gnunet-gtk/src/identity


From: gnunet
Subject: [GNUnet-SVN] r29085 - gnunet-gtk/src/identity
Date: Sat, 7 Sep 2013 15:45:11 +0200

Author: grothoff
Date: 2013-09-07 15:45:11 +0200 (Sat, 07 Sep 2013)
New Revision: 29085

Added:
   gnunet-gtk/src/identity/gnunet-identity-gtk_advertise.c
   gnunet-gtk/src/identity/gnunet-identity-gtk_advertise.h
Removed:
   gnunet-gtk/src/identity/gnunet-identity-gtk_ego_organizer.c
   gnunet-gtk/src/identity/gnunet-identity-gtk_ego_organizer.h
   gnunet-gtk/src/identity/gnunet-identity-gtk_namespace_manager.c
   gnunet-gtk/src/identity/gnunet-identity-gtk_namespace_manager.h
Modified:
   gnunet-gtk/src/identity/Makefile.am
Log:
-remove dead code, rename manager to advertise

Modified: gnunet-gtk/src/identity/Makefile.am
===================================================================
--- gnunet-gtk/src/identity/Makefile.am 2013-09-07 13:41:42 UTC (rev 29084)
+++ gnunet-gtk/src/identity/Makefile.am 2013-09-07 13:45:11 UTC (rev 29085)
@@ -12,7 +12,7 @@
 gnunet_identity_gtk_SOURCES = \
   gnunet-identity-gtk.c \
   gnunet-identity-gtk_about.c \
-  gnunet-identity-gtk_namespace_manager.c 
gnunet-identity-gtk_namespace_manager.h 
+  gnunet-identity-gtk_advertise.c gnunet-identity-gtk_advertise.h 
 gnunet_identity_gtk_LDADD = \
   $(top_builddir)/src/lib/libgnunetgtk.la \
   @GTK_LIBS@ \

Copied: gnunet-gtk/src/identity/gnunet-identity-gtk_advertise.c (from rev 
29083, gnunet-gtk/src/identity/gnunet-identity-gtk_namespace_manager.c)
===================================================================
--- gnunet-gtk/src/identity/gnunet-identity-gtk_advertise.c                     
        (rev 0)
+++ gnunet-gtk/src/identity/gnunet-identity-gtk_advertise.c     2013-09-07 
13:45:11 UTC (rev 29085)
@@ -0,0 +1,1275 @@
+/*
+     This file is part of GNUnet
+     (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 3, or (at your
+     option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with GNUnet; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+     Boston, MA 02111-1307, USA.
+*/
+
+/**
+ * @file src/identity/gnunet-identity-gtk_namespace_manager.c
+ * @author LRN
+ * @author Christian Grothoff
+ */
+#include "gnunet-identity-gtk_namespace_manager.h"
+#include <gnunet/gnunet_fs_service.h>
+
+/**
+ * Types of metadata we offer for namespaces.
+ */
+static gint types[] = {
+  EXTRACTOR_METATYPE_TITLE,
+  EXTRACTOR_METATYPE_KEYWORDS, 
+  EXTRACTOR_METATYPE_SUBJECT,
+  EXTRACTOR_METATYPE_DESCRIPTION,
+  EXTRACTOR_METATYPE_COMMENT, 
+  EXTRACTOR_METATYPE_COPYRIGHT,
+  EXTRACTOR_METATYPE_URI, 
+  EXTRACTOR_METATYPE_CREATOR, 
+  EXTRACTOR_METATYPE_CREATION_DATE,
+  EXTRACTOR_METATYPE_RESERVED
+};
+
+
+/**
+ * Columns in the metadata list store.
+ */
+enum METADATA_ModelColumns
+  {
+    /**
+     * A guint
+     */
+    METADATA_MC_TYPE_AS_ENUM = 0,
+
+    /**
+     * A gchararray 
+     */
+    METADATA_MC_TYPE_AS_STRING = 1,
+
+    /**
+     * A gchararray 
+     */
+    METADATA_MC_VALUE = 2
+
+  };
+
+
+/**
+ * Columns in the keyword list tree store.
+ */
+enum KEYWORDS_ModelColumns
+  {
+
+    /**
+     * A gchararray 
+     */
+    KEYWORDS_MC_KEYWORD = 0
+
+  };
+
+
+/**
+ * Columns in the meta types list tree store.
+ */
+enum METATYPES_ModelColumns
+  {
+
+    /**
+     * A gchararray 
+     */
+    METATYPES_MC_TYPE_AS_STRING = 0,
+
+    /**
+     * A guint
+     */
+    METATYPES_MC_TYPE_AS_ENUM = 1
+
+  };
+
+
+/**
+ * Context for advertisement operations.
+ */
+struct AdvertiseContext
+{
+  /**
+   * Builder for accessing objects in the dialog.
+   */
+  GtkBuilder *builder;
+  
+  /** 
+   * Private key of the namespace we will be advertising.
+   */
+  struct GNUNET_CRYPTO_EccPrivateKey priv;
+
+  /**
+   * Main dialog object.
+   */
+  GtkWidget *dialog;
+  
+  /**
+   * List of keywords to advertise under.
+   */
+  GtkListStore *keywords;
+
+  /**
+   * Metadata to include in the advertisement.
+   */
+  GtkListStore *metadata;
+
+  /**
+   * Model with the meta types.
+   */
+  GtkListStore *meta_types;
+
+};
+
+
+/**
+ * The user terminated the dialog.  Perform the appropriate action.
+ *
+ * @param dialog the advertisement dialog
+ * @param response_id action selected by the user
+ * @param user_data our 'struct AdvertiseContext' (to be cleaned up)
+ */
+void
+GNUNET_GTK_identity_advertise_dialog_response_cb (GtkDialog *dialog,
+                                                 gint response_id,
+                                                 gpointer user_data)
+{
+  struct AdvertiseContext *ac = user_data;
+
+  if (GTK_RESPONSE_OK == response_id)
+    {
+      GNUNET_break (0); // FIXME: not implemented
+    }
+
+  gtk_widget_destroy (ac->dialog);
+  g_object_unref (G_OBJECT (ac->builder));
+  GNUNET_free (ac);
+}
+
+
+/**
+ * FIXME: do we need this event? If so, what do we do?
+ */
+void
+GNUNET_GTK_identity_advertise_keywords_column_clicked_cb ()
+{
+  GNUNET_break (0);
+}
+
+ 
+/**
+ * User edited keywords in the keyword tree view.  Update
+ * the model accordingly.
+ */ 
+void
+GNUNET_GTK_identity_advertise_keywords_text_edited_cb ()
+{
+  GNUNET_break (0);
+}
+
+
+/**
+ * User pushed a key in the metadata tree view.  Check if it was
+ * "DEL" and if so, remove the selected values.
+ */
+void
+GNUNET_GTK_identity_advertise_metadata_treeview_key_press_event_cb ()
+{
+  GNUNET_break (0);
+}
+
+
+/**
+ * FIXME: how is this event triggered exactly?
+ */
+void
+GNUNET_GTK_identity_advertise_metadata_treeview_delete_event_cb ()
+{
+  GNUNET_break (0);
+}
+
+
+/**
+ * User edited metadata value.  Update sensitivity of the 'add' button.
+ */
+void
+GNUNET_GTK_identity_advertise_metadata_value_text_edited_cb ()
+{
+  GNUNET_break (0);
+}
+
+
+/**
+ * User edited metadata type.  Not sure we need to do something here...
+ */
+void
+GNUNET_GTK_identity_advertise_metadata_type_text_edited_cb ()
+{
+  GNUNET_break (0);
+}
+
+
+/**
+ * User clicked the 'add' button, get the type and value and update
+ * the metadata model.
+ */
+void
+GNUNET_GTK_identity_advertise_metadata_add_button_clicked_cb ()
+{
+  GNUNET_break (0);
+}
+
+
+/**
+ * Run the dialog for advertising a namespace.
+ *
+ * @param priv private key of the namespace to advertise
+ */
+void
+GNUNET_IDENTITY_advertise_dialog_start_ (const struct 
GNUNET_CRYPTO_EccPrivateKey *priv)
+{
+  struct AdvertiseContext *ac;
+  gint i;
+  GtkTreeIter iter;
+
+  ac = GNUNET_new (struct AdvertiseContext);
+  ac->priv = *priv;
+  ac->builder =
+    GNUNET_GTK_get_new_builder ("gnunet_identity_gtk_advertise_dialog.glade",
+                               ac);
+  if (NULL == ac->builder)
+  {
+    GNUNET_break (0);
+    GNUNET_free (ac);
+    return;
+  }
+  ac->dialog = GTK_WIDGET (gtk_builder_get_object
+                          (ac->builder, 
"GNUNET_GTK_identity_advertise_dialog"));
+  ac->keywords = GTK_LIST_STORE (gtk_builder_get_object
+                               (ac->builder, 
"GNUNET_GTK_identity_advertise_keywords_liststore"));
+  ac->metadata = GTK_LIST_STORE (gtk_builder_get_object
+                            (ac->builder, 
"GNUNET_GTK_identity_advertise_metadata_liststore"));
+  ac->meta_types = GTK_LIST_STORE (gtk_builder_get_object
+                                  (ac->builder, 
"GNUNET_GTK_identity_metadata_types_liststore"));
+  for (i = 0; EXTRACTOR_METATYPE_RESERVED != types[i]; i++)  
+    gtk_list_store_insert_with_values (ac->meta_types,
+                                      &iter, G_MAXINT, 
+                                      METATYPES_MC_TYPE_AS_STRING,
+                                      EXTRACTOR_metatype_to_string (types[i]),
+                                      METATYPES_MC_TYPE_AS_ENUM,
+                                      types[i],
+                                      -1);
+  gtk_window_present (GTK_WINDOW (ac->dialog));
+}
+
+
+#if 0
+
+static void
+sort_order_list (struct GNUNET_GTK_NamespaceManagerContext *ctx,
+    int sort_column)
+{
+  int sorted = GNUNET_NO;
+  GtkTreeIter iter;
+  gint i;
+  gint row_count;
+  gint *row_indices, *row_ints;
+  gchar **row_strings;
+
+  ctx->sort_direction = ctx->sort_direction <= 0 ? 1 : 0;
+
+  row_count = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (
+      ctx->ns_order_store), NULL);
+  if (! gtk_tree_model_get_iter_first (GTK_TREE_MODEL (
+      ctx->ns_order_store), &iter))
+    return;
+
+  row_indices = g_new0 (gint, row_count);
+  row_ints = g_new0 (gint, row_count);
+  row_strings = g_new0 (gchar *, row_count);
+
+  for (i = 0; i < row_count; i++)
+  {
+    int an_int;
+    char *a_string;
+    row_indices[i] = i;
+    switch (sort_column)
+    {
+    case GNUNET_GTK_NAMESPACE_ORDER_RANK_COLUMN:
+      gtk_tree_model_get (GTK_TREE_MODEL (ctx->ns_order_store), &iter,
+          sort_column, &an_int, -1);
+      row_ints[i] = an_int;
+      row_strings[i] = NULL;
+      break;
+    case GNUNET_GTK_NAMESPACE_ORDER_NAME_COLUMN:
+    case GNUNET_GTK_NAMESPACE_ORDER_IDENTIFIER_COLUMN:
+      gtk_tree_model_get (GTK_TREE_MODEL (ctx->ns_order_store), &iter,
+          sort_column, &a_string, -1);
+      row_strings[i] = a_string;
+      break;
+    default:
+      row_strings[i] = NULL;
+      break;
+    }
+    if (TRUE != gtk_tree_model_iter_next (GTK_TREE_MODEL (
+      ctx->ns_order_store), &iter))
+      break;
+  }
+
+  while (sorted != GNUNET_YES)
+  {
+    sorted = GNUNET_YES;
+    for (i = 0; i < row_count - 1; i++)
+    {
+      int cmp_result;
+
+      switch (sort_column)
+      {
+      case GNUNET_GTK_NAMESPACE_ORDER_RANK_COLUMN:
+        cmp_result = row_ints[i] <= row_ints[i + 1] ? 0 : 1;
+        break;
+      case GNUNET_GTK_NAMESPACE_ORDER_NAME_COLUMN:
+      case GNUNET_GTK_NAMESPACE_ORDER_IDENTIFIER_COLUMN:
+        /* FIXME: name can be UTF-8-encoded, use UTF-8-aware comparison func */
+        cmp_result = strcmp (row_strings[i], row_strings[i + 1]);
+        break;
+      default:
+       GNUNET_break (0);
+       cmp_result = 0;
+        break;
+      }
+
+      if (((ctx->sort_direction <= 0) && (cmp_result <= 0)) ||
+          ((ctx->sort_direction > 0) && (cmp_result > 0)))
+      {
+        int tmp_int, tmp_index;
+        char *tmp_string;
+        tmp_index = row_indices[i];
+        tmp_int = row_ints[i];
+        tmp_string = row_strings[i];
+        row_indices[i] = row_indices[i + 1];
+        row_ints[i] = row_ints[i + 1];
+        row_strings[i] = row_strings[i + 1];
+        row_ints[i + 1] = tmp_int;
+        row_strings[i + 1] = tmp_string;
+        row_indices[i + 1] = tmp_index;
+        sorted = GNUNET_NO;
+      }
+    }
+  }
+
+  gtk_list_store_reorder (ctx->ns_order_store, row_indices);
+
+  g_free (row_indices);
+  for (i = 0; i < row_count; i++)
+    g_free (row_strings[i]);
+  g_free (row_strings);
+  g_free (row_ints);
+}
+
+
+void
+GNUNET_GTK_namespace_manager_namespace_order_column_clicked_cb (
+    GtkTreeViewColumn *treeviewcolumn, gpointer user_data)
+{
+  struct GNUNET_GTK_NamespaceManagerContext *ctx = user_data;
+  if (treeviewcolumn == ctx->order_rank)
+  {
+    sort_order_list (ctx, GNUNET_GTK_NAMESPACE_ORDER_RANK_COLUMN);
+  }
+  else if (treeviewcolumn == ctx->order_name)
+  {
+    sort_order_list (ctx, GNUNET_GTK_NAMESPACE_ORDER_NAME_COLUMN);
+  }
+  else if (treeviewcolumn == ctx->order_id)
+  {
+    sort_order_list (ctx, GNUNET_GTK_NAMESPACE_ORDER_IDENTIFIER_COLUMN);
+  }
+}
+
+
+void
+GNUNET_GTK_namespace_manager_known_namespaces_delete_button_clicked_cb (
+    GtkButton *button, gpointer user_data)
+{
+  struct GNUNET_GTK_NamespaceManagerContext *ctx = user_data;
+  GtkTreeIter iter;
+  struct GNUNET_FS_PseudonymIdentifier *nsid;
+  GtkTreeRowReference *order_row, *known_row;
+  struct GNUNET_CONTAINER_MetaData *md;
+
+  if (FALSE == gtk_tree_selection_get_selected (ctx->known_ns_sel, NULL, 
&iter))
+    return;
+
+  gtk_tree_model_get (GTK_TREE_MODEL (ctx->known_ns_store), &iter,
+      GNUNET_GTK_KNOWN_NAMESPACES_IDENTIFIER_BIN_COLUMN, &nsid,
+      GNUNET_GTK_KNOWN_NAMESPACES_ORDER_ROW_REFERENCE_COLUMN, &order_row,
+      GNUNET_GTK_KNOWN_NAMESPACES_METADATA_COLUMN, &md,
+      -1);
+  /* Make sure the store does not contain references to freed objects */
+  gtk_list_store_set (ctx->known_ns_store, &iter,
+      GNUNET_GTK_KNOWN_NAMESPACES_IDENTIFIER_BIN_COLUMN, NULL,
+      GNUNET_GTK_KNOWN_NAMESPACES_ORDER_ROW_REFERENCE_COLUMN, NULL,
+      GNUNET_GTK_KNOWN_NAMESPACES_METADATA_COLUMN, NULL,
+      -1);
+  GNUNET_CONTAINER_meta_data_destroy (md);
+  if (order_row != NULL)
+  {
+    if (GNUNET_OK == GNUNET_GTK_get_iter_from_reference (order_row, &iter))
+    {
+      gtk_tree_model_get (GTK_TREE_MODEL (ctx->ns_order_store), &iter,
+        GNUNET_GTK_NAMESPACE_ORDER_KNOWN_ROW_REFERENCE_COLUMN, &known_row, -1);
+      gtk_list_store_set (ctx->ns_order_store, &iter,
+        GNUNET_GTK_NAMESPACE_ORDER_KNOWN_ROW_REFERENCE_COLUMN, NULL, -1);
+      if (known_row != NULL)
+        gtk_tree_row_reference_free (known_row);
+      gtk_list_store_remove (ctx->ns_order_store, &iter);
+    }
+    gtk_tree_row_reference_free (order_row);
+  }
+  ctx->deleted_namespaces = g_list_prepend (ctx->deleted_namespaces, nsid);
+  gtk_list_store_remove (ctx->known_ns_store, &iter);
+
+  gtk_list_store_clear (ctx->ns_details_store);
+  GNUNET_CONTAINER_meta_data_destroy (ctx->uneditable_md);
+  ctx->uneditable_md = NULL;
+}
+
+
+void
+GNUNET_GTK_namespace_manager_known_namespaces_swap_rank_button_clicked_cb (
+    GtkButton *button, gpointer user_data)
+{
+  struct GNUNET_GTK_NamespaceManagerContext *ctx = user_data;
+  GtkTreeIter known_iter, order_iter;
+  struct GNUNET_CRYPTO_EccPublicKey *nsid;
+  int32_t old_rank, new_rank;
+  GtkTreeRowReference *order_row, *known_row;
+
+  if (FALSE == gtk_tree_selection_get_selected (ctx->known_ns_sel, NULL, 
&known_iter))
+    return;
+
+  gtk_tree_model_get (GTK_TREE_MODEL (ctx->known_ns_store), &known_iter,
+      GNUNET_GTK_KNOWN_NAMESPACES_IDENTIFIER_BIN_COLUMN, &nsid,
+      GNUNET_GTK_KNOWN_NAMESPACES_RANK_COLUMN, &old_rank,
+      GNUNET_GTK_KNOWN_NAMESPACES_ORDER_ROW_REFERENCE_COLUMN, &order_row,
+      -1);
+
+  if (old_rank == 0)
+    new_rank = -1;
+  else
+    new_rank = -old_rank;
+
+  gtk_list_store_set (ctx->known_ns_store, &known_iter,
+      GNUNET_GTK_KNOWN_NAMESPACES_RANK_COLUMN, new_rank,
+      GNUNET_GTK_KNOWN_NAMESPACES_ORDER_ROW_REFERENCE_COLUMN, NULL,
+      -1);
+
+  if (order_row != NULL)
+  {
+    if (new_rank < 0)
+    {
+      if (GNUNET_OK == GNUNET_GTK_get_iter_from_reference (order_row, 
&order_iter))
+      {
+        gtk_tree_model_get (GTK_TREE_MODEL (ctx->ns_order_store), &order_iter,
+            GNUNET_GTK_NAMESPACE_ORDER_KNOWN_ROW_REFERENCE_COLUMN, &known_row, 
-1);
+        gtk_list_store_remove (ctx->ns_order_store, &order_iter);
+        if (known_row != NULL)
+          gtk_tree_row_reference_free (known_row);
+      }
+    }
+    gtk_tree_row_reference_free (order_row);
+  }
+  if (new_rank >= 0)
+  {
+    char *name, *identifier;
+    if (order_row != NULL)
+    {
+      /* This should not happen */
+      GNUNET_break (0);
+    }
+    gtk_tree_model_get (GTK_TREE_MODEL (ctx->known_ns_store), &known_iter,
+        GNUNET_GTK_KNOWN_NAMESPACES_NAME_COLUMN, &name,
+        GNUNET_GTK_KNOWN_NAMESPACES_IDENTIFIER_COLUMN, &identifier,
+        -1);
+    known_row = GNUNET_GTK_get_reference_from_iter (GTK_TREE_MODEL (
+        ctx->known_ns_store), &known_iter);
+    gtk_list_store_insert_with_values (ctx->ns_order_store, &order_iter, 
G_MAXINT,
+        GNUNET_GTK_NAMESPACE_ORDER_RANK_COLUMN, new_rank,
+        GNUNET_GTK_NAMESPACE_ORDER_NAME_COLUMN, name,
+        GNUNET_GTK_NAMESPACE_ORDER_IDENTIFIER_COLUMN, identifier,
+        GNUNET_GTK_NAMESPACE_ORDER_IDENTIFIER_BIN_COLUMN, nsid,
+        GNUNET_GTK_NAMESPACE_ORDER_KNOWN_ROW_REFERENCE_COLUMN, known_row,
+        -1);
+    g_free (name);
+    g_free (identifier);
+    order_row = GNUNET_GTK_get_reference_from_iter (GTK_TREE_MODEL 
(ctx->ns_order_store),
+        &order_iter);
+    gtk_list_store_set (ctx->known_ns_store, &known_iter,
+      GNUNET_GTK_KNOWN_NAMESPACES_ORDER_ROW_REFERENCE_COLUMN, order_row, -1);
+  }
+}
+
+
+void
+GNUNET_GTK_namespace_manager_namespace_order_apply_clicked_cb (
+    GtkButton *button, gpointer user_data)
+{
+  struct GNUNET_GTK_NamespaceManagerContext *ctx = user_data;
+  GtkTreeIter iter;
+  gint i;
+  gint row_count;
+  GtkTreeRowReference *known_row;
+
+  row_count = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (
+      ctx->ns_order_store), NULL);
+  if (! gtk_tree_model_get_iter_first (GTK_TREE_MODEL (
+      ctx->ns_order_store), &iter))
+    return;
+
+  for (i = 0; i < row_count; i++)
+  {
+    gtk_list_store_set (ctx->ns_order_store, &iter,
+        GNUNET_GTK_NAMESPACE_ORDER_RANK_COLUMN, i, -1);
+    gtk_tree_model_get (GTK_TREE_MODEL (ctx->ns_order_store), &iter,
+        GNUNET_GTK_NAMESPACE_ORDER_KNOWN_ROW_REFERENCE_COLUMN, &known_row, -1);
+    if (known_row == NULL)
+    {
+      /* This is not supposed to happen. What to do? */
+      GNUNET_break (0);
+    }
+    else
+    {
+      GtkTreeIter known_iter;
+      if (GNUNET_OK == GNUNET_GTK_get_iter_from_reference (known_row, 
&known_iter))
+      {
+        gtk_list_store_set (ctx->known_ns_store, &known_iter,
+            GNUNET_GTK_KNOWN_NAMESPACES_RANK_COLUMN, i,
+            -1);
+      }
+    }
+    if (TRUE != gtk_tree_model_iter_next (GTK_TREE_MODEL (
+      ctx->ns_order_store), &iter))
+      break;
+  }
+}
+
+
+void
+GNUNET_GTK_namespace_manager_namespace_details_add_button_clicked_cb (
+    GtkButton *button, gpointer user_data)
+{
+  /* FIXME: add a row to the details list. Disabled at the moment, since
+   * metadata type selection is not implemented.
+   */
+}
+
+
+void
+GNUNET_GTK_namespace_manager_namespace_details_delete_button_clicked_cb (
+    GtkButton *button, gpointer user_data)
+{
+  struct GNUNET_GTK_NamespaceManagerContext *ctx = user_data;
+  GtkTreeIter iter;
+
+  if (FALSE == gtk_tree_selection_get_selected (ctx->ns_details_sel, NULL, 
&iter))
+    return;
+
+  gtk_list_store_remove (ctx->ns_details_store, &iter);
+  gtk_widget_set_sensitive (ctx->details_apply_button, TRUE);
+}
+
+
+void
+GNUNET_GTK_namespace_manager_namespace_details_apply_button_clicked_cb (
+    GtkButton *button, gpointer user_data)
+{
+  struct GNUNET_GTK_NamespaceManagerContext *ctx = user_data;
+  GtkTreeIter iter, known_iter;
+  gint i;
+  gint row_count;
+  struct GNUNET_CONTAINER_MetaData *md, *old_md;
+  char *plugin_name;
+  int type;
+  char *type_name;
+  int format;
+  char *data_mime_type;
+  char *data;
+
+  row_count = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (
+      ctx->ns_details_store), NULL);
+  if ((row_count > 0) && (! gtk_tree_model_get_iter_first (
+      GTK_TREE_MODEL (ctx->ns_details_store), &iter)))
+  {
+    /* This should not happen */
+    return;
+  }
+
+  if (FALSE == gtk_tree_selection_get_selected (ctx->known_ns_sel, NULL,
+      &known_iter))
+  {
+    /* This should not happen */
+    return;
+  }
+
+  md = GNUNET_CONTAINER_meta_data_create ();
+
+  for (i = 0; i < row_count; i++)
+  {
+    gtk_tree_model_get (GTK_TREE_MODEL (ctx->ns_details_store), &iter,
+        GNUNET_GTK_NAMESPACE_DETAILS_PLUGIN_NAME_COLUMN, &plugin_name,
+        GNUNET_GTK_NAMESPACE_DETAILS_TYPE_BIN_COLUMN, &type,
+        GNUNET_GTK_NAMESPACE_DETAILS_TYPE_COLUMN, &type_name,
+        GNUNET_GTK_NAMESPACE_DETAILS_FORMAT_COLUMN, &format,
+        GNUNET_GTK_NAMESPACE_DETAILS_DATA_MIME_COLUMN, &data_mime_type,
+        GNUNET_GTK_NAMESPACE_DETAILS_VALUE_COLUMN, &data,
+        -1);
+    GNUNET_CONTAINER_meta_data_insert (md, plugin_name,
+        type, format, data_mime_type, data, strlen (data) + 1);
+    g_free (plugin_name);
+    g_free (type_name);
+    g_free (data_mime_type);
+    g_free (data);
+    if (TRUE != gtk_tree_model_iter_next (GTK_TREE_MODEL (
+      ctx->ns_details_store), &iter))
+      break;
+  }
+  GNUNET_CONTAINER_meta_data_merge (md,
+      (const struct GNUNET_CONTAINER_MetaData *) ctx->uneditable_md);
+
+  gtk_tree_model_get (GTK_TREE_MODEL (ctx->known_ns_store), &known_iter,
+      GNUNET_GTK_KNOWN_NAMESPACES_METADATA_COLUMN, &old_md,
+      -1);
+  GNUNET_CONTAINER_meta_data_destroy (old_md);
+  gtk_list_store_set (ctx->known_ns_store, &known_iter,
+      GNUNET_GTK_KNOWN_NAMESPACES_METADATA_COLUMN, md,
+      -1);
+  gtk_widget_set_sensitive (ctx->details_apply_button, FALSE);
+}
+
+
+void
+GNUNET_GTK_namespace_manager_name_text_editing_started_cb (
+    GtkCellRenderer *renderer, GtkCellEditable *editable, gchar *path,
+    gpointer user_data)
+{
+  struct GNUNET_GTK_NamespaceManagerContext *ctx = user_data;
+
+  if (GTK_IS_ENTRY (editable)) 
+  {
+    GtkTreePath *tree_path;
+    GtkTreeIter iter;
+    char *non_unique_name = NULL;
+    GtkEntry *entry = GTK_ENTRY (editable);
+
+    tree_path = gtk_tree_path_new_from_string (path);
+    if (tree_path != NULL)
+    {
+      if (gtk_tree_model_get_iter (GTK_TREE_MODEL (ctx->known_ns_store),
+          &iter, tree_path))
+      {
+        gtk_tree_model_get (GTK_TREE_MODEL (ctx->known_ns_store), &iter,
+            GNUNET_GTK_KNOWN_NAMESPACES_NON_UNIQUE_NAME_COLUMN, 
&non_unique_name,
+            -1);
+      }
+      gtk_tree_path_free (tree_path);
+    }
+    if (non_unique_name == NULL)
+    {
+      gtk_cell_editable_editing_done (editable);
+      return;
+    }
+    gtk_entry_set_text (entry, non_unique_name);
+    g_free (non_unique_name);
+  }
+}
+
+
+void
+GNUNET_GTK_namespace_manager_name_text_edited_cb (
+    GtkCellRendererText *renderer, gchar *path, gchar *new_text,
+    gpointer user_data)
+{
+  struct GNUNET_GTK_NamespaceManagerContext *ctx = user_data;
+  char *unique_name;
+  GtkTreeRowReference *order_row;
+
+  if (strlen (new_text) == 0)
+    return;
+
+  GtkTreePath *tree_path;
+  GtkTreeIter iter;
+  tree_path = gtk_tree_path_new_from_string (path);
+  if (tree_path != NULL)
+  {
+    if (gtk_tree_model_get_iter (GTK_TREE_MODEL (ctx->known_ns_store),
+        &iter, tree_path))
+    {
+      struct GNUNET_CRYPTO_EccPublicKey *nsid;
+      gtk_tree_model_get (GTK_TREE_MODEL (ctx->known_ns_store), &iter,
+          GNUNET_GTK_KNOWN_NAMESPACES_IDENTIFIER_BIN_COLUMN, &nsid,
+          GNUNET_GTK_KNOWN_NAMESPACES_ORDER_ROW_REFERENCE_COLUMN, &order_row,
+          -1);
+
+      unique_name = GNUNET_FS_pseudonym_name_uniquify (
+          GNUNET_FS_GTK_get_configuration (), nsid, new_text, NULL);
+
+      gtk_list_store_set (ctx->known_ns_store, &iter,
+          GNUNET_GTK_KNOWN_NAMESPACES_NON_UNIQUE_NAME_COLUMN, new_text,
+          GNUNET_GTK_KNOWN_NAMESPACES_NAME_COLUMN, unique_name,
+          -1);
+
+      if (order_row != NULL)
+      {
+        GtkTreeIter order_iter;
+        if (GNUNET_OK == GNUNET_GTK_get_iter_from_reference (order_row, 
&order_iter))
+        {
+          gtk_list_store_set (ctx->ns_order_store, &order_iter,
+            GNUNET_GTK_NAMESPACE_ORDER_NAME_COLUMN, unique_name,
+            -1);
+        }
+      }
+
+      GNUNET_free (unique_name);
+    }
+    gtk_tree_path_free (tree_path);
+  }
+}
+
+
+void
+GNUNET_GTK_namespace_manager_namespace_details_type_text_edited_cb (
+    GtkCellRendererText *renderer, gchar *path, gchar *new_text,
+    gpointer user_data)
+{
+  /* Changing metadata type is more difficult than simply entering a
+   * new string, see publication editing dialog. So this is disabled
+   * for now. In fact, it's not going to be a Text renderer when it's done.
+   */
+  /*
+  struct GNUNET_GTK_NamespaceManagerContext *ctx = cls;
+  GtkTreeIter iter;
+  if (gtk_tree_model_get_iter (GTK_TREE_MODEL (ctx->ns_details_store),
+      &iter, path))
+  {
+    gtk_list_store_set (ctx->ns_details_store, &iter,
+        GNUNET_GTK_NAMESPACE_DETAILS_TYPE_COLUMN, new_text,
+        -1);
+  }
+  */
+}
+
+
+void
+GNUNET_GTK_namespace_manager_namespace_details_value_text_edited_cb (
+    GtkCellRendererText *renderer, gchar *path, gchar *new_text,
+    gpointer user_data)
+{
+  struct GNUNET_GTK_NamespaceManagerContext *ctx = user_data;
+  GtkTreePath *tree_path;
+  GtkTreeIter iter;
+  tree_path = gtk_tree_path_new_from_string (path);
+  if (tree_path != NULL)
+  {
+    if (gtk_tree_model_get_iter (GTK_TREE_MODEL (ctx->ns_details_store),
+        &iter, tree_path))
+    {
+      char *old_text;
+      gtk_tree_model_get (GTK_TREE_MODEL (ctx->ns_details_store), &iter,
+          GNUNET_GTK_NAMESPACE_DETAILS_VALUE_COLUMN, &old_text,
+          -1);
+      if (strcmp (old_text, new_text) != 0)
+      {
+        gtk_list_store_set (ctx->ns_details_store, &iter,
+            GNUNET_GTK_NAMESPACE_DETAILS_VALUE_COLUMN, new_text,
+            -1);
+        gtk_widget_set_sensitive (ctx->details_apply_button, TRUE);
+      }
+      g_free (old_text);
+    }
+    gtk_tree_path_free (tree_path);
+  }
+}
+
+
+/**
+ * Iterator over all known pseudonyms.
+ * Populate "known ns" and "ns order" lists.
+ *
+ * @param cls closure
+ * @param pseudonym hash code of public key of pseudonym
+ * @param md meta data known about the pseudonym
+ * @param rating the local rating of the pseudonym
+ * @return GNUNET_OK to continue iteration, GNUNET_SYSERR to abort
+ */
+static int
+populate_known_ns_list (void *cls, 
+                       const struct GNUNET_CRYPTO_EccPublicKey *pseudonym,
+                       const char *name, const char *unique_name,
+                       const struct GNUNET_CONTAINER_MetaData *md, 
+                       int rating)
+{
+  struct GNUNET_GTK_NamespaceManagerContext *ctx = cls;
+  struct GNUNET_CRYPTO_EccPublicKey *nsid;
+  char buf[1024];
+  char *ret;
+  GtkTreeIter known_iter, order_iter;
+  struct GNUNET_CONTAINER_MetaData *md_copy;
+  char *non_null_name, *non_null_unique_name;
+
+  nsid = GNUNET_new (struct GNUNET_CRYPTO_EccPublicKey);
+  *nsid = *pseudonym;
+
+  ret = GNUNET_STRINGS_data_to_string (nsid,
+                                      sizeof (struct 
GNUNET_CRYPTO_EccPublicKey),
+                                      buf,
+                                      sizeof (buf));
+  GNUNET_assert (NULL != ret);
+  ret[0] = '\0';
+
+  GNUNET_FS_pseudonym_get_info (GNUNET_FS_GTK_get_configuration (),
+                             nsid, NULL, NULL, &non_null_name, NULL);
+  non_null_unique_name = GNUNET_FS_pseudonym_name_uniquify (
+      GNUNET_FS_GTK_get_configuration (), nsid, non_null_name, NULL);
+
+  md_copy = GNUNET_CONTAINER_meta_data_duplicate (md);
+
+  gtk_list_store_insert_with_values (ctx->known_ns_store, &known_iter, 
G_MAXINT,
+      GNUNET_GTK_KNOWN_NAMESPACES_IS_MINE_COLUMN, FALSE,
+      GNUNET_GTK_KNOWN_NAMESPACES_RANK_COLUMN, rating,
+      GNUNET_GTK_KNOWN_NAMESPACES_NAME_COLUMN, non_null_unique_name,
+      GNUNET_GTK_KNOWN_NAMESPACES_IDENTIFIER_COLUMN, buf,
+      GNUNET_GTK_KNOWN_NAMESPACES_IDENTIFIER_BIN_COLUMN, nsid,
+      GNUNET_GTK_KNOWN_NAMESPACES_ORDER_ROW_REFERENCE_COLUMN, NULL,
+      GNUNET_GTK_KNOWN_NAMESPACES_METADATA_COLUMN, md_copy,
+      GNUNET_GTK_KNOWN_NAMESPACES_NON_UNIQUE_NAME_COLUMN, non_null_name,
+      -1);
+
+  if (rating >= 0)
+  {
+    GtkTreeRowReference *rr = GNUNET_GTK_get_reference_from_iter 
(GTK_TREE_MODEL (
+        ctx->known_ns_store), &known_iter);
+    gtk_list_store_insert_with_values (ctx->ns_order_store, &order_iter, 
G_MAXINT,
+        GNUNET_GTK_NAMESPACE_ORDER_RANK_COLUMN, rating,
+        GNUNET_GTK_NAMESPACE_ORDER_NAME_COLUMN, non_null_unique_name,
+        GNUNET_GTK_NAMESPACE_ORDER_IDENTIFIER_COLUMN, buf,
+        GNUNET_GTK_NAMESPACE_ORDER_IDENTIFIER_BIN_COLUMN, nsid,
+        GNUNET_GTK_NAMESPACE_ORDER_KNOWN_ROW_REFERENCE_COLUMN, rr,
+        -1);
+    rr = GNUNET_GTK_get_reference_from_iter (GTK_TREE_MODEL 
(ctx->ns_order_store),
+        &order_iter);
+    gtk_list_store_set (ctx->known_ns_store, &known_iter,
+      GNUNET_GTK_KNOWN_NAMESPACES_ORDER_ROW_REFERENCE_COLUMN, rr, -1);
+  }
+  GNUNET_free (non_null_name);
+  GNUNET_free (non_null_unique_name);
+
+  return GNUNET_OK;
+}
+
+
+static void
+apply_known_ns_changes (struct GNUNET_GTK_NamespaceManagerContext *ctx)
+{
+  GtkTreeIter iter;
+  gint i;
+  gint row_count;
+  struct GNUNET_CRYPTO_EccPublicKey *nsid;
+  char *name;
+  int32_t rank;
+  struct GNUNET_CONTAINER_MetaData *md;
+
+  row_count = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (
+      ctx->known_ns_store), NULL);
+  if (! gtk_tree_model_get_iter_first (GTK_TREE_MODEL (
+      ctx->known_ns_store), &iter))
+    return;
+
+  for (i = 0; i < row_count; i++)
+  {
+    gtk_tree_model_get (GTK_TREE_MODEL (ctx->known_ns_store), &iter,
+        GNUNET_GTK_KNOWN_NAMESPACES_IDENTIFIER_BIN_COLUMN, &nsid,
+        GNUNET_GTK_KNOWN_NAMESPACES_NON_UNIQUE_NAME_COLUMN, &name,
+        GNUNET_GTK_KNOWN_NAMESPACES_METADATA_COLUMN, &md,
+        GNUNET_GTK_KNOWN_NAMESPACES_RANK_COLUMN, &rank,
+        -1);
+    GNUNET_FS_pseudonym_set_info (GNUNET_FS_GTK_get_configuration (),
+        nsid, name, md, rank);
+    g_free (name);
+    if (TRUE != gtk_tree_model_iter_next (GTK_TREE_MODEL (
+      ctx->known_ns_store), &iter))
+      break;
+  }
+#if FIXME_NAMESPACE_REMOVAL
+  while (NULL != ctx->deleted_namespaces)
+  {
+    nsid = ctx->deleted_namespaces->data;
+    if (nsid)
+    {
+      GNUNET_FS_pseudonym_remove (GNUNET_FS_GTK_get_configuration (), nsid);
+      GNUNET_free (nsid);
+    }
+    ctx->deleted_namespaces = g_list_delete_link (ctx->deleted_namespaces, 
ctx->deleted_namespaces);
+  }
+#endif
+}
+
+
+static void
+free_lists_contents (struct GNUNET_GTK_NamespaceManagerContext *ctx)
+{
+  GtkTreeIter iter;
+  gint i;
+  gint row_count;
+  struct GNUNET_CRYPTO_EccPublicKey *nsid;
+  GtkTreeRowReference *order_row;
+  struct GNUNET_CONTAINER_MetaData *md;
+
+  row_count = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (
+      ctx->known_ns_store), NULL);
+  if (! gtk_tree_model_get_iter_first (GTK_TREE_MODEL (
+      ctx->known_ns_store), &iter))
+    return;
+
+  for (i = 0; i < row_count; i++)
+  {
+    gtk_tree_model_get (GTK_TREE_MODEL (ctx->known_ns_store), &iter,
+        GNUNET_GTK_KNOWN_NAMESPACES_IDENTIFIER_BIN_COLUMN, &nsid,
+        GNUNET_GTK_KNOWN_NAMESPACES_ORDER_ROW_REFERENCE_COLUMN, &order_row,
+        GNUNET_GTK_KNOWN_NAMESPACES_METADATA_COLUMN, &md,
+        -1);
+    /* Make sure the store does not contain references to freed objects */
+    gtk_list_store_set (ctx->known_ns_store, &iter,
+        GNUNET_GTK_KNOWN_NAMESPACES_IDENTIFIER_BIN_COLUMN, NULL,
+        GNUNET_GTK_KNOWN_NAMESPACES_ORDER_ROW_REFERENCE_COLUMN, NULL,
+        GNUNET_GTK_KNOWN_NAMESPACES_METADATA_COLUMN, NULL,
+        -1);
+    if (order_row != NULL)
+    {
+      GtkTreeIter order_iter;
+      if (GNUNET_OK == GNUNET_GTK_get_iter_from_reference (order_row, 
&order_iter))
+      {
+        GtkTreeRowReference *known_row;
+        gtk_tree_model_get (GTK_TREE_MODEL (ctx->ns_order_store), &order_iter,
+            GNUNET_GTK_NAMESPACE_ORDER_KNOWN_ROW_REFERENCE_COLUMN, &known_row,
+            -1);
+        if (known_row != NULL)
+          gtk_tree_row_reference_free (known_row);
+      }
+      gtk_tree_row_reference_free (order_row);
+    }
+    GNUNET_CONTAINER_meta_data_destroy (md);
+    GNUNET_free (nsid);
+    if (TRUE != gtk_tree_model_iter_next (GTK_TREE_MODEL (
+      ctx->known_ns_store), &iter))
+      break;
+  }
+
+  gtk_list_store_clear (ctx->ns_order_store);
+  gtk_list_store_clear (ctx->known_ns_store);
+  gtk_list_store_clear (ctx->ns_details_store);
+  if (ctx->uneditable_md != NULL)
+    GNUNET_CONTAINER_meta_data_destroy (ctx->uneditable_md);
+}
+
+
+void
+GNUNET_GTK_namespace_manager_dialog_response_cb (GtkDialog *dialog,
+    gint response_id, gpointer user_data)
+{
+  struct GNUNET_GTK_NamespaceManagerContext *ctx = user_data;
+  switch (response_id)
+  {
+  case GTK_RESPONSE_APPLY:
+  case GTK_RESPONSE_OK:
+    apply_known_ns_changes (ctx);
+    GNUNET_GTK_main_window_refresh_ns_list (ctx->main_ctx);
+    break;
+  default:
+    break;
+  }
+  switch (response_id)
+  {
+  case GTK_RESPONSE_APPLY:
+    break;
+  case GTK_RESPONSE_OK:
+  case GTK_RESPONSE_CANCEL:
+  default:
+    free_lists_contents (ctx);
+    gtk_widget_destroy (GTK_WIDGET (ctx->namespace_manager));
+    GNUNET_free (ctx);
+  }
+}
+
+
+static gboolean
+mark_as_mine (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter,
+    gpointer data)
+{
+  const struct GNUNET_CRYPTO_EccPublicKey *mine_id = data;
+  const struct GNUNET_CRYPTO_EccPublicKey *ns_id;
+
+  gtk_tree_model_get (model, iter,
+      GNUNET_GTK_KNOWN_NAMESPACES_IDENTIFIER_BIN_COLUMN, &ns_id, -1);
+
+  if (memcmp (ns_id, mine_id, sizeof (struct GNUNET_CRYPTO_EccPublicKey)) != 0)
+    return FALSE;
+
+  gtk_list_store_set (GTK_LIST_STORE (model), iter,
+      GNUNET_GTK_KNOWN_NAMESPACES_IS_MINE_COLUMN, TRUE, -1);
+  return TRUE;
+}
+
+
+/**
+ * Callback with information about local (!) namespaces.
+ * Contains the names of the local namespace and the global
+ * ID.
+ *
+ * @param cls closure
+ * @param name human-readable identifier of the namespace
+ * @param id hash identifier for the namespace
+ */
+static void
+mark_namespaces_as_mine (void *cls, const char *name,
+                        const struct GNUNET_CRYPTO_EccPublicKey *id)
+{
+  struct GNUNET_GTK_NamespaceManagerContext *ctx = cls;
+
+  gtk_tree_model_foreach (GTK_TREE_MODEL (ctx->known_ns_store), mark_as_mine,
+      (gpointer) id);
+}
+
+
+/**
+ * Type of a function that libextractor calls for each
+ * meta data item found.
+ *
+ * @param cls closure (user-defined)
+ * @param plugin_name name of the plugin that produced this value;
+ *        special values can be used (i.e. '&lt;zlib&gt;' for zlib being
+ *        used in the main libextractor library and yielding
+ *        meta data).
+ * @param type libextractor-type describing the meta data
+ * @param format basic format information about data 
+ * @param data_mime_type mime-type of data (not of the original file);
+ *        can be NULL (if mime-type is not known)
+ * @param data actual meta-data found
+ * @param data_len number of bytes in data
+ * @return 0 to continue extracting, 1 to abort
+ */ 
+static int
+populate_details_list (void *cls, const char *plugin_name,
+    enum EXTRACTOR_MetaType type, enum EXTRACTOR_MetaFormat format,
+    const char *data_mime_type, const char *data, size_t data_len)
+{
+  struct GNUNET_GTK_NamespaceManagerContext *ctx = cls;
+  const char *type_name;
+  char *data_utf8;
+
+  if (format == EXTRACTOR_METAFORMAT_UTF8 ||
+      format == EXTRACTOR_METAFORMAT_C_STRING)
+  {
+    type_name = EXTRACTOR_metatype_to_string (type);
+    /* TODO: translate type_name using dgettext? */
+    data_utf8 = GNUNET_FS_GTK_dubious_meta_to_utf8 (format, data, data_len);
+    if (data != NULL)
+    {
+      gtk_list_store_insert_with_values (ctx->ns_details_store, NULL, G_MAXINT,
+          GNUNET_GTK_NAMESPACE_DETAILS_PLUGIN_NAME_COLUMN, plugin_name,
+          GNUNET_GTK_NAMESPACE_DETAILS_TYPE_BIN_COLUMN, type,
+          GNUNET_GTK_NAMESPACE_DETAILS_TYPE_COLUMN, type_name,
+          GNUNET_GTK_NAMESPACE_DETAILS_FORMAT_COLUMN,
+          EXTRACTOR_METAFORMAT_UTF8,
+          GNUNET_GTK_NAMESPACE_DETAILS_DATA_MIME_COLUMN, data_mime_type,
+          GNUNET_GTK_NAMESPACE_DETAILS_VALUE_COLUMN, data_utf8,
+          -1);
+      GNUNET_free (data_utf8);
+      return 0;
+    }
+  }
+  GNUNET_CONTAINER_meta_data_insert (ctx->uneditable_md,
+      plugin_name, type, format, data_mime_type, data, data_len);
+  return 0;
+}
+
+
+static void
+ns_details_selection_changed (GtkTreeSelection *treeselection,
+    gpointer user_data)
+{
+  struct GNUNET_GTK_NamespaceManagerContext *ctx = user_data;
+  GtkTreeIter iter;
+
+  if (FALSE == gtk_tree_selection_get_selected (ctx->ns_details_sel, NULL, 
&iter))
+  {
+    gtk_widget_set_sensitive (ctx->details_delete_button, FALSE);
+    return;
+  }
+
+  gtk_widget_set_sensitive (ctx->details_delete_button, TRUE);
+}
+
+
+static void
+known_ns_selection_changed (GtkTreeSelection *treeselection,
+    gpointer user_data)
+{
+  struct GNUNET_GTK_NamespaceManagerContext *ctx = user_data;
+  GtkTreeIter iter;
+  const struct GNUNET_CONTAINER_MetaData *md;
+
+  if (FALSE == gtk_tree_selection_get_selected (ctx->known_ns_sel, NULL, 
&iter))
+    return;
+
+  gtk_tree_model_get (GTK_TREE_MODEL (ctx->known_ns_store), &iter,
+      GNUNET_GTK_KNOWN_NAMESPACES_METADATA_COLUMN, &md,
+      -1);
+  if (ctx->uneditable_md != NULL)
+    GNUNET_CONTAINER_meta_data_clear (ctx->uneditable_md);
+  else
+    ctx->uneditable_md = GNUNET_CONTAINER_meta_data_create ();
+  gtk_list_store_clear (ctx->ns_details_store);
+  gtk_widget_set_sensitive (ctx->details_apply_button, FALSE);
+  if (NULL != md)
+    GNUNET_CONTAINER_meta_data_iterate ((const struct 
GNUNET_CONTAINER_MetaData *) md,
+        populate_details_list, ctx);
+  else
+    GNUNET_break (0);
+  gtk_widget_set_sensitive (ctx->details_apply_button, FALSE);
+}
+
+
+GtkWindow *
+GNUNET_GTK_namespace_manager_open (struct GNUNET_GTK_MainWindowContext 
*main_ctx)
+{
+  struct GNUNET_GTK_NamespaceManagerContext *ctx;
+
+  ctx = GNUNET_new (struct GNUNET_GTK_NamespaceManagerContext);
+  ctx->builder = GNUNET_GTK_get_new_builder 
("gnunet_fs_gtk_namespace_manager.glade", ctx);
+  if (ctx->builder == NULL)
+  {
+    GNUNET_break (0);
+    GNUNET_free (ctx);
+    return NULL;
+  }
+
+  ctx->main_ctx = main_ctx;
+
+  /* initialize widget references */
+  ctx->known_ns = GTK_WIDGET (gtk_builder_get_object (ctx->builder,
+      "GNUNET_GTK_namespace_manager_known_treeview"));
+  ctx->ns_order = GTK_WIDGET (gtk_builder_get_object (ctx->builder,
+      "GNUNET_GTK_namespace_manager_namespace_order_treeview"));
+  ctx->ns_details = GTK_WIDGET (gtk_builder_get_object (ctx->builder,
+      "GNUNET_GTK_namespace_manager_namespace_details_treeview"));
+  ctx->known_ns_sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (
+      ctx->known_ns));
+  ctx->ns_order_sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (
+      ctx->ns_order));
+  ctx->ns_details_sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (
+      ctx->ns_details));
+  ctx->ns_order_store = GTK_LIST_STORE (gtk_tree_view_get_model (
+      GTK_TREE_VIEW (ctx->ns_order)));
+  ctx->known_ns_store = GTK_LIST_STORE (gtk_tree_view_get_model (
+      GTK_TREE_VIEW (ctx->known_ns)));
+  ctx->ns_details_store = GTK_LIST_STORE (gtk_tree_view_get_model (
+      GTK_TREE_VIEW (ctx->ns_details)));
+  ctx->namespace_manager = GTK_WINDOW (gtk_builder_get_object (
+      ctx->builder, "GNUNET_GTK_namespace_manager_dialog"));
+  ctx->details_apply_button = GTK_WIDGET (gtk_builder_get_object (ctx->builder,
+      "GNUNET_GTK_namespace_manager_namespace_details_apply_button"));
+  ctx->details_delete_button = GTK_WIDGET (gtk_builder_get_object 
(ctx->builder,
+      "GNUNET_GTK_namespace_manager_namespace_details_delete_button"));
+  ctx->order_rank = gtk_tree_view_get_column (GTK_TREE_VIEW (ctx->ns_order), 
0);
+  ctx->order_name = gtk_tree_view_get_column (GTK_TREE_VIEW (ctx->ns_order), 
1);
+  ctx->order_id = gtk_tree_view_get_column (GTK_TREE_VIEW (ctx->ns_order), 2);
+
+  /* connect signals; FIXME-GTK3: these could be connected with (modern) Glade 
*/
+  g_signal_connect (G_OBJECT (ctx->known_ns_sel), "changed",
+      G_CALLBACK (known_ns_selection_changed), ctx);
+  g_signal_connect (G_OBJECT (ctx->ns_details_sel), "changed",
+      G_CALLBACK (ns_details_selection_changed), ctx);
+
+  /* populate namespace model */
+  (void) GNUNET_FS_pseudonym_list_all (GNUNET_FS_GTK_get_configuration (),
+      populate_known_ns_list, ctx);
+
+#if FIXME_USE_IDENTITY_SERVICE
+  /* mark our own namespaces as such */
+  GNUNET_FS_namespace_list (GNUNET_FS_GTK_get_fs_handle (),
+                           &mark_namespaces_as_mine, ctx);
+#endif
+
+  /* sort namespace order list by rank (initially) */
+  sort_order_list (ctx, GNUNET_GTK_NAMESPACE_ORDER_RANK_COLUMN);
+
+  gtk_widget_set_sensitive (ctx->details_apply_button, FALSE);
+
+  /* show dialog */
+  gtk_window_present (ctx->namespace_manager);
+  return ctx->namespace_manager;
+}
+
+
+static void
+ns_manager_deleted (GtkWindow *object, gpointer user_data)
+{
+  struct GNUNET_GTK_MainWindowContext *ctx = user_data;
+  g_signal_handler_disconnect (object, ctx->ns_manager_delete_handler_id);
+  g_object_unref (G_OBJECT (ctx->ns_manager));
+  ctx->ns_manager = NULL;
+  ctx->ns_manager_delete_handler_id = 0;
+  return;
+}
+
+
+void
+GNUNET_GTK_open_ns_manager (struct GNUNET_GTK_MainWindowContext *ctx)
+{
+  if (ctx->ns_manager != NULL)
+  {
+    gtk_window_present (ctx->ns_manager);
+    return;
+  }
+
+  ctx->ns_manager = GNUNET_GTK_namespace_manager_open (ctx);
+  if (ctx->ns_manager == NULL)
+    return;
+
+  g_object_ref (G_OBJECT (ctx->ns_manager));
+  ctx->ns_manager_delete_handler_id = g_signal_connect (G_OBJECT 
(ctx->ns_manager), "destroy", G_CALLBACK (ns_manager_deleted), ctx);
+}
+
+
+void
+GNUNET_GTK_main_menu_file_manage_pseudonyms_activate_cb (GtkMenuItem *menuitem,
+    gpointer user_data)
+{
+  GNUNET_GTK_open_ns_manager (user_data);
+}
+
+
+void
+namespace_selector_manage_namespaces_button_clicked_cb (GtkButton *button, 
gpointer user_data)
+{
+  GNUNET_GTK_open_ns_manager (user_data);
+}
+#endif
+
+/* end of gnunet-identity-gtk_namespace_manager.c */

Copied: gnunet-gtk/src/identity/gnunet-identity-gtk_advertise.h (from rev 
29083, gnunet-gtk/src/identity/gnunet-identity-gtk_namespace_manager.h)
===================================================================
--- gnunet-gtk/src/identity/gnunet-identity-gtk_advertise.h                     
        (rev 0)
+++ gnunet-gtk/src/identity/gnunet-identity-gtk_advertise.h     2013-09-07 
13:45:11 UTC (rev 29085)
@@ -0,0 +1,43 @@
+/*
+     This file is part of GNUnet
+     (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 3, or (at your
+     option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with GNUnet; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+     Boston, MA 02111-1307, USA.
+*/
+
+/**
+ * @file src/identity/gnunet-identity-gtk_namespace_manager.h
+ * @author LRN
+ * @author Christian Grothoff
+ */
+
+#ifndef GNUNET_IDENTITY_GTK_NAMESPACE_MANAGER_H
+#define GNUNET_IDENTITY_GTK_NAMESPACE_MANAGER_H
+
+#include "gnunet_gtk.h"
+
+/**
+ * Run the dialog for advertising a namespace.
+ *
+ * @param priv private key of the namespace to advertise
+ */
+void
+GNUNET_IDENTITY_advertise_dialog_start_ (const struct 
GNUNET_CRYPTO_EccPrivateKey *priv);
+
+#endif 
+/* GNUNET_FS_GTK_NAMESPACE_MANAGER_H */
+
+/* end of gnunet-identity-gtk_namespace_manager.h */

Deleted: gnunet-gtk/src/identity/gnunet-identity-gtk_ego_organizer.c
===================================================================
--- gnunet-gtk/src/identity/gnunet-identity-gtk_ego_organizer.c 2013-09-07 
13:41:42 UTC (rev 29084)
+++ gnunet-gtk/src/identity/gnunet-identity-gtk_ego_organizer.c 2013-09-07 
13:45:11 UTC (rev 29085)
@@ -1,781 +0,0 @@
-/*
-     This file is part of GNUnet
-     (C) 2005, 2006, 2010, 2012 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 3, or (at your
-     option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-     You should have received a copy of the GNU General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
-*/
-
-/**
- * @file src/fs/gnunet-fs-gtk_namespace_organizer.c
- * @author LRN
- */
-#include "gnunet-fs-gtk_common.h"
-#include "gnunet-fs-gtk.h"
-#include "gnunet-fs-gtk_advertise-pseudonym.h"
-#include <gnunet/gnunet_util_lib.h>
-#include <gnunet/gnunet_fs_service.h>
-
-struct GNUNET_GTK_NamespaceSelectorContext
-{
-  GtkBuilder *builder;
-  GtkWidget *my_ns;
-  GtkTreeSelection *my_ns_sel;
-  GtkListStore *my_ns_store;
-  GtkWindow *namespace_organizer;
-  GtkWidget *create_button;
-  GtkWidget *delete_button;
-  GtkWidget *advertise_button;
-  GtkWidget *do_delete_button;
-  GtkWidget *do_keep_button;
-  GtkWidget *progress_spinner;
-  GtkWidget *progress_label;
-  GtkWidget *confirmation_label;
-  char *default_ns;
-  GtkTreeRowReference *default_ns_rref;
-  struct GNUNET_GTK_MainWindowContext *main_ctx;
-};
-
-#define GNUNET_GTK_MY_NAMESPACES_NAME_COLUMN 0
-#define GNUNET_GTK_MY_NAMESPACES_KEY_COLUMN 1
-#define GNUNET_GTK_MY_NAMESPACES_KEY_BINARY_COLUMN 2
-#define GNUNET_GTK_MY_NAMESPACES_USE_THIS_COLUMN 3
-#define GNUNET_GTK_MY_NAMESPACES_ACTUAL_NAME_COLUMN 4
-
-/**
- * User edited the name of a namespace.
- * Rename the namespace.
- *
- * @param renderer cell renderer
- * @param path path to the cell that was edited (as a string)
- * @param new_text new contents of the cell
- * @param user_data context
- */
-void
-GNUNET_GTK_namespace_organizer_namespaces_treeview_column_name_text_edited_cb (
-    GtkCellRendererText *renderer, gchar *path, gchar *new_text,
-    gpointer user_data)
-{
-  struct GNUNET_GTK_NamespaceSelectorContext *ctx = user_data;
-  GtkTreePath *tree_path;
-  GtkTreeIter iter;
-
-  if (strlen (new_text) == 0)
-    return;
-
-  tree_path = gtk_tree_path_new_from_string (path);
-  if (tree_path != NULL)
-  {
-    if (gtk_tree_model_get_iter (GTK_TREE_MODEL (ctx->my_ns_store),
-        &iter, tree_path))
-    {
-      struct GNUNET_FS_PseudonymIdentifier *nsid;
-      char *old_name;
-      gtk_tree_model_get (GTK_TREE_MODEL (ctx->my_ns_store), &iter,
-          GNUNET_GTK_MY_NAMESPACES_NAME_COLUMN, &old_name,
-          GNUNET_GTK_MY_NAMESPACES_KEY_BINARY_COLUMN, &nsid,
-          -1);
-
-      if ((NULL == nsid) ||
-          (GNUNET_OK == GNUNET_FS_namespace_rename (
-              GNUNET_FS_GTK_get_fs_handle (), old_name, new_text)))
-      {
-        gtk_list_store_set (ctx->my_ns_store, &iter,
-            GNUNET_GTK_MY_NAMESPACES_NAME_COLUMN, new_text, -1);
-      }
-
-      GNUNET_free (old_name);
-    }
-    gtk_tree_path_free (tree_path);
-  }
-}
-
-/**
- * Frees contents of the namespace list (the nsid values that are stored as
- * untyped pointers in the tree).
- *
- * @param ctx NS organizer context
- */
-static void
-free_lists_contents (struct GNUNET_GTK_NamespaceSelectorContext *ctx)
-{
-  GtkTreeIter iter;
-  gint i;
-  gint row_count;
-  struct GNUNET_FS_PseudonymIdentifier *nsid;
-
-  row_count = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (
-      ctx->my_ns_store), NULL);
-  if (! gtk_tree_model_get_iter_first (GTK_TREE_MODEL (
-      ctx->my_ns_store), &iter))
-    return;
-
-  for (i = 0; i < row_count; i++)
-  {
-    gtk_tree_model_get (GTK_TREE_MODEL (ctx->my_ns_store), &iter,
-        GNUNET_GTK_MY_NAMESPACES_KEY_BINARY_COLUMN, &nsid,
-        -1);
-    GNUNET_free (nsid);
-    if (TRUE != gtk_tree_model_iter_next (GTK_TREE_MODEL (
-      ctx->my_ns_store), &iter))
-      break;
-  }
-
-  gtk_list_store_clear (ctx->my_ns_store);
-}
-
-/**
- * Called when dialog is being closed (for any reason).
- *
- * @param dialog dialog being closed
- * @param response_id identifies the event
- * @param user_data context
- */
-void
-GNUNET_GTK_namespace_organizer_dialog_response_cb (GtkDialog *dialog,
-    gint response_id, gpointer user_data)
-{
-  struct GNUNET_GTK_NamespaceSelectorContext *ctx = user_data;
-  switch (response_id)
-  {
-  case GTK_RESPONSE_CLOSE:
-  default:
-    free_lists_contents (ctx);
-    gtk_widget_destroy (GTK_WIDGET (ctx->namespace_organizer));
-    GNUNET_free (ctx);
-  }
-}
-
-/**
- * Store a reference to the default namespace for later use.
- *
- * @param ctx context
- * @param iter points to the default namespace in the list
- */
-static void
-save_default_ns_reference (struct GNUNET_GTK_NamespaceSelectorContext *ctx, 
GtkTreeIter *iter)
-{
-  GtkTreeRowReference *ref;
-  GtkTreePath *rowpath;
-
-  rowpath = gtk_tree_model_get_path (GTK_TREE_MODEL (ctx->my_ns_store), iter); 
 
-  if (rowpath)
-  {
-    ref = gtk_tree_row_reference_new (GTK_TREE_MODEL (ctx->my_ns_store), 
rowpath);
-    if (ref)
-    {
-      gtk_tree_row_reference_free (ctx->default_ns_rref);
-      ctx->default_ns_rref = ref;
-    }
-    gtk_tree_path_free (rowpath);
-  }
-}
-
-
-/**
- * Try to mark an item in the list as the default namespace.
- *
- * @param ctx context
- * @param iter points to the new default namespace in the list
- */
-static void
-try_make_default (struct GNUNET_GTK_NamespaceSelectorContext *ctx, GtkTreeIter 
*toggled)
-{
-  GtkTreeIter iter;
-  gchar *new_default_ns;
-  gint i;
-  gint row_count;
-  GtkTreePath *path;
-
-  row_count = gtk_tree_model_iter_n_children (
-      GTK_TREE_MODEL (ctx->my_ns_store), NULL);
-  if (! gtk_tree_model_get_iter_first (
-      GTK_TREE_MODEL (ctx->my_ns_store), &iter))
-    return;
-
-  path = gtk_tree_row_reference_get_path (ctx->default_ns_rref);
-  if (path)
-  {
-    /* We know where previous default was, only untoggle that item */
-    GtkTreeIter old_default;
-    if (gtk_tree_model_get_iter (GTK_TREE_MODEL (ctx->my_ns_store), 
&old_default, path))
-    {
-      gtk_list_store_set (ctx->my_ns_store, &old_default,
-          GNUNET_GTK_MY_NAMESPACES_USE_THIS_COLUMN, FALSE,
-          -1);
-    }
-    gtk_tree_path_free (path);
-  }
-  else
-  {
-    /* Just untoggle all items */
-    for (i = 0; i < row_count; i++)
-    {
-      gtk_list_store_set (ctx->my_ns_store, &iter,
-          GNUNET_GTK_MY_NAMESPACES_USE_THIS_COLUMN, FALSE,
-          -1);
-      if (TRUE != gtk_tree_model_iter_next (
-          GTK_TREE_MODEL (ctx->my_ns_store), &iter))
-        break;
-    }
-  }
-
-  gtk_list_store_set (ctx->my_ns_store, toggled,
-      GNUNET_GTK_MY_NAMESPACES_USE_THIS_COLUMN, TRUE, -1);
-  gtk_tree_model_get (GTK_TREE_MODEL (ctx->my_ns_store), toggled,
-      GNUNET_GTK_MY_NAMESPACES_NAME_COLUMN, &new_default_ns, -1);
-
-  save_default_ns_reference (ctx, toggled);
-
-  if (new_default_ns)
-  {
-    ctx->default_ns = GNUNET_strdup (new_default_ns);
-    GNUNET_CONFIGURATION_set_value_string (
-       (struct GNUNET_CONFIGURATION_Handle *) GNUNET_FS_GTK_get_configuration 
(),
-      "gnunet-fs-gtk", "DEFAULT_NAMESPACE", ctx->default_ns);
-
-    g_free (new_default_ns);
-  }
-}
-
-
-
-/**
- * Callback with information about local (!) namespaces.
- * Contains the names of the local namespace and the global
- * ID.
- *
- * @param cls closure
- * @param name human-readable identifier of the namespace
- * @param id hash identifier for the namespace
- */
-static void
-populate_my_ns_list (void *cls, const char *name,
-    const struct GNUNET_FS_PseudonymIdentifier *id)
-{
-  struct GNUNET_GTK_NamespaceSelectorContext *ctx = cls;
-
-  char buf[1024];
-  char *ret;
-  GtkTreeIter my_iter;
-  struct GNUNET_FS_PseudonymIdentifier *nsid;
-  gboolean is_default;
-
-  nsid = GNUNET_malloc (sizeof (struct GNUNET_FS_PseudonymIdentifier));
-  *nsid = *id;
-
-  ret = GNUNET_STRINGS_data_to_string (nsid,
-      sizeof (struct GNUNET_FS_PseudonymIdentifier), buf, sizeof (buf));
-  GNUNET_assert (NULL != ret);
-  ret[0] = '\0';
-
-  if (NULL == ctx->default_ns)
-  {
-    ctx->default_ns = GNUNET_strdup (name);
-    GNUNET_CONFIGURATION_set_value_string (
-       (struct GNUNET_CONFIGURATION_Handle *) GNUNET_FS_GTK_get_configuration 
(),
-      "gnunet-fs-gtk", "DEFAULT_NAMESPACE", ctx->default_ns);
-    is_default = TRUE;
-  }
-  else
-    is_default = (0 == strcmp (name, ctx->default_ns)) ? TRUE : FALSE;
-
-  gtk_list_store_insert_with_values (ctx->my_ns_store, &my_iter, G_MAXINT,
-      GNUNET_GTK_MY_NAMESPACES_NAME_COLUMN, name,
-      GNUNET_GTK_MY_NAMESPACES_KEY_COLUMN, buf,
-      GNUNET_GTK_MY_NAMESPACES_KEY_BINARY_COLUMN, nsid,
-      GNUNET_GTK_MY_NAMESPACES_USE_THIS_COLUMN, is_default,
-      GNUNET_GTK_MY_NAMESPACES_ACTUAL_NAME_COLUMN, NULL,
-      -1);
-
-  if (is_default)
-    save_default_ns_reference (ctx, &my_iter);
-}
-
-/**
- * Returns button visibility/sensitivity to normal.
- *
- * @param ctx context
- * @param anything_selected TRUE if a namespace is selected in the list,
- *                          FALSE otherwise
- */
-static void
-set_normal_state (struct GNUNET_GTK_NamespaceSelectorContext *ctx, gboolean 
anything_selected)
-{
-  gtk_widget_set_visible (ctx->do_delete_button, FALSE);
-  gtk_widget_set_visible (ctx->do_keep_button, FALSE);
-  gtk_widget_set_visible (ctx->confirmation_label, FALSE);
-
-  gtk_widget_set_sensitive (ctx->advertise_button, anything_selected);
-  gtk_widget_set_sensitive (ctx->delete_button, anything_selected);
-  gtk_widget_set_sensitive (ctx->create_button, TRUE);
-}
-
-/**
- * Handles ns list selection changes.
- *
- * @param treeselection selection object
- * @param user_data context
- */
-static void
-my_ns_selection_changed (GtkTreeSelection *treeselection,
-    gpointer user_data)
-{
-  struct GNUNET_GTK_NamespaceSelectorContext *ctx = user_data;
-  GtkTreeIter iter;
-  struct GNUNET_FS_PseudonymIdentifier *nsid;
-  gboolean selected;
-
-  nsid = NULL;
-  selected = gtk_tree_selection_get_selected (ctx->my_ns_sel, NULL, &iter);
-  if (selected)
-    gtk_tree_model_get (GTK_TREE_MODEL (ctx->my_ns_store), &iter,
-        GNUNET_GTK_MY_NAMESPACES_KEY_BINARY_COLUMN, &nsid, -1);
-  if (NULL == nsid)
-    selected = FALSE;
-  set_normal_state (ctx, selected);
-}
-
-/**
- * Opens the organizer dialog. Called from outside (by the main window).
- *
- * @param main_ctx context of the main window
- * @return newly-created dialog window object
- */
-GtkWindow *
-GNUNET_GTK_namespace_organizer_open (struct GNUNET_GTK_MainWindowContext 
*main_ctx)
-{
-  struct GNUNET_GTK_NamespaceSelectorContext *ctx;
-  const struct GNUNET_CONFIGURATION_Handle *cfg;
-
-  ctx = GNUNET_malloc (sizeof (struct GNUNET_GTK_NamespaceSelectorContext));
-  ctx->builder = GNUNET_GTK_get_new_builder 
("gnunet_fs_gtk_namespace_organizer.glade", ctx);
-  if (ctx->builder == NULL)
-  {
-    GNUNET_break (0);
-    GNUNET_free (ctx);
-    return NULL;
-  }
-
-  ctx->main_ctx = main_ctx;
-
-  /* initialize widget references */
-  ctx->my_ns = GTK_WIDGET (gtk_builder_get_object (ctx->builder,
-      "GNUNET_GTK_namespace_organizer_namespaces_treeview"));
-  ctx->my_ns_sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (
-      ctx->my_ns));
-  ctx->my_ns_store = GTK_LIST_STORE (gtk_tree_view_get_model (
-      GTK_TREE_VIEW (ctx->my_ns)));
-  ctx->namespace_organizer = GTK_WINDOW (gtk_builder_get_object (
-      ctx->builder, "GNUNET_GTK_namespace_organizer_dialog"));
-  ctx->create_button = GTK_WIDGET (gtk_builder_get_object (ctx->builder,
-      "GNUNET_GTK_namespace_organizer_namespaces_create_namespace_button"));
-  ctx->advertise_button = GTK_WIDGET (gtk_builder_get_object (ctx->builder,
-      "GNUNET_GTK_namespace_organizer_namespaces_advertise_namespace_button"));
-  ctx->delete_button = GTK_WIDGET (gtk_builder_get_object (ctx->builder,
-      "GNUNET_GTK_namespace_organizer_namespaces_delete_namespace_button"));
-  ctx->do_delete_button = GTK_WIDGET (gtk_builder_get_object (ctx->builder,
-      
"GNUNET_GTK_namespace_organizer_namespaces_delete_namespace_confirmation_button"));
-  ctx->do_keep_button = GTK_WIDGET (gtk_builder_get_object (ctx->builder,
-      
"GNUNET_GTK_namespace_organizer_namespaces_delete_namespace_unconfirmation_button"));
-  ctx->progress_spinner = GTK_WIDGET (gtk_builder_get_object (ctx->builder,
-      
"GNUNET_GTK_namespace_organizer_namespaces_create_namespace_progress_spinner"));
-  ctx->progress_label = GTK_WIDGET (gtk_builder_get_object (ctx->builder,
-      
"GNUNET_GTK_namespace_organizer_namespaces_create_namespace_progress_label"));
-  ctx->confirmation_label = GTK_WIDGET (gtk_builder_get_object (ctx->builder,
-      
"GNUNET_GTK_namespace_organizer_namespaces_delete_namespace_confirmation_label"));
-
-  /* connect signals; FIXME-GTK3: these could be connected with (modern) Glade 
*/
-  g_signal_connect (G_OBJECT (ctx->my_ns_sel), "changed",
-      G_CALLBACK (my_ns_selection_changed), ctx);
-
-  cfg = GNUNET_FS_GTK_get_configuration ();
-
-  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (cfg,
-      "gnunet-fs-gtk", "DEFAULT_NAMESPACE", &ctx->default_ns))
-    ctx->default_ns = NULL;
-
-  gtk_widget_set_sensitive (ctx->advertise_button, FALSE);
-  gtk_widget_set_sensitive (ctx->delete_button, FALSE);
-
-  gtk_widget_set_visible (ctx->do_delete_button, FALSE);
-  gtk_widget_set_visible (ctx->do_keep_button, FALSE);
-  gtk_widget_set_visible (ctx->progress_spinner, FALSE);
-  gtk_widget_set_visible (ctx->progress_label, FALSE);
-  gtk_widget_set_visible (ctx->confirmation_label, FALSE);
-
-  /* populate namespace model */
-  GNUNET_FS_namespace_list (GNUNET_FS_GTK_get_fs_handle (),
-      populate_my_ns_list, ctx);
-
-  /* show dialog */
-  gtk_window_present (ctx->namespace_organizer);
-  return ctx->namespace_organizer;
-}
-
-/**
- * Called when the organizer dialog is destoryed
- * (happens at some point after it's closed).
- * Cleans up references to the organizer dialog that main window stores.
- *
- * @param object the object that is being destroyed
- * @param user_data main window context
- */
-void
-GNUNET_GTK_namespace_organizer_dialog_destroy_cb (GtkWindow *object, gpointer 
user_data)
-{
-  struct GNUNET_GTK_MainWindowContext *ctx = user_data;
-  g_signal_handler_disconnect (object, ctx->ns_organizer_delete_handler_id);
-  g_object_unref (G_OBJECT (ctx->ns_organizer));
-  ctx->ns_organizer = NULL;
-  ctx->ns_organizer_delete_handler_id = 0;
-  return;
-}
-
-/**
- * Wrapper for GNUNET_GTK_namespace_organizer_open(), ensures that
- * only one instance is opened.
- * @param ctx main window context
- */
-void
-GNUNET_GTK_open_ns_organizer (struct GNUNET_GTK_MainWindowContext *ctx)
-{
-  if (ctx->ns_organizer != NULL)
-  {
-    gtk_window_present (ctx->ns_organizer);
-    return;
-  }
-
-  ctx->ns_organizer = GNUNET_GTK_namespace_organizer_open (ctx);
-  if (ctx->ns_organizer == NULL)
-    return;
-
-  g_object_ref (G_OBJECT (ctx->ns_organizer));
-  ctx->ns_organizer_delete_handler_id = g_signal_connect (G_OBJECT 
(ctx->ns_organizer), "destroy", G_CALLBACK 
(GNUNET_GTK_namespace_organizer_dialog_destroy_cb), ctx);
-}
-
-/**
- * Called when user clicks at 'Advertise namespace' button.
- * Opens the advertising dialog (calls GNUNET_FS_GTK_advertise_namespace()).
- *
- * @param button button that was clicked
- * @param user_data context
- */
-void
-GNUNET_GTK_namespace_organizer_namespaces_advertise_namespace_button_clicked_cb
 (
-    GtkButton *button, gpointer user_data)
-{
-  struct GNUNET_GTK_NamespaceSelectorContext *ctx = user_data;
-  GtkTreeIter iter;
-  gchar *name;
-  struct GNUNET_FS_PseudonymIdentifier *nsid;
-
-  nsid = NULL;
-  name = NULL;
-  if (gtk_tree_selection_get_selected (ctx->my_ns_sel, NULL, &iter))
-    gtk_tree_model_get (GTK_TREE_MODEL (ctx->my_ns_store), &iter,
-        GNUNET_GTK_MY_NAMESPACES_NAME_COLUMN, &name, 
-        GNUNET_GTK_MY_NAMESPACES_KEY_BINARY_COLUMN, &nsid,
-        -1);
-  if (NULL != nsid)
-  {
-    struct GNUNET_FS_Namespace *ns;
-    ns = GNUNET_FS_namespace_open_existing (GNUNET_FS_GTK_get_fs_handle (), 
name);
-    if (ns)
-      GNUNET_FS_GTK_advertise_namespace (ns, ctx->namespace_organizer);
-  }
-  g_free (name);
-}
-
-/**
- * Called when user clicks at 'Do not delete' button.
- * Returns the state back to normal (hides [un]confirmation buttons
- * and the warning label).
- *
- * @param button button that was clicked
- * @param user_data context
- */
-void
-GNUNET_GTK_namespace_organizer_namespaces_delete_namespace_unconfirmation_button_clicked_cb
 (
-    GtkButton *button, gpointer user_data)
-{
-  set_normal_state (user_data, TRUE);
-}
-
-
-/**
- * Called when user clicks at 'Do delete' button.
- * Deletes selected namespace after double-checking that everything is
- * in order.
- * Returns the state back to normal (hides [un]confirmation buttons
- * and the warning label).
- *
- * @param button button that was clicked
- * @param user_data context
- */
-void
-GNUNET_GTK_namespace_organizer_namespaces_delete_namespace_confirmation_button_clicked_cb
 (
-    GtkButton *button, gpointer user_data)
-{
-  struct GNUNET_GTK_NamespaceSelectorContext *ctx = user_data;
-  GtkTreeIter iter;
-  gchar *name;
-  gboolean selected;
-  struct GNUNET_FS_PseudonymIdentifier id;
-  struct GNUNET_FS_PseudonymIdentifier *nsid;
-
-  nsid = NULL;
-  name = NULL;
-  selected = gtk_tree_selection_get_selected (ctx->my_ns_sel, NULL, &iter);
-  if (selected)
-    gtk_tree_model_get (GTK_TREE_MODEL (ctx->my_ns_store), &iter,
-        GNUNET_GTK_MY_NAMESPACES_NAME_COLUMN, &name, 
-        GNUNET_GTK_MY_NAMESPACES_KEY_BINARY_COLUMN, &nsid,
-        -1);
-  if (NULL == nsid)
-    selected = FALSE;
-
-  if (selected)
-  {
-    struct GNUNET_FS_Namespace *ns;
-    ns = GNUNET_FS_namespace_open_existing (GNUNET_FS_GTK_get_fs_handle (), 
name);
-    if (ns)
-    {
-      if (GNUNET_FS_namespace_get_public_identifier (ns, &id))
-      {
-        if (0 == memcmp (&id, nsid, sizeof (id)))
-        {
-          GtkTreeIter first;
-
-          GNUNET_free (nsid);
-          gtk_list_store_remove (ctx->my_ns_store, &iter);
-          GNUNET_FS_namespace_delete (ns, GNUNET_YES);
-
-          if (gtk_tree_model_get_iter_first (
-              GTK_TREE_MODEL (ctx->my_ns_store), &first))
-            try_make_default (ctx, &first);
-        }
-        else
-        {
-          /* We were trying to delete namespace FOO with key X
-           * but when we opened FOO, we discovered that its key is Y.
-           * Clearly this is not the right namespace (something changed
-           * the namespace list right under us?).
-           */
-           /* TODO: display error message */
-          GNUNET_FS_namespace_delete (ns, GNUNET_NO);
-        }
-      }
-      else
-      {
-        /* We were trying to delete namespace FOO,
-         * but we can't even get its key
-         */
-        /* TODO: display error message */
-        GNUNET_FS_namespace_delete (ns, GNUNET_NO);
-      }
-    }
-  }
-  g_free (name);
-  set_normal_state (user_data, selected);
-}
-
-/**
- * Called when user clicks at 'Delete' button.
- * Shows the [un]confirmation buttons, as well as the warning.
- *
- * @param button button that was clicked
- * @param user_data context
- */
-void
-GNUNET_GTK_namespace_organizer_namespaces_delete_namespace_button_clicked_cb (
-    GtkButton *button, gpointer user_data)
-{
-  struct GNUNET_GTK_NamespaceSelectorContext *ctx = user_data;
-  gtk_widget_set_visible (ctx->do_delete_button, TRUE);
-  gtk_widget_set_visible (ctx->do_keep_button, TRUE);
-  gtk_widget_set_visible (ctx->confirmation_label, TRUE);
-  gtk_widget_set_sensitive (ctx->advertise_button, FALSE);
-  gtk_widget_set_sensitive (ctx->delete_button, FALSE);
-  gtk_widget_set_sensitive (ctx->create_button, FALSE);
-}
-
-/**
- * Generates a random ns name.
- *
- * @return new name (free with GNUNET_free()).
- */
-char *
-generate_local_ns_name ()
-{
-  const char *table = 
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
-  size_t tablelen = strlen (table);
-  char random_str[9];
-  char *result;
-  int i;
-  for (i = 0; i < 8; i++)
-  {
-    uint32_t index = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 
tablelen);
-    GNUNET_assert (index < tablelen);
-    random_str[i] = table[index];
-  }
-  random_str[8] = '\0';
-
-  GNUNET_asprintf (&result, _("MyNamespace-%s"), random_str);
-  return result;
-}
-
-
-/**
- * Called when key generation for a namespace is finished.
- *
- * @param cls context
- * @param ns newly-created namespace (NULL on failure)
- * @param emsg error message (NULL on success)
- */
-static void
-ns_created (void *cls, struct GNUNET_FS_Namespace *ns, char *name, const char 
*emsg)
-{
-  struct GNUNET_GTK_NamespaceSelectorContext *ctx = cls;
-
-  GtkTreeIter iter;
-  struct GNUNET_FS_PseudonymIdentifier *nsid;
-  struct GNUNET_FS_PseudonymIdentifier id;
-
-  /* If ns was created, get its public key hash */
-  nsid = NULL;
-  if ((NULL != ns) && (GNUNET_OK == GNUNET_FS_namespace_get_public_identifier 
(ns, &id)))
-  {
-    nsid = GNUNET_malloc (sizeof (struct GNUNET_FS_PseudonymIdentifier));
-    memcpy (nsid, &id, sizeof (struct GNUNET_FS_PseudonymIdentifier));
-  }
-
-  /* If anything of the above went wrong, or ns creation failed, we abort */
-  if (NULL == nsid)
-  {
-    GNUNET_FS_namespace_delete (ns, GNUNET_NO);
-  }
-  else
-  {
-    char buf[1024];
-    char *ret;
-    gint row_count;
-
-    ret = GNUNET_STRINGS_data_to_string (nsid,
-                                        sizeof (struct 
GNUNET_FS_PseudonymIdentifier),
-                                        buf,
-                                        sizeof (buf));
-    GNUNET_assert (NULL != ret);
-    ret[0] = '\0';
-
-    gtk_list_store_insert_with_values (ctx->my_ns_store, &iter, G_MAXINT,
-        GNUNET_GTK_MY_NAMESPACES_KEY_COLUMN, buf,
-        GNUNET_GTK_MY_NAMESPACES_KEY_BINARY_COLUMN, nsid,
-        GNUNET_GTK_MY_NAMESPACES_NAME_COLUMN, name,
-        -1);
-
-    row_count = gtk_tree_model_iter_n_children (
-        GTK_TREE_MODEL (ctx->my_ns_store), NULL);
-    if (row_count == 1)
-      try_make_default (ctx, &iter);
-  }
-}
-
-
-/**
- * Create a namespace.
- * Adds a dummy to the list, starts the key generation process,
- * shows the progress spinner, disables some buttons.
- *
- * @param ctx context
- */
-static void
-create_namespace (struct GNUNET_GTK_NamespaceSelectorContext *ctx)
-{
-  gchar *name;
-  struct GNUNET_FS_Namespace *ns;
-
-  ns = NULL;
-  name = NULL;
-  do
-  {
-    if (ns)
-      GNUNET_FS_namespace_delete (ns, GNUNET_NO);
-    GNUNET_free_non_null (name);
-    name = generate_local_ns_name ();
-    ns = GNUNET_FS_namespace_open_existing (GNUNET_FS_GTK_get_fs_handle (), 
name);
-  } while (NULL != ns);
-
-  ns = GNUNET_FS_namespace_create (GNUNET_FS_GTK_get_fs_handle (), name);
-
-  if (NULL == ns)
-  {
-    GNUNET_free (name);
-    return;
-  }
-
-  ns_created (ctx, ns, name, NULL);
-
-  GNUNET_free (name);
-}
-
-/**
- * Called when user clicks at 'Create' button.
- * Creates a namespace.
- *
- * @param button button that was clicked
- * @param user_data context
- */
-void
-GNUNET_GTK_namespace_organizer_namespaces_create_namespace_button_clicked_cb (
-    GtkButton *button, gpointer user_data)
-{
-  create_namespace (user_data);
-}
-
-/**
- * Called when user toggles the radio button at a namespace in the list
- * Tries to make that namespace the new default.
- *
- * @param cell_renderer renderer of the call that was toggled.
- * @param path path to the cell that was toggled
- * @param user_data context
- */
-void
-GNUNET_GTK_namespace_organizer_namespaces_treeview_column_usethis_toggle_toggled_cb
 (
-    GtkCellRendererToggle *cell_renderer, gchar *path, gpointer user_data)
-{
-  struct GNUNET_GTK_NamespaceSelectorContext *ctx = user_data;
-  GtkTreeIter iter;
-  if (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (ctx->my_ns_store),
-      &iter, path))
-    try_make_default (ctx, &iter);
-}
-
-/**
- * Called when user activates the appropriate item in main window `File' menu.
- * Opens Namespace organizer dialog.
- *
- * @param menuitem item that was activated
- * @param user_data main window context
- */
-void
-GNUNET_GTK_main_menu_file_organize_namespaces_activate_cb (GtkMenuItem 
*menuitem,
-    gpointer user_data)
-{
-  GNUNET_GTK_open_ns_organizer (user_data);
-}
-
-/* end of gnunet-fs-gtk_namespace_organizer.c */

Deleted: gnunet-gtk/src/identity/gnunet-identity-gtk_ego_organizer.h
===================================================================
--- gnunet-gtk/src/identity/gnunet-identity-gtk_ego_organizer.h 2013-09-07 
13:41:42 UTC (rev 29084)
+++ gnunet-gtk/src/identity/gnunet-identity-gtk_ego_organizer.h 2013-09-07 
13:45:11 UTC (rev 29085)
@@ -1,36 +0,0 @@
-/*
-     This file is part of GNUnet
-     (C) 2005, 2006, 2010, 2012 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 3, or (at your
-     option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-     You should have received a copy of the GNU General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
-*/
-
-/**
- * @file src/fs/gnunet-fs-gtk_namespace_organizer.h
- * @author LRN
- */
-
-#ifndef GNUNET_FS_GTK_NAMESPACE_ORGANIZER_H
-#define GNUNET_FS_GTK_NAMESPACE_ORGANIZER_H
-
-#include "gnunet-fs-gtk_common.h"
-#include "gnunet-fs-gtk.h"
-
-GtkObject *
-GNUNET_GTK_namespace_organizer_open (struct GNUNET_GTK_MainWindowContext 
*main_ctx);
-
-#endif /* GNUNET_FS_GTK_NAMESPACE_ORGANIZER_H */
-/* end of gnunet-fs-gtk_namespace_organizer.c */

Deleted: gnunet-gtk/src/identity/gnunet-identity-gtk_namespace_manager.c
===================================================================
--- gnunet-gtk/src/identity/gnunet-identity-gtk_namespace_manager.c     
2013-09-07 13:41:42 UTC (rev 29084)
+++ gnunet-gtk/src/identity/gnunet-identity-gtk_namespace_manager.c     
2013-09-07 13:45:11 UTC (rev 29085)
@@ -1,1275 +0,0 @@
-/*
-     This file is part of GNUnet
-     (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 3, or (at your
-     option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-     You should have received a copy of the GNU General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
-*/
-
-/**
- * @file src/identity/gnunet-identity-gtk_namespace_manager.c
- * @author LRN
- * @author Christian Grothoff
- */
-#include "gnunet-identity-gtk_namespace_manager.h"
-#include <gnunet/gnunet_fs_service.h>
-
-/**
- * Types of metadata we offer for namespaces.
- */
-static gint types[] = {
-  EXTRACTOR_METATYPE_TITLE,
-  EXTRACTOR_METATYPE_KEYWORDS, 
-  EXTRACTOR_METATYPE_SUBJECT,
-  EXTRACTOR_METATYPE_DESCRIPTION,
-  EXTRACTOR_METATYPE_COMMENT, 
-  EXTRACTOR_METATYPE_COPYRIGHT,
-  EXTRACTOR_METATYPE_URI, 
-  EXTRACTOR_METATYPE_CREATOR, 
-  EXTRACTOR_METATYPE_CREATION_DATE,
-  EXTRACTOR_METATYPE_RESERVED
-};
-
-
-/**
- * Columns in the metadata list store.
- */
-enum METADATA_ModelColumns
-  {
-    /**
-     * A guint
-     */
-    METADATA_MC_TYPE_AS_ENUM = 0,
-
-    /**
-     * A gchararray 
-     */
-    METADATA_MC_TYPE_AS_STRING = 1,
-
-    /**
-     * A gchararray 
-     */
-    METADATA_MC_VALUE = 2
-
-  };
-
-
-/**
- * Columns in the keyword list tree store.
- */
-enum KEYWORDS_ModelColumns
-  {
-
-    /**
-     * A gchararray 
-     */
-    KEYWORDS_MC_KEYWORD = 0
-
-  };
-
-
-/**
- * Columns in the meta types list tree store.
- */
-enum METATYPES_ModelColumns
-  {
-
-    /**
-     * A gchararray 
-     */
-    METATYPES_MC_TYPE_AS_STRING = 0,
-
-    /**
-     * A guint
-     */
-    METATYPES_MC_TYPE_AS_ENUM = 1
-
-  };
-
-
-/**
- * Context for advertisement operations.
- */
-struct AdvertiseContext
-{
-  /**
-   * Builder for accessing objects in the dialog.
-   */
-  GtkBuilder *builder;
-  
-  /** 
-   * Private key of the namespace we will be advertising.
-   */
-  struct GNUNET_CRYPTO_EccPrivateKey priv;
-
-  /**
-   * Main dialog object.
-   */
-  GtkWidget *dialog;
-  
-  /**
-   * List of keywords to advertise under.
-   */
-  GtkListStore *keywords;
-
-  /**
-   * Metadata to include in the advertisement.
-   */
-  GtkListStore *metadata;
-
-  /**
-   * Model with the meta types.
-   */
-  GtkListStore *meta_types;
-
-};
-
-
-/**
- * The user terminated the dialog.  Perform the appropriate action.
- *
- * @param dialog the advertisement dialog
- * @param response_id action selected by the user
- * @param user_data our 'struct AdvertiseContext' (to be cleaned up)
- */
-void
-GNUNET_GTK_identity_advertise_dialog_response_cb (GtkDialog *dialog,
-                                                 gint response_id,
-                                                 gpointer user_data)
-{
-  struct AdvertiseContext *ac = user_data;
-
-  if (GTK_RESPONSE_OK == response_id)
-    {
-      GNUNET_break (0); // FIXME: not implemented
-    }
-
-  gtk_widget_destroy (ac->dialog);
-  g_object_unref (G_OBJECT (ac->builder));
-  GNUNET_free (ac);
-}
-
-
-/**
- * FIXME: do we need this event? If so, what do we do?
- */
-void
-GNUNET_GTK_identity_advertise_keywords_column_clicked_cb ()
-{
-  GNUNET_break (0);
-}
-
- 
-/**
- * User edited keywords in the keyword tree view.  Update
- * the model accordingly.
- */ 
-void
-GNUNET_GTK_identity_advertise_keywords_text_edited_cb ()
-{
-  GNUNET_break (0);
-}
-
-
-/**
- * User pushed a key in the metadata tree view.  Check if it was
- * "DEL" and if so, remove the selected values.
- */
-void
-GNUNET_GTK_identity_advertise_metadata_treeview_key_press_event_cb ()
-{
-  GNUNET_break (0);
-}
-
-
-/**
- * FIXME: how is this event triggered exactly?
- */
-void
-GNUNET_GTK_identity_advertise_metadata_treeview_delete_event_cb ()
-{
-  GNUNET_break (0);
-}
-
-
-/**
- * User edited metadata value.  Update sensitivity of the 'add' button.
- */
-void
-GNUNET_GTK_identity_advertise_metadata_value_text_edited_cb ()
-{
-  GNUNET_break (0);
-}
-
-
-/**
- * User edited metadata type.  Not sure we need to do something here...
- */
-void
-GNUNET_GTK_identity_advertise_metadata_type_text_edited_cb ()
-{
-  GNUNET_break (0);
-}
-
-
-/**
- * User clicked the 'add' button, get the type and value and update
- * the metadata model.
- */
-void
-GNUNET_GTK_identity_advertise_metadata_add_button_clicked_cb ()
-{
-  GNUNET_break (0);
-}
-
-
-/**
- * Run the dialog for advertising a namespace.
- *
- * @param priv private key of the namespace to advertise
- */
-void
-GNUNET_IDENTITY_advertise_dialog_start_ (const struct 
GNUNET_CRYPTO_EccPrivateKey *priv)
-{
-  struct AdvertiseContext *ac;
-  gint i;
-  GtkTreeIter iter;
-
-  ac = GNUNET_new (struct AdvertiseContext);
-  ac->priv = *priv;
-  ac->builder =
-    GNUNET_GTK_get_new_builder ("gnunet_identity_gtk_advertise_dialog.glade",
-                               ac);
-  if (NULL == ac->builder)
-  {
-    GNUNET_break (0);
-    GNUNET_free (ac);
-    return;
-  }
-  ac->dialog = GTK_WIDGET (gtk_builder_get_object
-                          (ac->builder, 
"GNUNET_GTK_identity_advertise_dialog"));
-  ac->keywords = GTK_LIST_STORE (gtk_builder_get_object
-                               (ac->builder, 
"GNUNET_GTK_identity_advertise_keywords_liststore"));
-  ac->metadata = GTK_LIST_STORE (gtk_builder_get_object
-                            (ac->builder, 
"GNUNET_GTK_identity_advertise_metadata_liststore"));
-  ac->meta_types = GTK_LIST_STORE (gtk_builder_get_object
-                                  (ac->builder, 
"GNUNET_GTK_identity_metadata_types_liststore"));
-  for (i = 0; EXTRACTOR_METATYPE_RESERVED != types[i]; i++)  
-    gtk_list_store_insert_with_values (ac->meta_types,
-                                      &iter, G_MAXINT, 
-                                      METATYPES_MC_TYPE_AS_STRING,
-                                      EXTRACTOR_metatype_to_string (types[i]),
-                                      METATYPES_MC_TYPE_AS_ENUM,
-                                      types[i],
-                                      -1);
-  gtk_window_present (GTK_WINDOW (ac->dialog));
-}
-
-
-#if 0
-
-static void
-sort_order_list (struct GNUNET_GTK_NamespaceManagerContext *ctx,
-    int sort_column)
-{
-  int sorted = GNUNET_NO;
-  GtkTreeIter iter;
-  gint i;
-  gint row_count;
-  gint *row_indices, *row_ints;
-  gchar **row_strings;
-
-  ctx->sort_direction = ctx->sort_direction <= 0 ? 1 : 0;
-
-  row_count = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (
-      ctx->ns_order_store), NULL);
-  if (! gtk_tree_model_get_iter_first (GTK_TREE_MODEL (
-      ctx->ns_order_store), &iter))
-    return;
-
-  row_indices = g_new0 (gint, row_count);
-  row_ints = g_new0 (gint, row_count);
-  row_strings = g_new0 (gchar *, row_count);
-
-  for (i = 0; i < row_count; i++)
-  {
-    int an_int;
-    char *a_string;
-    row_indices[i] = i;
-    switch (sort_column)
-    {
-    case GNUNET_GTK_NAMESPACE_ORDER_RANK_COLUMN:
-      gtk_tree_model_get (GTK_TREE_MODEL (ctx->ns_order_store), &iter,
-          sort_column, &an_int, -1);
-      row_ints[i] = an_int;
-      row_strings[i] = NULL;
-      break;
-    case GNUNET_GTK_NAMESPACE_ORDER_NAME_COLUMN:
-    case GNUNET_GTK_NAMESPACE_ORDER_IDENTIFIER_COLUMN:
-      gtk_tree_model_get (GTK_TREE_MODEL (ctx->ns_order_store), &iter,
-          sort_column, &a_string, -1);
-      row_strings[i] = a_string;
-      break;
-    default:
-      row_strings[i] = NULL;
-      break;
-    }
-    if (TRUE != gtk_tree_model_iter_next (GTK_TREE_MODEL (
-      ctx->ns_order_store), &iter))
-      break;
-  }
-
-  while (sorted != GNUNET_YES)
-  {
-    sorted = GNUNET_YES;
-    for (i = 0; i < row_count - 1; i++)
-    {
-      int cmp_result;
-
-      switch (sort_column)
-      {
-      case GNUNET_GTK_NAMESPACE_ORDER_RANK_COLUMN:
-        cmp_result = row_ints[i] <= row_ints[i + 1] ? 0 : 1;
-        break;
-      case GNUNET_GTK_NAMESPACE_ORDER_NAME_COLUMN:
-      case GNUNET_GTK_NAMESPACE_ORDER_IDENTIFIER_COLUMN:
-        /* FIXME: name can be UTF-8-encoded, use UTF-8-aware comparison func */
-        cmp_result = strcmp (row_strings[i], row_strings[i + 1]);
-        break;
-      default:
-       GNUNET_break (0);
-       cmp_result = 0;
-        break;
-      }
-
-      if (((ctx->sort_direction <= 0) && (cmp_result <= 0)) ||
-          ((ctx->sort_direction > 0) && (cmp_result > 0)))
-      {
-        int tmp_int, tmp_index;
-        char *tmp_string;
-        tmp_index = row_indices[i];
-        tmp_int = row_ints[i];
-        tmp_string = row_strings[i];
-        row_indices[i] = row_indices[i + 1];
-        row_ints[i] = row_ints[i + 1];
-        row_strings[i] = row_strings[i + 1];
-        row_ints[i + 1] = tmp_int;
-        row_strings[i + 1] = tmp_string;
-        row_indices[i + 1] = tmp_index;
-        sorted = GNUNET_NO;
-      }
-    }
-  }
-
-  gtk_list_store_reorder (ctx->ns_order_store, row_indices);
-
-  g_free (row_indices);
-  for (i = 0; i < row_count; i++)
-    g_free (row_strings[i]);
-  g_free (row_strings);
-  g_free (row_ints);
-}
-
-
-void
-GNUNET_GTK_namespace_manager_namespace_order_column_clicked_cb (
-    GtkTreeViewColumn *treeviewcolumn, gpointer user_data)
-{
-  struct GNUNET_GTK_NamespaceManagerContext *ctx = user_data;
-  if (treeviewcolumn == ctx->order_rank)
-  {
-    sort_order_list (ctx, GNUNET_GTK_NAMESPACE_ORDER_RANK_COLUMN);
-  }
-  else if (treeviewcolumn == ctx->order_name)
-  {
-    sort_order_list (ctx, GNUNET_GTK_NAMESPACE_ORDER_NAME_COLUMN);
-  }
-  else if (treeviewcolumn == ctx->order_id)
-  {
-    sort_order_list (ctx, GNUNET_GTK_NAMESPACE_ORDER_IDENTIFIER_COLUMN);
-  }
-}
-
-
-void
-GNUNET_GTK_namespace_manager_known_namespaces_delete_button_clicked_cb (
-    GtkButton *button, gpointer user_data)
-{
-  struct GNUNET_GTK_NamespaceManagerContext *ctx = user_data;
-  GtkTreeIter iter;
-  struct GNUNET_FS_PseudonymIdentifier *nsid;
-  GtkTreeRowReference *order_row, *known_row;
-  struct GNUNET_CONTAINER_MetaData *md;
-
-  if (FALSE == gtk_tree_selection_get_selected (ctx->known_ns_sel, NULL, 
&iter))
-    return;
-
-  gtk_tree_model_get (GTK_TREE_MODEL (ctx->known_ns_store), &iter,
-      GNUNET_GTK_KNOWN_NAMESPACES_IDENTIFIER_BIN_COLUMN, &nsid,
-      GNUNET_GTK_KNOWN_NAMESPACES_ORDER_ROW_REFERENCE_COLUMN, &order_row,
-      GNUNET_GTK_KNOWN_NAMESPACES_METADATA_COLUMN, &md,
-      -1);
-  /* Make sure the store does not contain references to freed objects */
-  gtk_list_store_set (ctx->known_ns_store, &iter,
-      GNUNET_GTK_KNOWN_NAMESPACES_IDENTIFIER_BIN_COLUMN, NULL,
-      GNUNET_GTK_KNOWN_NAMESPACES_ORDER_ROW_REFERENCE_COLUMN, NULL,
-      GNUNET_GTK_KNOWN_NAMESPACES_METADATA_COLUMN, NULL,
-      -1);
-  GNUNET_CONTAINER_meta_data_destroy (md);
-  if (order_row != NULL)
-  {
-    if (GNUNET_OK == GNUNET_GTK_get_iter_from_reference (order_row, &iter))
-    {
-      gtk_tree_model_get (GTK_TREE_MODEL (ctx->ns_order_store), &iter,
-        GNUNET_GTK_NAMESPACE_ORDER_KNOWN_ROW_REFERENCE_COLUMN, &known_row, -1);
-      gtk_list_store_set (ctx->ns_order_store, &iter,
-        GNUNET_GTK_NAMESPACE_ORDER_KNOWN_ROW_REFERENCE_COLUMN, NULL, -1);
-      if (known_row != NULL)
-        gtk_tree_row_reference_free (known_row);
-      gtk_list_store_remove (ctx->ns_order_store, &iter);
-    }
-    gtk_tree_row_reference_free (order_row);
-  }
-  ctx->deleted_namespaces = g_list_prepend (ctx->deleted_namespaces, nsid);
-  gtk_list_store_remove (ctx->known_ns_store, &iter);
-
-  gtk_list_store_clear (ctx->ns_details_store);
-  GNUNET_CONTAINER_meta_data_destroy (ctx->uneditable_md);
-  ctx->uneditable_md = NULL;
-}
-
-
-void
-GNUNET_GTK_namespace_manager_known_namespaces_swap_rank_button_clicked_cb (
-    GtkButton *button, gpointer user_data)
-{
-  struct GNUNET_GTK_NamespaceManagerContext *ctx = user_data;
-  GtkTreeIter known_iter, order_iter;
-  struct GNUNET_CRYPTO_EccPublicKey *nsid;
-  int32_t old_rank, new_rank;
-  GtkTreeRowReference *order_row, *known_row;
-
-  if (FALSE == gtk_tree_selection_get_selected (ctx->known_ns_sel, NULL, 
&known_iter))
-    return;
-
-  gtk_tree_model_get (GTK_TREE_MODEL (ctx->known_ns_store), &known_iter,
-      GNUNET_GTK_KNOWN_NAMESPACES_IDENTIFIER_BIN_COLUMN, &nsid,
-      GNUNET_GTK_KNOWN_NAMESPACES_RANK_COLUMN, &old_rank,
-      GNUNET_GTK_KNOWN_NAMESPACES_ORDER_ROW_REFERENCE_COLUMN, &order_row,
-      -1);
-
-  if (old_rank == 0)
-    new_rank = -1;
-  else
-    new_rank = -old_rank;
-
-  gtk_list_store_set (ctx->known_ns_store, &known_iter,
-      GNUNET_GTK_KNOWN_NAMESPACES_RANK_COLUMN, new_rank,
-      GNUNET_GTK_KNOWN_NAMESPACES_ORDER_ROW_REFERENCE_COLUMN, NULL,
-      -1);
-
-  if (order_row != NULL)
-  {
-    if (new_rank < 0)
-    {
-      if (GNUNET_OK == GNUNET_GTK_get_iter_from_reference (order_row, 
&order_iter))
-      {
-        gtk_tree_model_get (GTK_TREE_MODEL (ctx->ns_order_store), &order_iter,
-            GNUNET_GTK_NAMESPACE_ORDER_KNOWN_ROW_REFERENCE_COLUMN, &known_row, 
-1);
-        gtk_list_store_remove (ctx->ns_order_store, &order_iter);
-        if (known_row != NULL)
-          gtk_tree_row_reference_free (known_row);
-      }
-    }
-    gtk_tree_row_reference_free (order_row);
-  }
-  if (new_rank >= 0)
-  {
-    char *name, *identifier;
-    if (order_row != NULL)
-    {
-      /* This should not happen */
-      GNUNET_break (0);
-    }
-    gtk_tree_model_get (GTK_TREE_MODEL (ctx->known_ns_store), &known_iter,
-        GNUNET_GTK_KNOWN_NAMESPACES_NAME_COLUMN, &name,
-        GNUNET_GTK_KNOWN_NAMESPACES_IDENTIFIER_COLUMN, &identifier,
-        -1);
-    known_row = GNUNET_GTK_get_reference_from_iter (GTK_TREE_MODEL (
-        ctx->known_ns_store), &known_iter);
-    gtk_list_store_insert_with_values (ctx->ns_order_store, &order_iter, 
G_MAXINT,
-        GNUNET_GTK_NAMESPACE_ORDER_RANK_COLUMN, new_rank,
-        GNUNET_GTK_NAMESPACE_ORDER_NAME_COLUMN, name,
-        GNUNET_GTK_NAMESPACE_ORDER_IDENTIFIER_COLUMN, identifier,
-        GNUNET_GTK_NAMESPACE_ORDER_IDENTIFIER_BIN_COLUMN, nsid,
-        GNUNET_GTK_NAMESPACE_ORDER_KNOWN_ROW_REFERENCE_COLUMN, known_row,
-        -1);
-    g_free (name);
-    g_free (identifier);
-    order_row = GNUNET_GTK_get_reference_from_iter (GTK_TREE_MODEL 
(ctx->ns_order_store),
-        &order_iter);
-    gtk_list_store_set (ctx->known_ns_store, &known_iter,
-      GNUNET_GTK_KNOWN_NAMESPACES_ORDER_ROW_REFERENCE_COLUMN, order_row, -1);
-  }
-}
-
-
-void
-GNUNET_GTK_namespace_manager_namespace_order_apply_clicked_cb (
-    GtkButton *button, gpointer user_data)
-{
-  struct GNUNET_GTK_NamespaceManagerContext *ctx = user_data;
-  GtkTreeIter iter;
-  gint i;
-  gint row_count;
-  GtkTreeRowReference *known_row;
-
-  row_count = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (
-      ctx->ns_order_store), NULL);
-  if (! gtk_tree_model_get_iter_first (GTK_TREE_MODEL (
-      ctx->ns_order_store), &iter))
-    return;
-
-  for (i = 0; i < row_count; i++)
-  {
-    gtk_list_store_set (ctx->ns_order_store, &iter,
-        GNUNET_GTK_NAMESPACE_ORDER_RANK_COLUMN, i, -1);
-    gtk_tree_model_get (GTK_TREE_MODEL (ctx->ns_order_store), &iter,
-        GNUNET_GTK_NAMESPACE_ORDER_KNOWN_ROW_REFERENCE_COLUMN, &known_row, -1);
-    if (known_row == NULL)
-    {
-      /* This is not supposed to happen. What to do? */
-      GNUNET_break (0);
-    }
-    else
-    {
-      GtkTreeIter known_iter;
-      if (GNUNET_OK == GNUNET_GTK_get_iter_from_reference (known_row, 
&known_iter))
-      {
-        gtk_list_store_set (ctx->known_ns_store, &known_iter,
-            GNUNET_GTK_KNOWN_NAMESPACES_RANK_COLUMN, i,
-            -1);
-      }
-    }
-    if (TRUE != gtk_tree_model_iter_next (GTK_TREE_MODEL (
-      ctx->ns_order_store), &iter))
-      break;
-  }
-}
-
-
-void
-GNUNET_GTK_namespace_manager_namespace_details_add_button_clicked_cb (
-    GtkButton *button, gpointer user_data)
-{
-  /* FIXME: add a row to the details list. Disabled at the moment, since
-   * metadata type selection is not implemented.
-   */
-}
-
-
-void
-GNUNET_GTK_namespace_manager_namespace_details_delete_button_clicked_cb (
-    GtkButton *button, gpointer user_data)
-{
-  struct GNUNET_GTK_NamespaceManagerContext *ctx = user_data;
-  GtkTreeIter iter;
-
-  if (FALSE == gtk_tree_selection_get_selected (ctx->ns_details_sel, NULL, 
&iter))
-    return;
-
-  gtk_list_store_remove (ctx->ns_details_store, &iter);
-  gtk_widget_set_sensitive (ctx->details_apply_button, TRUE);
-}
-
-
-void
-GNUNET_GTK_namespace_manager_namespace_details_apply_button_clicked_cb (
-    GtkButton *button, gpointer user_data)
-{
-  struct GNUNET_GTK_NamespaceManagerContext *ctx = user_data;
-  GtkTreeIter iter, known_iter;
-  gint i;
-  gint row_count;
-  struct GNUNET_CONTAINER_MetaData *md, *old_md;
-  char *plugin_name;
-  int type;
-  char *type_name;
-  int format;
-  char *data_mime_type;
-  char *data;
-
-  row_count = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (
-      ctx->ns_details_store), NULL);
-  if ((row_count > 0) && (! gtk_tree_model_get_iter_first (
-      GTK_TREE_MODEL (ctx->ns_details_store), &iter)))
-  {
-    /* This should not happen */
-    return;
-  }
-
-  if (FALSE == gtk_tree_selection_get_selected (ctx->known_ns_sel, NULL,
-      &known_iter))
-  {
-    /* This should not happen */
-    return;
-  }
-
-  md = GNUNET_CONTAINER_meta_data_create ();
-
-  for (i = 0; i < row_count; i++)
-  {
-    gtk_tree_model_get (GTK_TREE_MODEL (ctx->ns_details_store), &iter,
-        GNUNET_GTK_NAMESPACE_DETAILS_PLUGIN_NAME_COLUMN, &plugin_name,
-        GNUNET_GTK_NAMESPACE_DETAILS_TYPE_BIN_COLUMN, &type,
-        GNUNET_GTK_NAMESPACE_DETAILS_TYPE_COLUMN, &type_name,
-        GNUNET_GTK_NAMESPACE_DETAILS_FORMAT_COLUMN, &format,
-        GNUNET_GTK_NAMESPACE_DETAILS_DATA_MIME_COLUMN, &data_mime_type,
-        GNUNET_GTK_NAMESPACE_DETAILS_VALUE_COLUMN, &data,
-        -1);
-    GNUNET_CONTAINER_meta_data_insert (md, plugin_name,
-        type, format, data_mime_type, data, strlen (data) + 1);
-    g_free (plugin_name);
-    g_free (type_name);
-    g_free (data_mime_type);
-    g_free (data);
-    if (TRUE != gtk_tree_model_iter_next (GTK_TREE_MODEL (
-      ctx->ns_details_store), &iter))
-      break;
-  }
-  GNUNET_CONTAINER_meta_data_merge (md,
-      (const struct GNUNET_CONTAINER_MetaData *) ctx->uneditable_md);
-
-  gtk_tree_model_get (GTK_TREE_MODEL (ctx->known_ns_store), &known_iter,
-      GNUNET_GTK_KNOWN_NAMESPACES_METADATA_COLUMN, &old_md,
-      -1);
-  GNUNET_CONTAINER_meta_data_destroy (old_md);
-  gtk_list_store_set (ctx->known_ns_store, &known_iter,
-      GNUNET_GTK_KNOWN_NAMESPACES_METADATA_COLUMN, md,
-      -1);
-  gtk_widget_set_sensitive (ctx->details_apply_button, FALSE);
-}
-
-
-void
-GNUNET_GTK_namespace_manager_name_text_editing_started_cb (
-    GtkCellRenderer *renderer, GtkCellEditable *editable, gchar *path,
-    gpointer user_data)
-{
-  struct GNUNET_GTK_NamespaceManagerContext *ctx = user_data;
-
-  if (GTK_IS_ENTRY (editable)) 
-  {
-    GtkTreePath *tree_path;
-    GtkTreeIter iter;
-    char *non_unique_name = NULL;
-    GtkEntry *entry = GTK_ENTRY (editable);
-
-    tree_path = gtk_tree_path_new_from_string (path);
-    if (tree_path != NULL)
-    {
-      if (gtk_tree_model_get_iter (GTK_TREE_MODEL (ctx->known_ns_store),
-          &iter, tree_path))
-      {
-        gtk_tree_model_get (GTK_TREE_MODEL (ctx->known_ns_store), &iter,
-            GNUNET_GTK_KNOWN_NAMESPACES_NON_UNIQUE_NAME_COLUMN, 
&non_unique_name,
-            -1);
-      }
-      gtk_tree_path_free (tree_path);
-    }
-    if (non_unique_name == NULL)
-    {
-      gtk_cell_editable_editing_done (editable);
-      return;
-    }
-    gtk_entry_set_text (entry, non_unique_name);
-    g_free (non_unique_name);
-  }
-}
-
-
-void
-GNUNET_GTK_namespace_manager_name_text_edited_cb (
-    GtkCellRendererText *renderer, gchar *path, gchar *new_text,
-    gpointer user_data)
-{
-  struct GNUNET_GTK_NamespaceManagerContext *ctx = user_data;
-  char *unique_name;
-  GtkTreeRowReference *order_row;
-
-  if (strlen (new_text) == 0)
-    return;
-
-  GtkTreePath *tree_path;
-  GtkTreeIter iter;
-  tree_path = gtk_tree_path_new_from_string (path);
-  if (tree_path != NULL)
-  {
-    if (gtk_tree_model_get_iter (GTK_TREE_MODEL (ctx->known_ns_store),
-        &iter, tree_path))
-    {
-      struct GNUNET_CRYPTO_EccPublicKey *nsid;
-      gtk_tree_model_get (GTK_TREE_MODEL (ctx->known_ns_store), &iter,
-          GNUNET_GTK_KNOWN_NAMESPACES_IDENTIFIER_BIN_COLUMN, &nsid,
-          GNUNET_GTK_KNOWN_NAMESPACES_ORDER_ROW_REFERENCE_COLUMN, &order_row,
-          -1);
-
-      unique_name = GNUNET_FS_pseudonym_name_uniquify (
-          GNUNET_FS_GTK_get_configuration (), nsid, new_text, NULL);
-
-      gtk_list_store_set (ctx->known_ns_store, &iter,
-          GNUNET_GTK_KNOWN_NAMESPACES_NON_UNIQUE_NAME_COLUMN, new_text,
-          GNUNET_GTK_KNOWN_NAMESPACES_NAME_COLUMN, unique_name,
-          -1);
-
-      if (order_row != NULL)
-      {
-        GtkTreeIter order_iter;
-        if (GNUNET_OK == GNUNET_GTK_get_iter_from_reference (order_row, 
&order_iter))
-        {
-          gtk_list_store_set (ctx->ns_order_store, &order_iter,
-            GNUNET_GTK_NAMESPACE_ORDER_NAME_COLUMN, unique_name,
-            -1);
-        }
-      }
-
-      GNUNET_free (unique_name);
-    }
-    gtk_tree_path_free (tree_path);
-  }
-}
-
-
-void
-GNUNET_GTK_namespace_manager_namespace_details_type_text_edited_cb (
-    GtkCellRendererText *renderer, gchar *path, gchar *new_text,
-    gpointer user_data)
-{
-  /* Changing metadata type is more difficult than simply entering a
-   * new string, see publication editing dialog. So this is disabled
-   * for now. In fact, it's not going to be a Text renderer when it's done.
-   */
-  /*
-  struct GNUNET_GTK_NamespaceManagerContext *ctx = cls;
-  GtkTreeIter iter;
-  if (gtk_tree_model_get_iter (GTK_TREE_MODEL (ctx->ns_details_store),
-      &iter, path))
-  {
-    gtk_list_store_set (ctx->ns_details_store, &iter,
-        GNUNET_GTK_NAMESPACE_DETAILS_TYPE_COLUMN, new_text,
-        -1);
-  }
-  */
-}
-
-
-void
-GNUNET_GTK_namespace_manager_namespace_details_value_text_edited_cb (
-    GtkCellRendererText *renderer, gchar *path, gchar *new_text,
-    gpointer user_data)
-{
-  struct GNUNET_GTK_NamespaceManagerContext *ctx = user_data;
-  GtkTreePath *tree_path;
-  GtkTreeIter iter;
-  tree_path = gtk_tree_path_new_from_string (path);
-  if (tree_path != NULL)
-  {
-    if (gtk_tree_model_get_iter (GTK_TREE_MODEL (ctx->ns_details_store),
-        &iter, tree_path))
-    {
-      char *old_text;
-      gtk_tree_model_get (GTK_TREE_MODEL (ctx->ns_details_store), &iter,
-          GNUNET_GTK_NAMESPACE_DETAILS_VALUE_COLUMN, &old_text,
-          -1);
-      if (strcmp (old_text, new_text) != 0)
-      {
-        gtk_list_store_set (ctx->ns_details_store, &iter,
-            GNUNET_GTK_NAMESPACE_DETAILS_VALUE_COLUMN, new_text,
-            -1);
-        gtk_widget_set_sensitive (ctx->details_apply_button, TRUE);
-      }
-      g_free (old_text);
-    }
-    gtk_tree_path_free (tree_path);
-  }
-}
-
-
-/**
- * Iterator over all known pseudonyms.
- * Populate "known ns" and "ns order" lists.
- *
- * @param cls closure
- * @param pseudonym hash code of public key of pseudonym
- * @param md meta data known about the pseudonym
- * @param rating the local rating of the pseudonym
- * @return GNUNET_OK to continue iteration, GNUNET_SYSERR to abort
- */
-static int
-populate_known_ns_list (void *cls, 
-                       const struct GNUNET_CRYPTO_EccPublicKey *pseudonym,
-                       const char *name, const char *unique_name,
-                       const struct GNUNET_CONTAINER_MetaData *md, 
-                       int rating)
-{
-  struct GNUNET_GTK_NamespaceManagerContext *ctx = cls;
-  struct GNUNET_CRYPTO_EccPublicKey *nsid;
-  char buf[1024];
-  char *ret;
-  GtkTreeIter known_iter, order_iter;
-  struct GNUNET_CONTAINER_MetaData *md_copy;
-  char *non_null_name, *non_null_unique_name;
-
-  nsid = GNUNET_new (struct GNUNET_CRYPTO_EccPublicKey);
-  *nsid = *pseudonym;
-
-  ret = GNUNET_STRINGS_data_to_string (nsid,
-                                      sizeof (struct 
GNUNET_CRYPTO_EccPublicKey),
-                                      buf,
-                                      sizeof (buf));
-  GNUNET_assert (NULL != ret);
-  ret[0] = '\0';
-
-  GNUNET_FS_pseudonym_get_info (GNUNET_FS_GTK_get_configuration (),
-                             nsid, NULL, NULL, &non_null_name, NULL);
-  non_null_unique_name = GNUNET_FS_pseudonym_name_uniquify (
-      GNUNET_FS_GTK_get_configuration (), nsid, non_null_name, NULL);
-
-  md_copy = GNUNET_CONTAINER_meta_data_duplicate (md);
-
-  gtk_list_store_insert_with_values (ctx->known_ns_store, &known_iter, 
G_MAXINT,
-      GNUNET_GTK_KNOWN_NAMESPACES_IS_MINE_COLUMN, FALSE,
-      GNUNET_GTK_KNOWN_NAMESPACES_RANK_COLUMN, rating,
-      GNUNET_GTK_KNOWN_NAMESPACES_NAME_COLUMN, non_null_unique_name,
-      GNUNET_GTK_KNOWN_NAMESPACES_IDENTIFIER_COLUMN, buf,
-      GNUNET_GTK_KNOWN_NAMESPACES_IDENTIFIER_BIN_COLUMN, nsid,
-      GNUNET_GTK_KNOWN_NAMESPACES_ORDER_ROW_REFERENCE_COLUMN, NULL,
-      GNUNET_GTK_KNOWN_NAMESPACES_METADATA_COLUMN, md_copy,
-      GNUNET_GTK_KNOWN_NAMESPACES_NON_UNIQUE_NAME_COLUMN, non_null_name,
-      -1);
-
-  if (rating >= 0)
-  {
-    GtkTreeRowReference *rr = GNUNET_GTK_get_reference_from_iter 
(GTK_TREE_MODEL (
-        ctx->known_ns_store), &known_iter);
-    gtk_list_store_insert_with_values (ctx->ns_order_store, &order_iter, 
G_MAXINT,
-        GNUNET_GTK_NAMESPACE_ORDER_RANK_COLUMN, rating,
-        GNUNET_GTK_NAMESPACE_ORDER_NAME_COLUMN, non_null_unique_name,
-        GNUNET_GTK_NAMESPACE_ORDER_IDENTIFIER_COLUMN, buf,
-        GNUNET_GTK_NAMESPACE_ORDER_IDENTIFIER_BIN_COLUMN, nsid,
-        GNUNET_GTK_NAMESPACE_ORDER_KNOWN_ROW_REFERENCE_COLUMN, rr,
-        -1);
-    rr = GNUNET_GTK_get_reference_from_iter (GTK_TREE_MODEL 
(ctx->ns_order_store),
-        &order_iter);
-    gtk_list_store_set (ctx->known_ns_store, &known_iter,
-      GNUNET_GTK_KNOWN_NAMESPACES_ORDER_ROW_REFERENCE_COLUMN, rr, -1);
-  }
-  GNUNET_free (non_null_name);
-  GNUNET_free (non_null_unique_name);
-
-  return GNUNET_OK;
-}
-
-
-static void
-apply_known_ns_changes (struct GNUNET_GTK_NamespaceManagerContext *ctx)
-{
-  GtkTreeIter iter;
-  gint i;
-  gint row_count;
-  struct GNUNET_CRYPTO_EccPublicKey *nsid;
-  char *name;
-  int32_t rank;
-  struct GNUNET_CONTAINER_MetaData *md;
-
-  row_count = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (
-      ctx->known_ns_store), NULL);
-  if (! gtk_tree_model_get_iter_first (GTK_TREE_MODEL (
-      ctx->known_ns_store), &iter))
-    return;
-
-  for (i = 0; i < row_count; i++)
-  {
-    gtk_tree_model_get (GTK_TREE_MODEL (ctx->known_ns_store), &iter,
-        GNUNET_GTK_KNOWN_NAMESPACES_IDENTIFIER_BIN_COLUMN, &nsid,
-        GNUNET_GTK_KNOWN_NAMESPACES_NON_UNIQUE_NAME_COLUMN, &name,
-        GNUNET_GTK_KNOWN_NAMESPACES_METADATA_COLUMN, &md,
-        GNUNET_GTK_KNOWN_NAMESPACES_RANK_COLUMN, &rank,
-        -1);
-    GNUNET_FS_pseudonym_set_info (GNUNET_FS_GTK_get_configuration (),
-        nsid, name, md, rank);
-    g_free (name);
-    if (TRUE != gtk_tree_model_iter_next (GTK_TREE_MODEL (
-      ctx->known_ns_store), &iter))
-      break;
-  }
-#if FIXME_NAMESPACE_REMOVAL
-  while (NULL != ctx->deleted_namespaces)
-  {
-    nsid = ctx->deleted_namespaces->data;
-    if (nsid)
-    {
-      GNUNET_FS_pseudonym_remove (GNUNET_FS_GTK_get_configuration (), nsid);
-      GNUNET_free (nsid);
-    }
-    ctx->deleted_namespaces = g_list_delete_link (ctx->deleted_namespaces, 
ctx->deleted_namespaces);
-  }
-#endif
-}
-
-
-static void
-free_lists_contents (struct GNUNET_GTK_NamespaceManagerContext *ctx)
-{
-  GtkTreeIter iter;
-  gint i;
-  gint row_count;
-  struct GNUNET_CRYPTO_EccPublicKey *nsid;
-  GtkTreeRowReference *order_row;
-  struct GNUNET_CONTAINER_MetaData *md;
-
-  row_count = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (
-      ctx->known_ns_store), NULL);
-  if (! gtk_tree_model_get_iter_first (GTK_TREE_MODEL (
-      ctx->known_ns_store), &iter))
-    return;
-
-  for (i = 0; i < row_count; i++)
-  {
-    gtk_tree_model_get (GTK_TREE_MODEL (ctx->known_ns_store), &iter,
-        GNUNET_GTK_KNOWN_NAMESPACES_IDENTIFIER_BIN_COLUMN, &nsid,
-        GNUNET_GTK_KNOWN_NAMESPACES_ORDER_ROW_REFERENCE_COLUMN, &order_row,
-        GNUNET_GTK_KNOWN_NAMESPACES_METADATA_COLUMN, &md,
-        -1);
-    /* Make sure the store does not contain references to freed objects */
-    gtk_list_store_set (ctx->known_ns_store, &iter,
-        GNUNET_GTK_KNOWN_NAMESPACES_IDENTIFIER_BIN_COLUMN, NULL,
-        GNUNET_GTK_KNOWN_NAMESPACES_ORDER_ROW_REFERENCE_COLUMN, NULL,
-        GNUNET_GTK_KNOWN_NAMESPACES_METADATA_COLUMN, NULL,
-        -1);
-    if (order_row != NULL)
-    {
-      GtkTreeIter order_iter;
-      if (GNUNET_OK == GNUNET_GTK_get_iter_from_reference (order_row, 
&order_iter))
-      {
-        GtkTreeRowReference *known_row;
-        gtk_tree_model_get (GTK_TREE_MODEL (ctx->ns_order_store), &order_iter,
-            GNUNET_GTK_NAMESPACE_ORDER_KNOWN_ROW_REFERENCE_COLUMN, &known_row,
-            -1);
-        if (known_row != NULL)
-          gtk_tree_row_reference_free (known_row);
-      }
-      gtk_tree_row_reference_free (order_row);
-    }
-    GNUNET_CONTAINER_meta_data_destroy (md);
-    GNUNET_free (nsid);
-    if (TRUE != gtk_tree_model_iter_next (GTK_TREE_MODEL (
-      ctx->known_ns_store), &iter))
-      break;
-  }
-
-  gtk_list_store_clear (ctx->ns_order_store);
-  gtk_list_store_clear (ctx->known_ns_store);
-  gtk_list_store_clear (ctx->ns_details_store);
-  if (ctx->uneditable_md != NULL)
-    GNUNET_CONTAINER_meta_data_destroy (ctx->uneditable_md);
-}
-
-
-void
-GNUNET_GTK_namespace_manager_dialog_response_cb (GtkDialog *dialog,
-    gint response_id, gpointer user_data)
-{
-  struct GNUNET_GTK_NamespaceManagerContext *ctx = user_data;
-  switch (response_id)
-  {
-  case GTK_RESPONSE_APPLY:
-  case GTK_RESPONSE_OK:
-    apply_known_ns_changes (ctx);
-    GNUNET_GTK_main_window_refresh_ns_list (ctx->main_ctx);
-    break;
-  default:
-    break;
-  }
-  switch (response_id)
-  {
-  case GTK_RESPONSE_APPLY:
-    break;
-  case GTK_RESPONSE_OK:
-  case GTK_RESPONSE_CANCEL:
-  default:
-    free_lists_contents (ctx);
-    gtk_widget_destroy (GTK_WIDGET (ctx->namespace_manager));
-    GNUNET_free (ctx);
-  }
-}
-
-
-static gboolean
-mark_as_mine (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter,
-    gpointer data)
-{
-  const struct GNUNET_CRYPTO_EccPublicKey *mine_id = data;
-  const struct GNUNET_CRYPTO_EccPublicKey *ns_id;
-
-  gtk_tree_model_get (model, iter,
-      GNUNET_GTK_KNOWN_NAMESPACES_IDENTIFIER_BIN_COLUMN, &ns_id, -1);
-
-  if (memcmp (ns_id, mine_id, sizeof (struct GNUNET_CRYPTO_EccPublicKey)) != 0)
-    return FALSE;
-
-  gtk_list_store_set (GTK_LIST_STORE (model), iter,
-      GNUNET_GTK_KNOWN_NAMESPACES_IS_MINE_COLUMN, TRUE, -1);
-  return TRUE;
-}
-
-
-/**
- * Callback with information about local (!) namespaces.
- * Contains the names of the local namespace and the global
- * ID.
- *
- * @param cls closure
- * @param name human-readable identifier of the namespace
- * @param id hash identifier for the namespace
- */
-static void
-mark_namespaces_as_mine (void *cls, const char *name,
-                        const struct GNUNET_CRYPTO_EccPublicKey *id)
-{
-  struct GNUNET_GTK_NamespaceManagerContext *ctx = cls;
-
-  gtk_tree_model_foreach (GTK_TREE_MODEL (ctx->known_ns_store), mark_as_mine,
-      (gpointer) id);
-}
-
-
-/**
- * Type of a function that libextractor calls for each
- * meta data item found.
- *
- * @param cls closure (user-defined)
- * @param plugin_name name of the plugin that produced this value;
- *        special values can be used (i.e. '&lt;zlib&gt;' for zlib being
- *        used in the main libextractor library and yielding
- *        meta data).
- * @param type libextractor-type describing the meta data
- * @param format basic format information about data 
- * @param data_mime_type mime-type of data (not of the original file);
- *        can be NULL (if mime-type is not known)
- * @param data actual meta-data found
- * @param data_len number of bytes in data
- * @return 0 to continue extracting, 1 to abort
- */ 
-static int
-populate_details_list (void *cls, const char *plugin_name,
-    enum EXTRACTOR_MetaType type, enum EXTRACTOR_MetaFormat format,
-    const char *data_mime_type, const char *data, size_t data_len)
-{
-  struct GNUNET_GTK_NamespaceManagerContext *ctx = cls;
-  const char *type_name;
-  char *data_utf8;
-
-  if (format == EXTRACTOR_METAFORMAT_UTF8 ||
-      format == EXTRACTOR_METAFORMAT_C_STRING)
-  {
-    type_name = EXTRACTOR_metatype_to_string (type);
-    /* TODO: translate type_name using dgettext? */
-    data_utf8 = GNUNET_FS_GTK_dubious_meta_to_utf8 (format, data, data_len);
-    if (data != NULL)
-    {
-      gtk_list_store_insert_with_values (ctx->ns_details_store, NULL, G_MAXINT,
-          GNUNET_GTK_NAMESPACE_DETAILS_PLUGIN_NAME_COLUMN, plugin_name,
-          GNUNET_GTK_NAMESPACE_DETAILS_TYPE_BIN_COLUMN, type,
-          GNUNET_GTK_NAMESPACE_DETAILS_TYPE_COLUMN, type_name,
-          GNUNET_GTK_NAMESPACE_DETAILS_FORMAT_COLUMN,
-          EXTRACTOR_METAFORMAT_UTF8,
-          GNUNET_GTK_NAMESPACE_DETAILS_DATA_MIME_COLUMN, data_mime_type,
-          GNUNET_GTK_NAMESPACE_DETAILS_VALUE_COLUMN, data_utf8,
-          -1);
-      GNUNET_free (data_utf8);
-      return 0;
-    }
-  }
-  GNUNET_CONTAINER_meta_data_insert (ctx->uneditable_md,
-      plugin_name, type, format, data_mime_type, data, data_len);
-  return 0;
-}
-
-
-static void
-ns_details_selection_changed (GtkTreeSelection *treeselection,
-    gpointer user_data)
-{
-  struct GNUNET_GTK_NamespaceManagerContext *ctx = user_data;
-  GtkTreeIter iter;
-
-  if (FALSE == gtk_tree_selection_get_selected (ctx->ns_details_sel, NULL, 
&iter))
-  {
-    gtk_widget_set_sensitive (ctx->details_delete_button, FALSE);
-    return;
-  }
-
-  gtk_widget_set_sensitive (ctx->details_delete_button, TRUE);
-}
-
-
-static void
-known_ns_selection_changed (GtkTreeSelection *treeselection,
-    gpointer user_data)
-{
-  struct GNUNET_GTK_NamespaceManagerContext *ctx = user_data;
-  GtkTreeIter iter;
-  const struct GNUNET_CONTAINER_MetaData *md;
-
-  if (FALSE == gtk_tree_selection_get_selected (ctx->known_ns_sel, NULL, 
&iter))
-    return;
-
-  gtk_tree_model_get (GTK_TREE_MODEL (ctx->known_ns_store), &iter,
-      GNUNET_GTK_KNOWN_NAMESPACES_METADATA_COLUMN, &md,
-      -1);
-  if (ctx->uneditable_md != NULL)
-    GNUNET_CONTAINER_meta_data_clear (ctx->uneditable_md);
-  else
-    ctx->uneditable_md = GNUNET_CONTAINER_meta_data_create ();
-  gtk_list_store_clear (ctx->ns_details_store);
-  gtk_widget_set_sensitive (ctx->details_apply_button, FALSE);
-  if (NULL != md)
-    GNUNET_CONTAINER_meta_data_iterate ((const struct 
GNUNET_CONTAINER_MetaData *) md,
-        populate_details_list, ctx);
-  else
-    GNUNET_break (0);
-  gtk_widget_set_sensitive (ctx->details_apply_button, FALSE);
-}
-
-
-GtkWindow *
-GNUNET_GTK_namespace_manager_open (struct GNUNET_GTK_MainWindowContext 
*main_ctx)
-{
-  struct GNUNET_GTK_NamespaceManagerContext *ctx;
-
-  ctx = GNUNET_new (struct GNUNET_GTK_NamespaceManagerContext);
-  ctx->builder = GNUNET_GTK_get_new_builder 
("gnunet_fs_gtk_namespace_manager.glade", ctx);
-  if (ctx->builder == NULL)
-  {
-    GNUNET_break (0);
-    GNUNET_free (ctx);
-    return NULL;
-  }
-
-  ctx->main_ctx = main_ctx;
-
-  /* initialize widget references */
-  ctx->known_ns = GTK_WIDGET (gtk_builder_get_object (ctx->builder,
-      "GNUNET_GTK_namespace_manager_known_treeview"));
-  ctx->ns_order = GTK_WIDGET (gtk_builder_get_object (ctx->builder,
-      "GNUNET_GTK_namespace_manager_namespace_order_treeview"));
-  ctx->ns_details = GTK_WIDGET (gtk_builder_get_object (ctx->builder,
-      "GNUNET_GTK_namespace_manager_namespace_details_treeview"));
-  ctx->known_ns_sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (
-      ctx->known_ns));
-  ctx->ns_order_sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (
-      ctx->ns_order));
-  ctx->ns_details_sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (
-      ctx->ns_details));
-  ctx->ns_order_store = GTK_LIST_STORE (gtk_tree_view_get_model (
-      GTK_TREE_VIEW (ctx->ns_order)));
-  ctx->known_ns_store = GTK_LIST_STORE (gtk_tree_view_get_model (
-      GTK_TREE_VIEW (ctx->known_ns)));
-  ctx->ns_details_store = GTK_LIST_STORE (gtk_tree_view_get_model (
-      GTK_TREE_VIEW (ctx->ns_details)));
-  ctx->namespace_manager = GTK_WINDOW (gtk_builder_get_object (
-      ctx->builder, "GNUNET_GTK_namespace_manager_dialog"));
-  ctx->details_apply_button = GTK_WIDGET (gtk_builder_get_object (ctx->builder,
-      "GNUNET_GTK_namespace_manager_namespace_details_apply_button"));
-  ctx->details_delete_button = GTK_WIDGET (gtk_builder_get_object 
(ctx->builder,
-      "GNUNET_GTK_namespace_manager_namespace_details_delete_button"));
-  ctx->order_rank = gtk_tree_view_get_column (GTK_TREE_VIEW (ctx->ns_order), 
0);
-  ctx->order_name = gtk_tree_view_get_column (GTK_TREE_VIEW (ctx->ns_order), 
1);
-  ctx->order_id = gtk_tree_view_get_column (GTK_TREE_VIEW (ctx->ns_order), 2);
-
-  /* connect signals; FIXME-GTK3: these could be connected with (modern) Glade 
*/
-  g_signal_connect (G_OBJECT (ctx->known_ns_sel), "changed",
-      G_CALLBACK (known_ns_selection_changed), ctx);
-  g_signal_connect (G_OBJECT (ctx->ns_details_sel), "changed",
-      G_CALLBACK (ns_details_selection_changed), ctx);
-
-  /* populate namespace model */
-  (void) GNUNET_FS_pseudonym_list_all (GNUNET_FS_GTK_get_configuration (),
-      populate_known_ns_list, ctx);
-
-#if FIXME_USE_IDENTITY_SERVICE
-  /* mark our own namespaces as such */
-  GNUNET_FS_namespace_list (GNUNET_FS_GTK_get_fs_handle (),
-                           &mark_namespaces_as_mine, ctx);
-#endif
-
-  /* sort namespace order list by rank (initially) */
-  sort_order_list (ctx, GNUNET_GTK_NAMESPACE_ORDER_RANK_COLUMN);
-
-  gtk_widget_set_sensitive (ctx->details_apply_button, FALSE);
-
-  /* show dialog */
-  gtk_window_present (ctx->namespace_manager);
-  return ctx->namespace_manager;
-}
-
-
-static void
-ns_manager_deleted (GtkWindow *object, gpointer user_data)
-{
-  struct GNUNET_GTK_MainWindowContext *ctx = user_data;
-  g_signal_handler_disconnect (object, ctx->ns_manager_delete_handler_id);
-  g_object_unref (G_OBJECT (ctx->ns_manager));
-  ctx->ns_manager = NULL;
-  ctx->ns_manager_delete_handler_id = 0;
-  return;
-}
-
-
-void
-GNUNET_GTK_open_ns_manager (struct GNUNET_GTK_MainWindowContext *ctx)
-{
-  if (ctx->ns_manager != NULL)
-  {
-    gtk_window_present (ctx->ns_manager);
-    return;
-  }
-
-  ctx->ns_manager = GNUNET_GTK_namespace_manager_open (ctx);
-  if (ctx->ns_manager == NULL)
-    return;
-
-  g_object_ref (G_OBJECT (ctx->ns_manager));
-  ctx->ns_manager_delete_handler_id = g_signal_connect (G_OBJECT 
(ctx->ns_manager), "destroy", G_CALLBACK (ns_manager_deleted), ctx);
-}
-
-
-void
-GNUNET_GTK_main_menu_file_manage_pseudonyms_activate_cb (GtkMenuItem *menuitem,
-    gpointer user_data)
-{
-  GNUNET_GTK_open_ns_manager (user_data);
-}
-
-
-void
-namespace_selector_manage_namespaces_button_clicked_cb (GtkButton *button, 
gpointer user_data)
-{
-  GNUNET_GTK_open_ns_manager (user_data);
-}
-#endif
-
-/* end of gnunet-identity-gtk_namespace_manager.c */

Deleted: gnunet-gtk/src/identity/gnunet-identity-gtk_namespace_manager.h
===================================================================
--- gnunet-gtk/src/identity/gnunet-identity-gtk_namespace_manager.h     
2013-09-07 13:41:42 UTC (rev 29084)
+++ gnunet-gtk/src/identity/gnunet-identity-gtk_namespace_manager.h     
2013-09-07 13:45:11 UTC (rev 29085)
@@ -1,43 +0,0 @@
-/*
-     This file is part of GNUnet
-     (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 3, or (at your
-     option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-     You should have received a copy of the GNU General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
-*/
-
-/**
- * @file src/identity/gnunet-identity-gtk_namespace_manager.h
- * @author LRN
- * @author Christian Grothoff
- */
-
-#ifndef GNUNET_IDENTITY_GTK_NAMESPACE_MANAGER_H
-#define GNUNET_IDENTITY_GTK_NAMESPACE_MANAGER_H
-
-#include "gnunet_gtk.h"
-
-/**
- * Run the dialog for advertising a namespace.
- *
- * @param priv private key of the namespace to advertise
- */
-void
-GNUNET_IDENTITY_advertise_dialog_start_ (const struct 
GNUNET_CRYPTO_EccPrivateKey *priv);
-
-#endif 
-/* GNUNET_FS_GTK_NAMESPACE_MANAGER_H */
-
-/* end of gnunet-identity-gtk_namespace_manager.h */




reply via email to

[Prev in Thread] Current Thread [Next in Thread]