aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryids <yids@140774ce-b5e7-0310-ab8b-a85725594a96>2014-02-12 17:32:30 +0000
committeryids <yids@140774ce-b5e7-0310-ab8b-a85725594a96>2014-02-12 17:32:30 +0000
commit5338f04bc17192aa6f4c9cd9240fa38b7f3ed7ea (patch)
tree5b493843f7d8a15f3535f5a72bd92e152361580e
parentd64ef39e4f75dccc74b2c12e9e56277a379708f8 (diff)
downloadgnunet-gtk-5338f04bc17192aa6f4c9cd9240fa38b7f3ed7ea.tar.gz
gnunet-gtk-5338f04bc17192aa6f4c9cd9240fa38b7f3ed7ea.zip
- you can now select your identity for outgoing calls
-rw-r--r--src/conversation/gnunet-conversation-gtk.c35
1 files changed, 30 insertions, 5 deletions
diff --git a/src/conversation/gnunet-conversation-gtk.c b/src/conversation/gnunet-conversation-gtk.c
index d5af1bea..a6b85374 100644
--- a/src/conversation/gnunet-conversation-gtk.c
+++ b/src/conversation/gnunet-conversation-gtk.c
@@ -1163,8 +1163,7 @@ identity_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego, void **ctx,
1163 1, ego, 1163 1, ego,
1164 -1); 1164 -1);
1165 } 1165 }
1166 1166
1167
1168 if (NULL == name) 1167 if (NULL == name)
1169 return; 1168 return;
1170 if (ego == caller_id) 1169 if (ego == caller_id)
@@ -1193,9 +1192,6 @@ identity_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego, void **ctx,
1193 GNUNET_NAMESTORE_zone_iteration_start (ns, &zone_pkey, &display_record, 1192 GNUNET_NAMESTORE_zone_iteration_start (ns, &zone_pkey, &display_record,
1194 NULL); 1193 NULL);
1195 1194
1196
1197 start_phone ();
1198
1199} 1195}
1200 1196
1201/** 1197/**
@@ -1908,6 +1904,35 @@ gnunet_conversation_gtk_contacts_zone_combobox_changed_cb (GtkComboBox *widget,
1908 1904
1909} 1905}
1910 1906
1907void
1908gnunet_conversation_gtk_outgoing_zone_combobox_changed_cb (GtkComboBox *widget,
1909 gpointer user_data)
1910{
1911 GtkTreeIter contacts_zone_iter;
1912 struct GNUNET_IDENTITY_Ego *tempEgo;
1913 char *tempName;
1914 struct GNUNET_CRYPTO_EcdsaPrivateKey temp_zone_pkey;
1915 GtkTreeSelection *selection;
1916 GtkTreeIter iterA;
1917
1918
1919 gtk_combo_box_get_active_iter(widget, &contacts_zone_iter);
1920
1921 gtk_tree_model_get (GTK_TREE_MODEL (zone_liststore),
1922 &contacts_zone_iter,
1923 0, &tempName,
1924 1, &tempEgo,
1925 -1);
1926 FPRINTF(stderr,"outgoing ego: %s\n", tempName);
1927 caller_id = tempEgo;
1928 if ( NULL != phone)
1929 {
1930 GNUNET_CONVERSATION_phone_destroy (phone);
1931 phone == NULL;
1932 }
1933 start_phone();
1934}
1935
1911/* 1936/*
1912 * @brief print info for currently selected call 1937 * @brief print info for currently selected call
1913 */ 1938 */