1 files changed, 17 insertions, 8 deletions

diff --git a/contrib/gnunet_conversation_gtk_main_window.glade b/contrib/gnunet_conversation_gtk_main_window.glade
index 31028399..3fa116ef 100644
--- a/contrib/gnunet_conversation_gtk_main_window.glade
+++ b/contrib/gnunet_conversation_gtk_main_window.glade
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
 <interface>
-  <requires lib="gtk+" version="3.0"/>
+  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkListStore" id="gnunet_conversation_gtk_active_calls_liststore">
     <columns>
       <!-- column-name caller_id -->
@@ -22,12 +21,12 @@
       <column type="gint"/>
     </columns>
   </object>
-  <object class="GtkListStore" id="gnunet_conversation_gtk_caller_id_zone_liststore">
+  <object class="GtkListStore" id="gnunet_conversation_gtk_contacts_liststore">
     <columns>
-      <!-- column-name ego_name -->
+      <!-- column-name contact_name -->
+      <column type="gchararray"/>
+      <!-- column-name contact_type -->
       <column type="gchararray"/>
-      <!-- column-name ego -->
-      <column type="gpointer"/>
     </columns>
   </object>
   <object class="GtkListStore" id="gnunet_conversation_gtk_contacts_zone_liststore">
@@ -99,6 +98,7 @@
             </child>
             <child>
               <object class="GtkMenuItem" id="gnunet_conversation_gtk_view_menu">
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="label" translatable="yes">_View</property>
@@ -109,6 +109,7 @@
                     <property name="can_focus">False</property>
                     <child>
                       <object class="GtkCheckMenuItem" id="gnunet_conversation_gtk_view_history_checkmenuitem">
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="label" translatable="yes">_History</property>
@@ -118,6 +119,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckMenuItem" id="gnunet_conversation_gtk_view_log_checkmenuitem">
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="label" translatable="yes">_Logs</property>
@@ -281,6 +283,7 @@
                                 <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="use_underline">True</property>
                                 <property name="use_stock">True</property>
                                 <signal name="clicked" handler="gnunet_conversation_gtk_call_button_clicked_cb" swapped="no"/>
@@ -299,6 +302,7 @@
                                 <property name="sensitive">False</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="use_stock">True</property>
                                 <signal name="clicked" handler="GNUNET_CONVERSATION_GTK_on_pause_clicked" swapped="no"/>
                               </object>
@@ -316,6 +320,7 @@
                                 <property name="sensitive">False</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="use_stock">True</property>
                                 <signal name="clicked" handler="GNUNET_CONVERSATION_GTK_on_hangup_clicked" swapped="no"/>
                               </object>
@@ -422,6 +427,7 @@
                                     <property name="sensitive">False</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_use_current_button_clicked" swapped="no"/>
                                   </object>
@@ -440,6 +446,7 @@
                                     <property name="sensitive">False</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
+                                    <property name="use_action_appearance">False</property>
                                     <signal name="clicked" handler="GNUNET_CONVERSATION_GTK_on_accept_clicked" swapped="no"/>
                                   </object>
                                   <packing>
@@ -457,6 +464,7 @@
                                     <property name="sensitive">False</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
+                                    <property name="use_action_appearance">False</property>
                                     <signal name="clicked" handler="GNUNET_CONVERSATION_GTK_on_resume_clicked" swapped="no"/>
                                   </object>
                                   <packing>
@@ -474,6 +482,7 @@
                                     <property name="sensitive">False</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
+                                    <property name="use_action_appearance">False</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -492,7 +501,7 @@
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
+                            <property name="expand">True</property>
                             <property name="fill">True</property>
                             <property name="position">2</property>
                           </packing>
@@ -579,7 +588,7 @@
                           <object class="GtkTreeView" id="gnunet_conversation_gtk_contact_list_treeview">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="model"/>
+                            <property name="model">gnunet_conversation_gtk_contacts_liststore</property>
                             <property name="headers_clickable">False</property>
                             <property name="search_column">0</property>
                             <signal name="row-activated" handler="gnunet_conversation_gtk_contact_list_treeview_row_activated_cb" swapped="no"/>