1 files changed, 24 insertions, 18 deletions

diff --git a/contrib/gnunet_conversation_gtk_main_window.glade b/contrib/gnunet_conversation_gtk_main_window.glade
index 7b6f62d8..23b49322 100644
--- a/contrib/gnunet_conversation_gtk_main_window.glade
+++ b/contrib/gnunet_conversation_gtk_main_window.glade
@@ -368,14 +368,15 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkButtonBox" id="GNUNET_GTK_conversation_buttons">
-                            <property name="visible">True</property>
+                          <object class="GtkButtonBox" id="GNUNET_GTK_conversation_active_call_list_buttons">
                             <property name="can_focus">False</property>
+                            <property name="border_width">2</property>
                             <property name="orientation">vertical</property>
                             <property name="layout_style">start</property>
                             <child>
                               <object class="GtkImage" id="GNUNET_GTK_status_icon">
                                 <property name="visible">True</property>
+                                <property name="sensitive">False</property>
                                 <property name="can_focus">False</property>
                                 <property name="tooltip_text" translatable="yes">Status indicator</property>
                                 <property name="icon_name">bluefish</property>
@@ -391,6 +392,7 @@
                                 <property name="label" translatable="yes">import Addr</property>
                                 <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
+                                <property name="sensitive">False</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
                                 <property name="use_action_appearance">False</property>
@@ -408,6 +410,7 @@
                                 <property name="label" translatable="yes">accept</property>
                                 <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
+                                <property name="sensitive">False</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
                                 <property name="use_action_appearance">False</property>
@@ -424,6 +427,7 @@
                                 <property name="label" translatable="yes">hangup</property>
                                 <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
+                                <property name="sensitive">False</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
                                 <property name="use_action_appearance">False</property>
@@ -436,10 +440,11 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkButton" id="GNUNET_GTK_conversation_pause_button">
-                                <property name="label" translatable="yes">pause</property>
+                              <object class="GtkButton" id="GNUNET_GTK_conversation_suspend_button">
+                                <property name="label" translatable="yes">suspend</property>
                                 <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
+                                <property name="sensitive">False</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
                                 <property name="use_action_appearance">False</property>
@@ -456,6 +461,7 @@
                                 <property name="label" translatable="yes">resume</property>
                                 <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
+                                <property name="sensitive">False</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
                                 <property name="use_action_appearance">False</property>
@@ -841,20 +847,6 @@
       </object>
     </child>
   </object>
-  <object class="GtkListStore" id="gnunet_conversation_gtk_active_calls_liststore">
-    <columns>
-      <!-- column-name caller_id -->
-      <column type="gchararray"/>
-      <!-- column-name caller -->
-      <column type="gpointer"/>
-      <!-- column-name caller_num -->
-      <column type="gint"/>
-      <!-- column-name caller_type -->
-      <column type="gint"/>
-      <!-- column-name caller_state -->
-      <column type="gint"/>
-    </columns>
-  </object>
   <object class="GtkListStore" id="gnunet_conversation_gtk_contacts_liststore">
     <columns>
       <!-- column-name contactName -->
@@ -871,6 +863,20 @@
       <column type="gpointer"/>
     </columns>
   </object>
+  <object class="GtkListStore" id="gnunet_conversation_gtk_active_calls_liststore">
+    <columns>
+      <!-- column-name caller_id -->
+      <column type="gchararray"/>
+      <!-- column-name caller -->
+      <column type="gpointer"/>
+      <!-- column-name caller_num -->
+      <column type="gint"/>
+      <!-- column-name caller_type -->
+      <column type="gint"/>
+      <!-- column-name caller_state -->
+      <column type="gint"/>
+    </columns>
+  </object>
   <object class="GtkListStore" id="gnunet_conversation_gtk_history_liststore">
     <columns>
       <!-- column-name logTime -->