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

[gnunet]

Author: grothoff
Date: 2014-06-02 18:25:01 +0200 (Mon, 02 Jun 2014)
New Revision: 33469

Modified:
   gnunet-gtk/contrib/gnunet_conversation_gtk_main_window.glade
   gnunet-gtk/src/conversation/gnunet-conversation-gtk_egos.c
   gnunet-gtk/src/conversation/gnunet-conversation-gtk_phone.c
Log:
-misc fixes

Modified: gnunet-gtk/contrib/gnunet_conversation_gtk_main_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_conversation_gtk_main_window.glade        
2014-06-02 15:17:27 UTC (rev 33468)
+++ gnunet-gtk/contrib/gnunet_conversation_gtk_main_window.glade        
2014-06-02 16:25:01 UTC (rev 33469)
@@ -122,6 +122,8 @@
                         <property name="can_focus">False</property>
                         <property name="label" translatable="yes">_Address 
Book</property>
                         <property name="use_underline">True</property>
+                        <property name="active">True</property>
+                        <signal name="toggled" 
handler="gnunet_conversation_gtk_view_address_book_checkmenuitem_toggled_cb" 
swapped="no"/>
                       </object>
                     </child>
                     <child>
@@ -535,10 +537,11 @@
                                         <property 
name="layout_style">start</property>
                                         <child>
                                           <object class="GtkImage" 
id="GNUNET_GTK_status_icon">
+                                            <property 
name="width_request">75</property>
+                                            <property 
name="height_request">75</property>
                                             <property 
name="visible">True</property>
                                             <property 
name="can_focus">False</property>
                                             <property name="tooltip_text" 
translatable="yes">Status indicator</property>
-                                            <property 
name="hexpand">True</property>
                                             <property 
name="icon_name">bluefish</property>
                                           </object>
                                           <packing>
@@ -776,7 +779,7 @@
                                     </child>
                                   </object>
                                   <packing>
-                                    <property name="expand">False</property>
+                                    <property name="expand">True</property>
                                     <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>

Modified: gnunet-gtk/src/conversation/gnunet-conversation-gtk_egos.c
===================================================================
--- gnunet-gtk/src/conversation/gnunet-conversation-gtk_egos.c  2014-06-02 
15:17:27 UTC (rev 33468)
+++ gnunet-gtk/src/conversation/gnunet-conversation-gtk_egos.c  2014-06-02 
16:25:01 UTC (rev 33469)
@@ -75,8 +75,9 @@
 
   cb = GTK_COMBO_BOX (GCG_get_main_window_object
                       ("gnunet_conversation_gtk_ego_combobox"));
-  gtk_combo_box_get_active_iter (cb,
-                                 &iter);
+  if (! gtk_combo_box_get_active_iter (cb,
+                                       &iter))
+    return NULL;
   gtk_tree_model_get (GTK_TREE_MODEL (ego_liststore),
                       &iter,
                       EGO_LS_EGO, &ego,

Modified: gnunet-gtk/src/conversation/gnunet-conversation-gtk_phone.c
===================================================================
--- gnunet-gtk/src/conversation/gnunet-conversation-gtk_phone.c 2014-06-02 
15:17:27 UTC (rev 33468)
+++ gnunet-gtk/src/conversation/gnunet-conversation-gtk_phone.c 2014-06-02 
16:25:01 UTC (rev 33469)
@@ -1720,7 +1720,7 @@
   }
   update_phone_record ();
   check_call_sensitivity ();
-  do_status();
+  do_status ();
 }
 
 
@@ -1760,6 +1760,7 @@
   active_treeview =
       GTK_TREE_VIEW (GCG_get_main_window_object
                      ("gnunet_conversation_gtk_active_calls_treeview"));
+  do_status ();
 }