1 files changed, 25 insertions, 27 deletions

diff --git a/contrib/gnunet_gns_gtk_main_window.glade b/contrib/gnunet_gns_gtk_main_window.glade
index 4fe6e015..7c729f9d 100644
--- a/contrib/gnunet_gns_gtk_main_window.glade
+++ b/contrib/gnunet_gns_gtk_main_window.glade
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <requires lib="gtk+" version="2.20"/>
   <!-- interface-naming-policy project-wide -->
   <object class="GtkWindow" id="GNUNET_GNS_GTK_main_window">
     <property name="can_focus">False</property>
@@ -231,7 +231,6 @@
                     <property name="reorderable">True</property>
                     <property name="sort_indicator">True</property>
                     <property name="sort_column_id">0</property>
-                    <signal name="clicked" handler="GNUNET_GNS_GTK_main_treeview_click_cb" swapped="no"/>
                     <child>
                       <object class="GtkCellRendererText" id="GNUNET_GNS_GTK_name_cellrenderertext">
                         <property name="editable">True</property>
@@ -271,11 +270,10 @@
                     <child>
                       <object class="GtkCellRendererCombo" id="GNUNET_GNS_GTK_type_cellrenderercombo">
                         <property name="editable">True</property>
+                        <property name="model">GNUNET_GNS_GTK_type_liststore</property>
+                        <property name="text_column">1</property>
                         <signal name="changed" handler="GNUNET_GNS_GTK_type_cellrenderercombo_changed_cb" swapped="no"/>
                       </object>
-                      <attributes>
-                        <attribute name="text-column">3</attribute>
-                      </attributes>
                     </child>
                   </object>
                 </child>
@@ -325,28 +323,6 @@
       </object>
     </child>
   </object>
-  <object class="GtkTreeStore" id="GNUNET_GNS_GTK_treestore">
-    <columns>
-      <!-- column-name name -->
-      <column type="gchararray"/>
-      <!-- column-name is_public -->
-      <column type="gboolean"/>
-      <!-- column-name record_type -->
-      <column type="guint"/>
-      <!-- column-name record_type_as_string -->
-      <column type="gchararray"/>
-      <!-- column-name expiration_time -->
-      <column type="guint64"/>
-      <!-- column-name expiration_time_is_relative -->
-      <column type="gboolean"/>
-      <!-- column-name expiration_time_as_string -->
-      <column type="gchararray"/>
-      <!-- column-name value_as_string -->
-      <column type="gchararray"/>
-      <!-- column-name value_color -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
   <object class="GtkListStore" id="GNUNET_GNS_GTK_type_liststore">
     <columns>
       <!-- column-name type -->
@@ -397,4 +373,26 @@
       </row>
     </data>
   </object>
+  <object class="GtkTreeStore" id="GNUNET_GNS_GTK_treestore">
+    <columns>
+      <!-- column-name name -->
+      <column type="gchararray"/>
+      <!-- column-name is_public -->
+      <column type="gboolean"/>
+      <!-- column-name record_type -->
+      <column type="guint"/>
+      <!-- column-name record_type_as_string -->
+      <column type="gchararray"/>
+      <!-- column-name expiration_time -->
+      <column type="guint64"/>
+      <!-- column-name expiration_time_is_relative -->
+      <column type="gboolean"/>
+      <!-- column-name expiration_time_as_string -->
+      <column type="gchararray"/>
+      <!-- column-name value_as_string -->
+      <column type="gchararray"/>
+      <!-- column-name value_color -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
 </interface>