1 files changed, 82 insertions, 27 deletions

diff --git a/src/conversation/gnunet-conversation-gtk.c b/src/conversation/gnunet-conversation-gtk.c
index a475a964..fd19f33d 100644
--- a/src/conversation/gnunet-conversation-gtk.c
+++ b/src/conversation/gnunet-conversation-gtk.c
@@ -891,7 +891,7 @@ display_record (void *cls, const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
       type = "PHONE";
     }
 //    FPRINTF (stdout, "%s", rname);
-    if (rd[i].record_type == 65536 || rd[i].record_type == 65536)
+    if (rd[i].record_type == 65536 || rd[i].record_type == 65542)
     {
       gtk_list_store_append (contacts_liststore, &iter);
       gtk_list_store_set (contacts_liststore, &iter, 1, type, 0, rname, -1);
@@ -981,9 +981,19 @@ static void
 identity_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego, void **ctx,
              const char *name)
 {
-
-//  FPRINTF (stderr, _("identity_cb name: `%s'  caller_id: `%s' \n"), name,
-//           caller_id);
+  struct GNUNET_CRYPTO_EcdsaPublicKey pk;
+  char *s;
+
+  if (NULL != ego) 
+  { 
+  GNUNET_IDENTITY_ego_get_public_key (ego, &pk);
+  s = GNUNET_CRYPTO_ecdsa_public_key_to_string (&pk);
+  fprintf (stdout, "%s \n", name);
+  gtk_list_store_insert_with_values (zone_liststore,
+                                       &iter, -1,
+                                       0, name,
+                                       -1); 
+  }
 
   if (NULL == name)
     return;
@@ -1172,6 +1182,15 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
       GTK_TREE_STORE (get_object ("gnunet_conversation_gtk_history_treestore"));
   history_treemodel = GTK_TREE_MODEL (history_treestore);
 
+  // zone list
+  zone_liststore =
+     GTK_LIST_STORE (get_object ("gnunet_conversation_gtk_zone_liststore"));
+  zone_treeview =
+      GTK_TREE_VIEW (get_object ("gnunet_conversation_gtk_zone_treeview"));
+  zone_treestore =
+      GTK_TREE_STORE (get_object ("gnunet_conversation_gtk_zone_treestore"));
+  zone_treemodel = GTK_TREE_MODEL (zone_treestore);
+
   //gtk_tree_view_set_activate_on_single_click(contacts_treeview, TRUE);
 
   GNUNET_assert (NULL != contacts_liststore);
@@ -1626,21 +1645,37 @@ set_status_icon (const char *icon_name)
   GNUNET_GTK_tray_icon_change (icon_name, "gnunet-conversation-gtk-status");
 }
 
+static void
+print_ego (void *cls,
+           struct GNUNET_IDENTITY_Ego *ego,
+           void **ctx,
+           const char *identifier)
+{
+  struct GNUNET_CRYPTO_EcdsaPublicKey pk;
+  char *s;
+  GNUNET_IDENTITY_ego_get_public_key (ego, &pk);
+  s = GNUNET_CRYPTO_ecdsa_public_key_to_string (&pk);
+  fprintf (stdout, "%s \n", identifier);
+//  GNUNET_free (s);
+}
+
 
 /* end of gnunet-conversation-gtk.c */
 void
 GNUNET_contact_test ()
 {
-
+/*
   history_add (0, "test");
   history_add (1, "test");
   history_add (2, "test");
   history_add (3, "test");
   history_add (4, "test");
-
-  GtkTreeIter iter;
-  char *caller_id = "testje";
-  int  caller_num = 10; 
+//  struct GNUNET_GTK_NAMESTORE_PluginEnvironment *edc;
+//  edc = GNUNET_new (struct GNUNET_GTK_NAMESTORE_PluginEnvironment); 
+*/
+//  GtkTreeIter iter;
+//  char *caller_id = "testje";
+//  int  caller_num = 10; 
 
  /*
  * active_liststore:
@@ -1648,32 +1683,52 @@ GNUNET_contact_test ()
  * 1: pointer caller
  * 2: gint caller_num
  */
-
+/*
   gtk_list_store_append (active_liststore, &iter);
 
   gtk_list_store_set (active_liststore, &iter, 2, caller_num, 0, caller_id, -1);
 
-
+  gtk_list_store_insert_with_values (zone_liststore,
+                                       &iter, -1,
+                                       0, "test",
+                                       -1);
+*/ 
+//  static struct GNUNET_IDENTITY_Handle *sh;  
+//  GNUNET_IDENTITY_disconnect (id);
+//  &print_ego;
+  //sh = GNUNET_IDENTITY_connect (cfg, &print_ego, NULL); 
 
 }
 
+/**
+ * A different zone was selected in the zone toggle bar.  Load the
+ * appropriate zone.
+ *
+ * @param widget button that was toggled (could be to "on" or "off", we only react to "on")
+ * @param user_data builder, unused
+ */
 void
-test_button_clicked()
+gnunet_conversation_gtk_zone_combobox_changed_cb (GtkComboBox *widget,
+                                               gpointer user_data)
 {
-  FPRINTF(stderr,"testbt click \n");
-    GtkTreeIter iter;
-  char *caller_id = "testje";
-  int  caller_num = 10;
-
- /*
- * active_liststore:
- * 0: *gchar caller_id
- * 1: pointer caller
- * 2: gint caller_num
- */
-
-  gtk_list_store_append (active_liststore, &iter);
+  GtkTreeIter iter;
+  struct GNUNET_IDENTITY_Ego *ego;
+ // char *name;
+
+//  if (! gtk_combo_box_get_active_iter (widget,
+//                                       &iter))
+//  {
+//    load_zone (NULL, NULL);
+//    return;
+//  }
+  gtk_tree_model_get (zone_liststore,
+                      &iter,
+                      0, name,
+                      -1);
+  GNUNET_IDENTITY_disconnect (id);
+//  ego_name = name;
+  id = GNUNET_IDENTITY_connect (cfg, &identity_cb, NULL);
+//  load_zone (name, ego);
+}
 
-  gtk_list_store_set (active_liststore, &iter, 2, caller_num, 0, caller_id, -1);
 
-}