fix conversation FTBFS and other minor stuff

1 files changed, 12 insertions, 9 deletions

diff --git a/src/conversation/gnunet-conversation-gtk_egos.c b/src/conversation/gnunet-conversation-gtk_egos.c
index 0324ffb7..716d7cdf 100644
--- a/src/conversation/gnunet-conversation-gtk_egos.c
+++ b/src/conversation/gnunet-conversation-gtk_egos.c
@@ -102,6 +102,7 @@ identity_cb (void *cls,
              const char *name)
 {
   GtkTreeIter iter;
+  GtkTreeIter iter2;
   GtkTreeRowReference *rr;
   GtkTreePath *path;
   GtkComboBox *cb;
@@ -121,17 +122,18 @@ identity_cb (void *cls,
                                        EGO_LS_NAME, name,
                                        EGO_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_ego_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_ego_combobox"));
-      gtk_combo_box_set_active_iter (cb, &iter);
+      gtk_combo_box_set_active_iter (cb,
+                                     &iter);
     }
     path = gtk_tree_model_get_path (GTK_TREE_MODEL (ego_liststore),
                                     &iter);
@@ -213,7 +215,8 @@ gnunet_conversation_gtk_ego_copy_button_clicked_cb (GtkButton *button,
 void
 GCG_EGOS_init (const char *ego_name)
 {
-  default_ego = GNUNET_strdup (ego_name);
+  if (NULL != ego_name)
+    default_ego = GNUNET_strdup (ego_name);
   ego_liststore
     =  GTK_LIST_STORE (GCG_get_main_window_object
                        ("gnunet_conversation_gtk_ego_liststore"));