1 files changed, 50 insertions, 23 deletions

diff --git a/src/conversation/gnunet-conversation-gtk_egos.c b/src/conversation/gnunet-conversation-gtk_egos.c
index 29aa3501..5136a938 100644
--- a/src/conversation/gnunet-conversation-gtk_egos.c
+++ b/src/conversation/gnunet-conversation-gtk_egos.c
@@ -20,7 +20,7 @@
 
 /**
  * @file src/conversation/gnunet-conversation-gtk_egos.c
- * @brief
+ * @brief Manages the list of egos for selecting our caller-ID
  * @author yids
  * @author hark
  * @author Christian Grothoff
@@ -30,19 +30,19 @@
 
 
 /**
- * Columns in the #zone_liststore.
+ * Columns in the #ego_liststore.
  */
-enum ZoneListstoreValues
+enum EgoListstoreValues
 {
   /**
    * Human-readable name of the ego.
    */
-  ZONE_LS_NAME = 0,
+  EGO_LS_NAME = 0,
 
   /**
    * Handel to the ego (of type `struct GNUNET_IDENTITY_Ego *ego`).
    */
-  ZONE_LS_EGO = 1
+  EGO_LS_EGO = 1
 };
 
 
@@ -52,10 +52,14 @@ enum ZoneListstoreValues
 static struct GNUNET_IDENTITY_Handle *id;
 
 /**
- * list of zones
+ * list of egos
  */
-static GtkListStore *zone_liststore;
+static GtkListStore *ego_liststore;
 
+/**
+ * Default ego to pre-select.
+ */
+static char *default_ego;
 
 /**
  * Obtain the currently selected ego.
@@ -63,18 +67,19 @@ static GtkListStore *zone_liststore;
  * @return NULL if no ego is selected
  */
 struct GNUNET_IDENTITY_Ego *
-GCG_EGOS_get_selected_ego (void)
+GCG_EGOS_get_selected_ego ()
 {
   struct GNUNET_IDENTITY_Ego *ego;
   GtkTreeIter iter;
   GtkComboBox *cb;
 
-  cb = GTK_COMBO_BOX (GCG_get_main_window_object  ("gnunet_conversation_gtk_contacts_zone_combobox"));
+  cb = GTK_COMBO_BOX (GCG_get_main_window_object
+                      ("gnunet_conversation_gtk_ego_combobox"));
   gtk_combo_box_get_active_iter (cb,
                                  &iter);
-  gtk_tree_model_get (GTK_TREE_MODEL (zone_liststore),
+  gtk_tree_model_get (GTK_TREE_MODEL (ego_liststore),
                       &iter,
-                      ZONE_LS_EGO, &ego,
+                      EGO_LS_EGO, &ego,
                       -1);
   return ego;
 }
@@ -97,20 +102,33 @@ identity_cb (void *cls,
   GtkTreeIter iter;
   GtkTreeRowReference *rr;
   GtkTreePath *path;
+  GtkComboBox *cb;
 
   rr = *ctx;
   if (NULL == rr)
   {
     /* new identity */
     GNUNET_assert (NULL != name);
-    gtk_list_store_insert_with_values (zone_liststore,
+    gtk_list_store_insert_with_values (ego_liststore,
                                        &iter, -1,
-                                       ZONE_LS_NAME, name,
-                                       ZONE_LS_EGO, ego,
+                                       EGO_LS_NAME, name,
+                                       EGO_LS_EGO, ego,
                                        -1);
-    path = gtk_tree_model_get_path (GTK_TREE_MODEL (zone_liststore),
+    if ( (NULL != default_ego) &&
+         (0 == strcmp (name,
+                       default_ego)) )
+    {
+      /* found the ego that we were supposed to use by default, select
+         it! */
+      GNUNET_free (default_ego);
+      default_ego = NULL;
+      cb = GTK_COMBO_BOX (GCG_get_main_window_object
+                          ("gnunet_conversation_gtk_ego_combobox"));
+      gtk_combo_box_set_active_iter (cb, &iter);
+    }
+    path = gtk_tree_model_get_path (GTK_TREE_MODEL (ego_liststore),
                                     &iter);
-    rr = gtk_tree_row_reference_new (GTK_TREE_MODEL (zone_liststore),
+    rr = gtk_tree_row_reference_new (GTK_TREE_MODEL (ego_liststore),
                                      path);
     gtk_tree_path_free (path);
     *ctx = rr;
@@ -118,7 +136,7 @@ identity_cb (void *cls,
   }
   /* existing ego, locate and execute rename/delete */
   path = gtk_tree_row_reference_get_path (rr);
-  gtk_tree_model_get_iter (GTK_TREE_MODEL (zone_liststore),
+  gtk_tree_model_get_iter (GTK_TREE_MODEL (ego_liststore),
                            &iter,
                            path);
   gtk_tree_path_free (path);
@@ -127,26 +145,30 @@ identity_cb (void *cls,
     /* deletion operation */
     gtk_tree_row_reference_free (rr);
     *ctx = NULL;
-    gtk_list_store_remove (zone_liststore,
+    gtk_list_store_remove (ego_liststore,
                            &iter);
     return;
   }
   /* rename operation */
-  gtk_list_store_set (zone_liststore,
+  gtk_list_store_set (ego_liststore,
                       &iter,
-                      ZONE_LS_NAME, &name,
+                      EGO_LS_NAME, &name,
                       -1);
 }
 
 
 /**
  * Initialize the ego list
+ *
+ * @param ego_name default ego to pre-select
  */
 void
-GCG_EGOS_init ()
+GCG_EGOS_init (const char *ego_name)
 {
-  zone_liststore
-    =  GTK_LIST_STORE (GCG_get_main_window_object ("gnunet_conversation_gtk_contacts_zone_liststore"));
+  default_ego = GNUNET_strdup (ego_name);
+  ego_liststore
+    =  GTK_LIST_STORE (GCG_get_main_window_object
+                       ("gnunet_conversation_gtk_ego_liststore"));
   id = GNUNET_IDENTITY_connect (GCG_get_configuration (),
                                 &identity_cb,
                                 NULL);
@@ -164,6 +186,11 @@ GCG_EGOS_shutdown ()
     GNUNET_IDENTITY_disconnect (id);
     id = NULL;
   }
+  if (NULL != default_ego)
+  {
+    GNUNET_free (default_ego);
+    default_ego = NULL;
+  }
 }
 
 /* end of gnunet-conversation-gtk_egos.c */