diff options
author | yids <yids@140774ce-b5e7-0310-ab8b-a85725594a96> | 2014-02-12 20:20:59 +0000 |
---|---|---|
committer | yids <yids@140774ce-b5e7-0310-ab8b-a85725594a96> | 2014-02-12 20:20:59 +0000 |
commit | 90f695a72ae0e5ae495dbf78bd03baa932b945e0 (patch) | |
tree | c34ba8879aec4f55a6fc030e00043bf58de1926f | |
parent | 5338f04bc17192aa6f4c9cd9240fa38b7f3ed7ea (diff) | |
download | gnunet-gtk-90f695a72ae0e5ae495dbf78bd03baa932b945e0.tar.gz gnunet-gtk-90f695a72ae0e5ae495dbf78bd03baa932b945e0.zip |
- forgot to add glade file
- starts phone with default ego
-rw-r--r-- | contrib/gnunet_conversation_gtk_main_window.glade | 6 | ||||
-rw-r--r-- | src/conversation/gnunet-conversation-gtk.c | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/contrib/gnunet_conversation_gtk_main_window.glade b/contrib/gnunet_conversation_gtk_main_window.glade index f60f391e..7b6f62d8 100644 --- a/contrib/gnunet_conversation_gtk_main_window.glade +++ b/contrib/gnunet_conversation_gtk_main_window.glade | |||
@@ -236,7 +236,8 @@ | |||
236 | <object class="GtkComboBox" id="gnunet_conversation_gtk_outgoing_zone_combobox"> | 236 | <object class="GtkComboBox" id="gnunet_conversation_gtk_outgoing_zone_combobox"> |
237 | <property name="visible">True</property> | 237 | <property name="visible">True</property> |
238 | <property name="can_focus">False</property> | 238 | <property name="can_focus">False</property> |
239 | <property name="model">gnunet_conversation_gtk_outgoing_zone_liststore</property> | 239 | <property name="model">gnunet_conversation_gtk_contacts_zone_liststore</property> |
240 | <signal name="changed" handler="gnunet_conversation_gtk_outgoing_zone_combobox_changed_cb" swapped="no"/> | ||
240 | <child> | 241 | <child> |
241 | <object class="GtkCellRendererText" id="gnunet_conversation_gtk_outgoing_zone_ego_name_cellrenderertext"/> | 242 | <object class="GtkCellRendererText" id="gnunet_conversation_gtk_outgoing_zone_ego_name_cellrenderertext"/> |
242 | <attributes> | 243 | <attributes> |
@@ -387,12 +388,13 @@ | |||
387 | </child> | 388 | </child> |
388 | <child> | 389 | <child> |
389 | <object class="GtkButton" id="GNUNET_GTK_conversation_use_current_button"> | 390 | <object class="GtkButton" id="GNUNET_GTK_conversation_use_current_button"> |
390 | <property name="label" translatable="yes">>contact</property> | 391 | <property name="label" translatable="yes">import Addr</property> |
391 | <property name="use_action_appearance">False</property> | 392 | <property name="use_action_appearance">False</property> |
392 | <property name="visible">True</property> | 393 | <property name="visible">True</property> |
393 | <property name="can_focus">True</property> | 394 | <property name="can_focus">True</property> |
394 | <property name="receives_default">True</property> | 395 | <property name="receives_default">True</property> |
395 | <property name="use_action_appearance">False</property> | 396 | <property name="use_action_appearance">False</property> |
397 | <property name="xalign">0.4699999988079071</property> | ||
396 | <signal name="clicked" handler="GNUNET_CONVERSATION_GTK_on_current_clicked" swapped="no"/> | 398 | <signal name="clicked" handler="GNUNET_CONVERSATION_GTK_on_current_clicked" swapped="no"/> |
397 | </object> | 399 | </object> |
398 | <packing> | 400 | <packing> |
diff --git a/src/conversation/gnunet-conversation-gtk.c b/src/conversation/gnunet-conversation-gtk.c index a6b85374..c717fa00 100644 --- a/src/conversation/gnunet-conversation-gtk.c +++ b/src/conversation/gnunet-conversation-gtk.c | |||
@@ -1191,7 +1191,8 @@ identity_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego, void **ctx, | |||
1191 | list_it = | 1191 | list_it = |
1192 | GNUNET_NAMESTORE_zone_iteration_start (ns, &zone_pkey, &display_record, | 1192 | GNUNET_NAMESTORE_zone_iteration_start (ns, &zone_pkey, &display_record, |
1193 | NULL); | 1193 | NULL); |
1194 | 1194 | if (NULL == phone) | |
1195 | start_phone(); | ||
1195 | } | 1196 | } |
1196 | 1197 | ||
1197 | /** | 1198 | /** |
@@ -1400,7 +1401,8 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
1400 | gtk_tree_model_iter_next(zone_treemodel, &iterContactsInit); | 1401 | gtk_tree_model_iter_next(zone_treemodel, &iterContactsInit); |
1401 | gtk_combo_box_set_active_iter(GTK_WIDGET (get_object ("gnunet_conversation_gtk_contacts_zone_combobox")), &iterContactsInit); | 1402 | gtk_combo_box_set_active_iter(GTK_WIDGET (get_object ("gnunet_conversation_gtk_contacts_zone_combobox")), &iterContactsInit); |
1402 | // zone_pkey = *GNUNET_IDENTITY_ego_get_private_key (caller_id); | 1403 | // zone_pkey = *GNUNET_IDENTITY_ego_get_private_key (caller_id); |
1403 | 1404 | // gtk_combo_box_set_active(GTK_WIDGET (get_object ("gnunet_conversation_gtk_contacts_zone_combobox")), 1); | |
1405 | // gtk_combo_box_set_active(GTK_WIDGET (get_object ("gnunet_conversation_gtk_outgoing_zone_combobox")), 1); | ||
1404 | } | 1406 | } |
1405 | 1407 | ||
1406 | 1408 | ||