[GNUnet-SVN] r32331 - in gnunet-gtk: contrib src/conversation

[gnunet]

Author: yids
Date: 2014-02-12 21:20:59 +0100 (Wed, 12 Feb 2014)
New Revision: 32331

Modified:
   gnunet-gtk/contrib/gnunet_conversation_gtk_main_window.glade
   gnunet-gtk/src/conversation/gnunet-conversation-gtk.c
Log:
- forgot to add glade file
- starts phone with default ego 


Modified: gnunet-gtk/contrib/gnunet_conversation_gtk_main_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_conversation_gtk_main_window.glade        
2014-02-12 17:32:30 UTC (rev 32330)
+++ gnunet-gtk/contrib/gnunet_conversation_gtk_main_window.glade        
2014-02-12 20:20:59 UTC (rev 32331)
@@ -236,7 +236,8 @@
                           <object class="GtkComboBox" 
id="gnunet_conversation_gtk_outgoing_zone_combobox">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property 
name="model">gnunet_conversation_gtk_outgoing_zone_liststore</property>
+                            <property 
name="model">gnunet_conversation_gtk_contacts_zone_liststore</property>
+                            <signal name="changed" 
handler="gnunet_conversation_gtk_outgoing_zone_combobox_changed_cb" 
swapped="no"/>
                             <child>
                               <object class="GtkCellRendererText" 
id="gnunet_conversation_gtk_outgoing_zone_ego_name_cellrenderertext"/>
                               <attributes>
@@ -387,12 +388,13 @@
                             </child>
                             <child>
                               <object class="GtkButton" 
id="GNUNET_GTK_conversation_use_current_button">
-                                <property name="label" 
translatable="yes">&gt;contact</property>
+                                <property name="label" 
translatable="yes">import Addr</property>
                                 <property 
name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property 
name="receives_default">True</property>
                                 <property 
name="use_action_appearance">False</property>
+                                <property 
name="xalign">0.4699999988079071</property>
                                 <signal name="clicked" 
handler="GNUNET_CONVERSATION_GTK_on_current_clicked" swapped="no"/>
                               </object>
                               <packing>

Modified: gnunet-gtk/src/conversation/gnunet-conversation-gtk.c
===================================================================
--- gnunet-gtk/src/conversation/gnunet-conversation-gtk.c       2014-02-12 
17:32:30 UTC (rev 32330)
+++ gnunet-gtk/src/conversation/gnunet-conversation-gtk.c       2014-02-12 
20:20:59 UTC (rev 32331)
@@ -1191,7 +1191,8 @@
   list_it =
       GNUNET_NAMESTORE_zone_iteration_start (ns, &zone_pkey, &display_record,
                                              NULL);
-
+  if (NULL == phone)
+       start_phone();
 }
 
 /**
@@ -1400,7 +1401,8 @@
   gtk_tree_model_iter_next(zone_treemodel, &iterContactsInit);
   gtk_combo_box_set_active_iter(GTK_WIDGET (get_object 
("gnunet_conversation_gtk_contacts_zone_combobox")), &iterContactsInit);
 //  zone_pkey = *GNUNET_IDENTITY_ego_get_private_key (caller_id);
-
+//  gtk_combo_box_set_active(GTK_WIDGET (get_object 
("gnunet_conversation_gtk_contacts_zone_combobox")), 1);
+//  gtk_combo_box_set_active(GTK_WIDGET (get_object 
("gnunet_conversation_gtk_outgoing_zone_combobox")), 1);
 }