1 files changed, 118 insertions, 100 deletions

diff --git a/src/conversation/gnunet-conversation-gtk.h b/src/conversation/gnunet-conversation-gtk.h
index e4e007e0..665d4614 100644
--- a/src/conversation/gnunet-conversation-gtk.h
+++ b/src/conversation/gnunet-conversation-gtk.h
@@ -316,7 +316,7 @@ static GtkTreeView *active_treeview;
 
 
 /**
- * List of all known zones/egos.
+ * List of contacts (records).
  */
 static GtkListStore *contacts_liststore;
 
@@ -358,6 +358,26 @@ static GtkTreeView *history_treeview;
 static GtkTreeModel *history_treemodel;
 
 
+/**
+ * list of zones
+ */
+static GtkListStore *zone_liststore;
+
+/**
+ * zone treestore
+ */
+static GtkTreeStore *zone_treestore;
+
+/**
+ * zone treeview
+ */
+static GtkTreeView *zone_treeview;
+
+/**
+ * zone tree model
+ */
+static GtkTreeModel *zone_treemodel;
+
 /**                      
  * Current state of iterating elements for the client.
  * NULL if we are not currently iterating.
@@ -394,109 +414,107 @@ static int ret;
 */
 GtkDialog *dialog;
 
-
-
 /**
  * Context for edit operations and environment for plugins.
  * Typical plugins will only use the @e check_validity callback.
  */
-//struct GNUNET_GTK_NAMESTORE_PluginEnvironment
-//{
-//
-//  /**
-//   * Function that should be called by the plugin whenever values in
-//   * the dialog were edited.  It will check the validity of the dialog
-//   * and update the "save" button accordingly.
-//   */
-//  void (*check_validity)(struct GNUNET_GTK_NAMESTORE_PluginEnvironment *edc);
-//
-//  /**
-//   * Builder for the dialog.
-//   */
-//  GtkBuilder *builder;
-//
-//  /**
-//   * Main dialog window.
-//   */
-//  GtkDialog *dialog;
-//
-//  /**
-//   * Where in the tree view are we editing?
-//   */
-//  struct RecordInfo *ri;
-//
-//  /**
-//   * Name of the record.
-//   */
-//  gchar *name;
-//
-//  /**
-//   * Value of the record in string format.
-//   */
-//  gchar *n_value;
-//
-//  /**
-//   * Name of the zone into which the record should be placed.
-//   */
-//  gchar *new_zone_option;
-//
-//  /**
-//   * Ego of the zone into which the record should be placed.
-//   */
-//  struct GNUNET_IDENTITY_Ego *ego;
-//
-//  /**
-//   * List of all zones.
-//   */
-//  GtkListStore *zone_liststore;
-//
-//  /**
-//   * The plugin we used to edit the value.
-//   */
-//  struct GNUNET_GTK_NAMESTORE_PluginFunctions *plugin;
-//
-//  /**
-//   * Name of the plugin library.
-//   */
-//  char *liblow;
-//
-//  /**
-//   * Expiration time value (absolute or relative).
-//   */
-//  guint64 n_exp_time;
-//
-//  /**
-//   * Offset of the record we are editing in the 'rd' list of 'ri'.
-//   */
-//  unsigned int off;
-//
-//  /**
-//   * Flag indicating if the old record was in the namestore.
-//   */
-//  int old_record_in_namestore;
-//
-//  /**
-//   * Type of the record.
-//   */
-//  uint32_t record_type;
-//
-//  /**
-//   * Is this record 'public'?
-//   */
-//  gboolean n_public;
-//
-//  /**
-//   * Is the expiration time relative?
-//   */
-//  gboolean n_is_relative;
-//
-//  /**
-//   * Is this record a shadow record?
-//   */
-//  gboolean n_is_shadow;
-//
-//};
-//
+struct GNUNET_GTK_NAMESTORE_PluginEnvironment
+{
+
+  /**
+   * Function that should be called by the plugin whenever values in
+   * the dialog were edited.  It will check the validity of the dialog
+   * and update the "save" button accordingly.
+   */
+  void (*check_validity)(struct GNUNET_GTK_NAMESTORE_PluginEnvironment *edc);
+
+  /**
+   * Builder for the dialog.
+   */
+  GtkBuilder *builder;
+
+  /**
+   * Main dialog window.
+   */
+  GtkDialog *dialog;
+
+  /**
+   * Where in the tree view are we editing?
+   */
+  struct RecordInfo *ri;
+
+  /**
+   * Name of the record.
+   */
+  gchar *name;
+
+  /**
+   * Value of the record in string format.
+   */
+  gchar *n_value;
+
+  /**
+   * Name of the zone into which the record should be placed.
+   */
+  gchar *new_zone_option;
+
+  /**
+   * Ego of the zone into which the record should be placed.
+   */
+  struct GNUNET_IDENTITY_Ego *ego;
+
+  /**
+   * List of all zones.
+   */
+  GtkListStore *zone_liststore;
+
+  /**
+   * The plugin we used to edit the value.
+   */
+  struct GNUNET_GTK_NAMESTORE_PluginFunctions *plugin;
+
+  /**
+   * Name of the plugin library.
+   */
+  char *liblow;
+
+  /**
+   * Expiration time value (absolute or relative).
+   */
+  guint64 n_exp_time;
+
+  /**
+   * Offset of the record we are editing in the 'rd' list of 'ri'.
+   */
+  unsigned int off;
+
+  /**
+   * Flag indicating if the old record was in the namestore.
+   */
+  int old_record_in_namestore;
+
+  /**
+   * Type of the record.
+   */
+  uint32_t record_type;
+
+  /**
+   * Is this record 'public'?
+   */
+  gboolean n_public;
+
+  /**
+   * Is the expiration time relative?
+   */
+  gboolean n_is_relative;
+
+  /**
+   * Is this record a shadow record?
+   */
+  gboolean n_is_shadow;
+
+};
+
 
 
 #endif