1 files changed, 174 insertions, 298 deletions

diff --git a/src/conversation/gnunet-conversation-gtk_contacts.c b/src/conversation/gnunet-conversation-gtk_contacts.c
index fec7dac1..aee03604 100644
--- a/src/conversation/gnunet-conversation-gtk_contacts.c
+++ b/src/conversation/gnunet-conversation-gtk_contacts.c
@@ -25,6 +25,26 @@
  * @author hark
  */
 #include "gnunet-conversation-gtk.h"
+#include "gnunet-conversation-gtk_contacts.h"
+#include "gnunet-conversation-gtk_egos.h"
+
+
+/**
+ * Columns in the #contacts_liststore.
+ */
+enum ContactsListstoreValues
+{
+  /**
+   * Human-readable name of the label in the zone.
+   */
+  CONTACTS_LS_NAME = 0,
+
+  /**
+   * Type of the label (as a 'const char *')
+   */
+  CONTACTS_LS_TYPE = 1
+};
+
 
 /**
  * Our ego.
@@ -37,11 +57,6 @@ static struct GNUNET_IDENTITY_Ego *contacts_ego;
 static GtkListStore *contacts_liststore;
 
 /**
- * list of zones
- */
-static GtkListStore *zone_liststore;
-
-/**
  * zone treeview
  */
 static GtkTreeView *zone_treeview;
@@ -61,18 +76,10 @@ static GtkTreeView *contacts_treeview;
  */
 static GtkTreeModel *contacts_treemodel;
 
-/*
- * List iterator for the 'list' operation.
- */
-static struct GNUNET_NAMESTORE_ZoneIterator *list_it;
-
-
-static struct GNUNET_IDENTITY_Ego *currentAddressBookEgo;
-
 /**
- * Handle to identity service.
+ * Monitor to view information in our current zone.
  */
-static struct GNUNET_IDENTITY_Handle *id;
+static struct GNUNET_NAMESTORE_ZoneMonitor *zone_mon;
 
 /**
  * Handle to the namestore.
@@ -100,136 +107,6 @@ static struct GNUNET_NAMESTORE_QueueEntry *add_qe;
 static struct GNUNET_NAMESTORE_QueueEntry *del_qe;
 
 
-////////////////////////////
-static void
-display_record (void *cls,
-                const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
-                const char *rname,
-                unsigned int rd_len,
-                const struct GNUNET_GNSRECORD_Data *rd)
-{
-  char *s;
-  char *type;
-  unsigned int i;
-  struct GNUNET_TIME_Absolute at;
-  struct GNUNET_TIME_Relative rt;
-  GtkTreeIter display_iter;
-
-
-  if (NULL == rname)
-  {
-
-    list_it = NULL;
-    //test_finished ();
-    return;
-  }
-
-  for (i = 0; i < rd_len; i++)
-  {
-
-    if ((GNUNET_GNSRECORD_TYPE_NICK == rd[i].record_type) &&
-        (0 != strcmp (rname, "+")))
-      continue;
-/*    typestring = GNUNET_GNSRECORD_number_to_typename (rd[i].record_type);*/
-    s = GNUNET_GNSRECORD_value_to_string (rd[i].record_type, rd[i].data,
-                                          rd[i].data_size);
-    if (NULL == s)
-    {
-      FPRINTF (stdout, _("\tCorrupt or unsupported record of type %u\n"),
-               (unsigned int) rd[i].record_type);
-      continue;
-    }
-    if (0 != (rd[i].flags & GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION))
-    {
-      rt.rel_value_us = rd[i].expiration_time;
-/*      ets = GNUNET_STRINGS_relative_time_to_string (rt, GNUNET_YES);*/
-    }
-    else
-    {
-      at.abs_value_us = rd[i].expiration_time;
-/*      ets = GNUNET_STRINGS_absolute_time_to_string (at);*/
-    }
-    if (rd[i].record_type == 65536)
-    {
-      type = "PKEY";
-    }                           // if pubkey record
-    if (rd[i].record_type == 65542)
-    {
-      type = "PHONE";
-    }
-//    FPRINTF (stdout, "%s", rname);
-    if (rd[i].record_type == 65536 || rd[i].record_type == 65542)
-    {
-      gtk_list_store_append (contacts_liststore, &display_iter);
-      gtk_list_store_set (contacts_liststore, &display_iter, 1, type, 0, rname, -1);
-    }
-
-/*        FPRINTF (stdout,
-                     "\t%s: %s (%s)\t%s\t%s\t%s\n",
-                  typestring,
-                    s,
-                  ets,
-                  (0 != (rd[i].flags & GNUNET_GNSRECORD_RF_PRIVATE)) ? "PRIVATE" : "PUBLIC",
-                  (0 != (rd[i].flags & GNUNET_GNSRECORD_RF_SHADOW_RECORD)) ? "SHADOW" : "",
-                  (0 != (rd[i].flags & GNUNET_GNSRECORD_RF_PENDING)) ? "PENDING" : "");
-*/
-    //gtk_widget_show(contacts_liststore);
-    GNUNET_free (s);
-  }
-//  FPRINTF (stdout, "%s", "\n");
-
-  GNUNET_NAMESTORE_zone_iterator_next (list_it);
-//  GNUNET_NAMESTORE_zone_iteration_stop(list_it);
-
-}
-
-
-
-/**
- * Function called by identity service with information about egos.
- *
- * @param cls NULL
- * @param ego ego handle
- * @param ctx unused
- * @param name name of the ego
- */
-static void
-identity_cb (void *cls,
-             struct GNUNET_IDENTITY_Ego *ego,
-             void **ctx,
-             const char *name)
-{
-/*
-  struct GNUNET_CRYPTO_EcdsaPublicKey pk;
-  char *s;
-*/
-  GtkTreeIter iter;
-
-  if (NULL != ego)
-  {
-/*
-  GNUNET_IDENTITY_ego_get_public_key (ego, &pk);
-  s = GNUNET_CRYPTO_ecdsa_public_key_to_string (&pk);
-*/
-  fprintf (stderr, "contacts idenity_cb: %s \n", name);
-
-
-  /* FIXME: this should be done in gnunet-conversation-gtk.c */
-  gtk_list_store_insert_with_values (zone_liststore,
-                                       &iter, -1,
-                                       0, name,
-                                       1, ego,
-                                       -1);
-
-  }
-
-  contacts_ego = ego;
-
-
-//  zone_pkey = *GNUNET_IDENTITY_ego_get_private_key (caller_id);
-  ns = GNUNET_NAMESTORE_connect (GCG_get_configuration ());
-}
-
 
 /**
  * Continuation called to notify client about result of the
@@ -242,7 +119,9 @@ identity_cb (void *cls,
  * @param emsg NULL on success, otherwise an error message
  */
 static void
-add_continuation (void *cls, int32_t success, const char *emsg)
+add_continuation (void *cls,
+                  int32_t success,
+                  const char *emsg)
 {
 
   struct GNUNET_NAMESTORE_QueueEntry **qe = cls;
@@ -273,7 +152,9 @@ add_continuation (void *cls, int32_t success, const char *emsg)
  * @param emsg NULL on success, otherwise an error message
  */
 static void
-del_continuation (void *cls, int32_t success, const char *emsg)
+del_continuation (void *cls,
+                  int32_t success,
+                  const char *emsg)
 {
   del_qe = NULL;
   if (GNUNET_NO == success)
@@ -292,6 +173,7 @@ del_continuation (void *cls, int32_t success, const char *emsg)
 
 /**
  * add a new contact
+ *
  * @param name
  * @param address
  */
@@ -299,29 +181,20 @@ static void
 add_contact (const gchar *name,
              const gchar *address)
 {
-//      memmove(&address+1,&address+51,1);
   GtkTreeIter iter;
   struct GNUNET_GNSRECORD_Data rd;
   struct GNUNET_GNSRECORD_Data *rde;
   static void *data;
   static size_t data_size;
   struct GNUNET_CRYPTO_EcdsaPublicKey pkey;
+  struct GNUNET_IDENTITY_Ego *ego;
 
-  struct GNUNET_IDENTITY_Ego *tempEgo;
-  char *tempName;
-  GtkTreeIter testIter;
-  gtk_combo_box_get_active_iter(GTK_COMBO_BOX (GCG_get_main_window_object  ("gnunet_conversation_gtk_contacts_zone_combobox")), &testIter);
-
-  gtk_tree_model_get (GTK_TREE_MODEL (zone_liststore),
-                      &testIter,
-                      0, &tempName,
-                      1, &tempEgo,
-                      -1);
-
-
-  GNUNET_CRYPTO_ecdsa_public_key_from_string (address, strlen (address), &pkey);
+  ego = GCG_EGOS_get_selected_ego ();
+  zone_pkey = *GNUNET_IDENTITY_ego_get_private_key (ego);
+  GNUNET_CRYPTO_ecdsa_public_key_from_string (address,
+                                              strlen (address),
+                                              &pkey);
   rde = &rd;
-  zone_pkey = *GNUNET_IDENTITY_ego_get_private_key (tempEgo);
   rd.data = &pkey;
   rd.data_size = sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey);
   rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY;
@@ -364,6 +237,7 @@ GNUNET_CONVERSATION_GTK_on_add_clicked (GtkButton * button,
   add_contact (gtk_entry_get_text (nameEntry),gtk_entry_get_text(addressEntry));
 }
 
+
 void
 GNUNET_CONVERSATION_GTK_on_remove_clicked (GtkButton * button,
                                            gpointer * user_data)
@@ -414,6 +288,9 @@ GNUNET_CONVERSATION_GTK_on_remove_clicked (GtkButton * button,
 }
 
 
+/**
+ * FIXME: what was clicked where?
+ */
 void
 GNUNET_CONVERSATION_GTK_on_current_clicked (GtkButton *button,
                                             gpointer *user_data)
@@ -427,198 +304,197 @@ GNUNET_CONVERSATION_GTK_on_current_clicked (GtkButton *button,
 }
 
 
-/*
- * row activated
+/**
+ * A row was activated in the contacts list. Initiate call.
+ *
  * @return void
  */
-
 void
 GNUNET_CONVERSATION_GTK_row_activated ()
 {
-  gchar *callAddress;
+  char *address;
   gchar *type;
-
-//  FPRINTF (stderr, "row activated \n");
-
   GtkTreeSelection *selection;
-
   GtkTreeIter iterA;
-
+  GtkEntry *address_entry;
 
   selection = gtk_tree_view_get_selection (contacts_treeview);
-
   gtk_tree_selection_get_selected (selection, &contacts_treemodel, &iterA);
-  gtk_tree_model_get (contacts_treemodel, &iterA, 0, &name, 1, &type, -1);
-//  g_print ("ego name %s\n", ego_name);
-//  g_print ("selected row is: %s\n", name);
-//  g_print ("selected rowtype is: %s\n", type);
-
-
-  g_print ("type @row active%s", type);
-  if (strcmp (type, "PKEY") == 0)
+  gtk_tree_model_get (contacts_treemodel,
+                      &iterA,
+                      CONTACTS_LS_NAME, &name,
+                      CONTACTS_LS_TYPE, &type,
+                      -1);
+  if (0 == strcmp (type, "PKEY"))
   {
-    GNUNET_asprintf (&callAddress, "call.%s.gnu", name);
+    GNUNET_asprintf (&address, "call.%s.gnu", name);
   }
-  if (strcmp (type, "PHONE") == 0)
+  else
   {
-    GNUNET_asprintf (&callAddress, "%s.gnu", name);
+    GNUNET_assert (0 == strcmp (type, "PHONE"));
+    GNUNET_asprintf (&address, "%s.gnu", name);
   }
-//   else { GNUNET_asprintf(&callAddress, "%s", peer_id);}
-
-  g_print ("ego name %s\n", callAddress);
-  GtkEntry *address_entry;
+  g_free (type);
 
-  address_entry = GTK_ENTRY ( GCG_get_main_window_object ("GNUNET_GTK_conversation_address"));
-  gtk_entry_set_text (address_entry, callAddress);
-  do_call (callAddress);
+  address_entry = GTK_ENTRY (GCG_get_main_window_object ("GNUNET_GTK_conversation_address"));
+  gtk_entry_set_text (address_entry,
+                      address);
+  do_call (address);
+  GNUNET_free (address);
 }
 
-/*
+
+/**
+ * Process a record that was stored or modified the namestore by
+ * adding/modifying/removing it in the liststore.
+ *
+ * @param cls closure
+ * @param zone private key of the zone; NULL on disconnect
+ * @param label label of the records; NULL on disconnect
+ * @param rd_count number of entries in @a rd array, 0 if label was deleted
+ * @param rd array of records with data to store
+ */
 static void
-print_ego (void *cls,
-           struct GNUNET_IDENTITY_Ego *ego,
-           void **ctx,
-           const char *identifier)
+display_record (void *cls,
+                const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
+                const char *rname,
+                unsigned int rd_len,
+                const struct GNUNET_GNSRECORD_Data *rd)
 {
-  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);
+  unsigned int i;
+  GtkTreeIter iter;
+  gboolean do_display;
+  const char *type;
+
+  if (NULL == zone_key)
+  {
+    /* disconnect, clear (and possibly freeze) view */
+    gtk_list_store_clear (contacts_liststore);
+    return;
+  }
+  do_display = FALSE;
+  for (i = 0; i < rd_len; i++)
+  {
+    switch (rd[i].record_type)
+    {
+    case GNUNET_GNSRECORD_TYPE_PKEY:
+      type = "PKEY";
+      do_display = TRUE;
+      break;
+    case GNUNET_GNSRECORD_TYPE_PHONE:
+      type = "PHONE";
+      do_display = TRUE;
+      break;
+    default:
+      /* ignore, not useful for conversation */
+      break;
+    }
+  }
+  /* FIXME: check if exists, if so, update or delete */
+
+
+  /* insert new record */
+  if (! do_display)
+    return;
+  gtk_list_store_append (contacts_liststore,
+                         &iter);
+  gtk_list_store_set (contacts_liststore,
+                      &iter,
+                      CONTACTS_LS_NAME, rname,
+                      CONTACTS_LS_TYPE, type,
+                      -1);
 }
-*/
-/*
+
+
+/**
+ * Function called once the monitor has caught up with the current
+ * state of the database.  Will be called AGAIN after each disconnect
+ * (record monitor called with 'NULL' for zone_key) once we're again
+ * in sync.
+ *
+ * Could be used to optimize visuals if we block GTK updates while the
+ * list is not in sync.
+ *
+ * @param cls closure
+ */
 static void
-setCurrentAddressbookEgo(void *cls, struct GNUNET_IDENTITY_Ego *ego)
+unfreeze_view (void *cls)
 {
-  currentAddressBookEgo = ego;
+  // tbd
 }
-*/
+
 
 /**
  * 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 widget combobox that was changed, unused
  * @param user_data builder, unused
  */
 void
 gnunet_conversation_gtk_contacts_zone_combobox_changed_cb (GtkComboBox *widget,
-                                               gpointer user_data)
+                                                           gpointer user_data)
 {
-  GtkTreeIter contacts_zone_iter;
-  struct GNUNET_IDENTITY_Ego *tempEgo;
-  char *tempName;
-  struct GNUNET_CRYPTO_EcdsaPrivateKey temp_zone_pkey;
-  //GtkTreeSelection *selection;
-  //GtkTreeIter iterA;
-
-
-  gtk_combo_box_get_active_iter(widget, &contacts_zone_iter);
-
-  gtk_tree_model_get (GTK_TREE_MODEL (zone_liststore),
-                      &contacts_zone_iter,
-                      0, &tempName,
-                      1, &tempEgo,
-                      -1);
-//  FPRINTF(stderr,"blat: %s\n", tempName);
-  temp_zone_pkey = *GNUNET_IDENTITY_ego_get_private_key (tempEgo);
-  gtk_list_store_clear(contacts_liststore);
-/*
-  GNUNET_IDENTITY_ego_lookup (cfg,
-                              tempName,
-                              setCurrentAddressbookEgo,
-                              NULL);
-*/
-  //selection = gtk_tree_view_get_selection (zone_treeview);
-
-  //gtk_tree_selection_get_selected (selection, &zone_treemodel, &iterA);
-
-  //gtk_tree_model_get_iter_first(zone_treemodel, &iterA);
-  //gtk_tree_model_get (zone_treemodel, &iterA, 0, &tempName, 1, &tempEgo, -1);
-
-
- list_it =
-    GNUNET_NAMESTORE_zone_iteration_start (ns, &temp_zone_pkey, &display_record,
-                                           NULL);
-
-//  GNUNET_IDENTITY_disconnect (id);
+  struct GNUNET_IDENTITY_Ego *ego;
+  const struct GNUNET_CRYPTO_EcdsaPrivateKey *temp_zone_pkey;
 
+  ego = GCG_EGOS_get_selected_ego ();
+  temp_zone_pkey = GNUNET_IDENTITY_ego_get_private_key (ego);
+  if (NULL != zone_mon)
+  {
+    GNUNET_NAMESTORE_zone_monitor_stop (zone_mon);
+    zone_mon = NULL;
+  }
+  gtk_list_store_clear (contacts_liststore);
+  zone_mon = GNUNET_NAMESTORE_zone_monitor_start (GCG_get_configuration (),
+                                                  temp_zone_pkey,
+                                                  GNUNET_YES,
+                                                  &display_record,
+                                                  &unfreeze_view,
+                                                  NULL);
 }
 
 
-
-//////
+/**
+ * Initialize the contact list
+ */
 void
-GNUNET_CONVERSATION_GTK_CONTACTS_init ()
+GCG_CONTACTS_init ()
 {
-  GtkTreeIter iterContactsInit;
-
-  // contacts
-  contacts_liststore =
-      GTK_LIST_STORE (GCG_get_main_window_object
+  contacts_liststore
+    = GTK_LIST_STORE (GCG_get_main_window_object
                       ("gnunet_conversation_gtk_contacts_liststore"));
-  contacts_treeview =
-      GTK_TREE_VIEW (GCG_get_main_window_object ("gnunet_conversation_gtk_treeview"));
-
-  // gtk_tree_view_set_activate_on_single_click (contacts_treeview, TRUE);
   contacts_treemodel = GTK_TREE_MODEL (contacts_liststore);
+  contacts_treeview
+    = GTK_TREE_VIEW (GCG_get_main_window_object ("gnunet_conversation_gtk_treeview"));
+  // gtk_tree_view_set_activate_on_single_click (contacts_treeview, TRUE);
 
-    // zone list
-  zone_liststore =
-     GTK_LIST_STORE (GCG_get_main_window_object ("gnunet_conversation_gtk_contacts_zone_liststore"));
-
-// zone_treestore =
-//      GTK_TREE_STORE (GCG_get_main_window_object ("gnunet_conversation_gtk_contacts_zone_treestore"));
-  zone_treemodel = GTK_TREE_MODEL (zone_liststore);
- zone_treeview =
-      GTK_TREE_VIEW (GCG_get_main_window_object ("gnunet_conversation_gtk_zone_treeview"));
-
-  gtk_tree_model_get_iter_first(zone_treemodel, &iterContactsInit);
-  gtk_tree_model_iter_next(zone_treemodel, &iterContactsInit);
-
-  gtk_combo_box_set_active_iter(GTK_COMBO_BOX (GCG_get_main_window_object ("gnunet_conversation_gtk_contacts_zone_combobox")), &iterContactsInit);
-
-  id = GNUNET_IDENTITY_connect (GCG_get_configuration (),
-                                &identity_cb,
-                                NULL);
-//  zone_pkey = *GNUNET_IDENTITY_ego_get_private_key (caller_id);
-//  gtk_combo_box_set_active(GTK_WIDGET (GCG_get_main_window_object ("gnunet_conversation_gtk_contacts_zone_combobox")), 1);
-//  gtk_combo_box_set_active(GTK_WIDGET (GCG_get_main_window_object (ml,"gnunet_conversation_gtk_outgoing_zone_combobox")), 1);
-
+  zone_treemodel
+    =  GTK_TREE_MODEL (GCG_get_main_window_object ("gnunet_conversation_gtk_contacts_zone_liststore"));
+  zone_treeview
+    = GTK_TREE_VIEW (GCG_get_main_window_object ("gnunet_conversation_gtk_zone_treeview"));
+  ns = GNUNET_NAMESTORE_connect (GCG_get_configuration ());
 }
 
 
+/**
+ * Shutdown the contact list
+ */
 void
-GNUNET_CONVERSATION_GTK_CONTACTS_shutdown()
+GCG_CONTACTS_shutdown ()
 {
-
-  if (NULL != id)
+  if (NULL != zone_mon)
   {
-    GNUNET_IDENTITY_disconnect (id);
-    id = NULL;
-  } else {
-      GNUNET_break(0);
-  }
-
-  if (NULL != list_it)
-  {
-  FPRINTF(stderr,"LIST_IT == NULL");
-//  GNUNET_NAMESTORE_zone_iteration_stop(list_it);
+    GNUNET_NAMESTORE_zone_monitor_stop (zone_mon);
+    zone_mon = NULL;
   }
   if (NULL != ns)
   {
     GNUNET_NAMESTORE_disconnect (ns);
     ns = NULL;
-  } else {
-     GNUNET_break(0);
   }
-
   GNUNET_CRYPTO_ecdsa_key_clear (&zone_pkey);
-
 }
 
-
-
+/* end of gnunet-conversation-gtk_contacts.c */