1 files changed, 21 insertions, 13 deletions

diff --git a/src/conversation/gnunet-conversation-gtk_zones.c b/src/conversation/gnunet-conversation-gtk_zones.c
index d0e824f0..bfb8d2e6 100644
--- a/src/conversation/gnunet-conversation-gtk_zones.c
+++ b/src/conversation/gnunet-conversation-gtk_zones.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     Copyright (C) 2013-2014 GNUnet e.V.
+     Copyright (C) 2013-2014, 2018 GNUnet e.V.
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -66,10 +66,11 @@ static char *default_ego;
 /**
  * Obtain the currently selected zone.
  *
+ * @param name[out] set to the name of the ego
  * @return NULL if no ego is selected
  */
 struct GNUNET_IDENTITY_Ego *
-GCG_ZONES_get_selected_zone ()
+GCG_ZONES_get_selected_zone (const char **name)
 {
   struct GNUNET_IDENTITY_Ego *ego;
   GtkTreeIter iter;
@@ -79,10 +80,14 @@ GCG_ZONES_get_selected_zone ()
                       ("gnunet_conversation_gtk_contacts_zone_combobox"));
   if (! gtk_combo_box_get_active_iter (cb,
                                        &iter))
+  {
+    *name = NULL;
     return NULL;
+  }
   gtk_tree_model_get (GTK_TREE_MODEL (zone_liststore),
                       &iter,
                       ZONE_LS_EGO, &ego,
+                      ZONE_LS_NAME, name,
                       -1);
   return ego;
 }
@@ -103,6 +108,7 @@ identity_cb (void *cls,
              const char *name)
 {
   GtkTreeIter iter;
+  GtkTreeIter iter2;
   GtkTreeRowReference *rr;
   GtkTreePath *path;
   GtkComboBox *cb;
@@ -122,17 +128,18 @@ identity_cb (void *cls,
                                        ZONE_LS_NAME, name,
                                        ZONE_LS_EGO, ego,
                                        -1);
-    if ( (NULL != default_ego) &&
-         (0 == strcmp (name,
-                       default_ego)) )
+    cb = GTK_COMBO_BOX (GCG_get_main_window_object
+                        ("gnunet_conversation_gtk_contacts_zone_combobox"));
+    if ( (! gtk_combo_box_get_active_iter (cb,
+                                           &iter2)) &&
+         ( (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_contacts_zone_combobox"));
-      gtk_combo_box_set_active_iter (cb, &iter);
+      /* found an ego (or the ego) that we were supposed to use by
+         default, select it! */
+      gtk_combo_box_set_active_iter (cb,
+                                     &iter);
     }
     path = gtk_tree_model_get_path (GTK_TREE_MODEL (zone_liststore),
                                     &iter);
@@ -173,7 +180,8 @@ identity_cb (void *cls,
 void
 GCG_ZONES_init (const char *ego_name)
 {
-  default_ego = GNUNET_strdup (ego_name);
+  if (NULL != ego_name)
+    default_ego = GNUNET_strdup (ego_name);
   zone_liststore
     =  GTK_LIST_STORE (GCG_get_main_window_object
                        ("gnunet_conversation_gtk_contacts_zone_liststore"));