1 files changed, 33 insertions, 10 deletions

diff --git a/contrib/gnunet_gtk.glade b/contrib/gnunet_gtk.glade
index 86ea11fc..dd61ea93 100644
--- a/contrib/gnunet_gtk.glade
+++ b/contrib/gnunet_gtk.glade
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.24"/>
-  <!-- interface-naming-policy project-wide -->
+  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="gnunet_gtk_window">
     <property name="can_focus">False</property>
     <property name="events">GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON1_MOTION_MASK | GDK_BUTTON2_MOTION_MASK | GDK_BUTTON3_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK | GDK_VISIBILITY_NOTIFY_MASK | GDK_PROXIMITY_IN_MASK | GDK_PROXIMITY_OUT_MASK | GDK_SUBSTRUCTURE_MASK | GDK_SCROLL_MASK</property>
@@ -23,7 +22,7 @@
           </object>
         </child>
         <child type="tab">
-          <object class="GtkImage" id="image1">
+          <object class="GtkImage" id="statistics_image">
             <property name="width_request">100</property>
             <property name="height_request">50</property>
             <property name="visible">True</property>
@@ -48,7 +47,7 @@
           </packing>
         </child>
         <child type="tab">
-          <object class="GtkImage" id="image2">
+          <object class="GtkImage" id="peerinfo_image">
             <property name="width_request">100</property>
             <property name="height_request">50</property>
             <property name="visible">True</property>
@@ -74,7 +73,7 @@
           </packing>
         </child>
         <child type="tab">
-          <object class="GtkImage" id="image3">
+          <object class="GtkImage" id="namestore_image">
             <property name="width_request">100</property>
             <property name="height_request">0</property>
             <property name="visible">True</property>
@@ -100,7 +99,7 @@
           </packing>
         </child>
         <child type="tab">
-          <object class="GtkImage" id="image4">
+          <object class="GtkImage" id="fs_image">
             <property name="width_request">100</property>
             <property name="height_request">0</property>
             <property name="visible">True</property>
@@ -126,7 +125,7 @@
           </packing>
         </child>
         <child type="tab">
-          <object class="GtkImage" id="image5">
+          <object class="GtkImage" id="identity_image">
             <property name="width_request">100</property>
             <property name="height_request">0</property>
             <property name="visible">True</property>
@@ -140,7 +139,8 @@
           </packing>
         </child>
         <child>
-          <object class="GtkHBox" id="gnunet_setup_hbox">
+          <object class="GtkBox" id="gnunet_conversation_hbox">
+            <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child>
               <placeholder/>
@@ -151,7 +151,30 @@
           </packing>
         </child>
         <child type="tab">
-          <object class="GtkImage" id="image6">
+          <object class="GtkImage" id="conversation_image">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="tooltip_text" translatable="yes">Voice conversation</property>
+            <property name="pixbuf">conversation.png</property>
+          </object>
+          <packing>
+            <property name="position">5</property>
+            <property name="tab_fill">False</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHBox" id="gnunet_setup_hbox">
+            <property name="can_focus">False</property>
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="position">6</property>
+          </packing>
+        </child>
+        <child type="tab">
+          <object class="GtkImage" id="setup_image">
             <property name="width_request">100</property>
             <property name="height_request">50</property>
             <property name="visible">True</property>
@@ -160,7 +183,7 @@
             <property name="pixbuf">setup.png</property>
           </object>
           <packing>
-            <property name="position">5</property>
+            <property name="position">6</property>
             <property name="tab_fill">False</property>
           </packing>
         </child>