1 files changed, 38 insertions, 22 deletions

diff --git a/contrib/gnunet_identity_gtk_advertise_dialog.glade b/contrib/gnunet_identity_gtk_advertise_dialog.glade
index c15398f4..5baf4504 100644
--- a/contrib/gnunet_identity_gtk_advertise_dialog.glade
+++ b/contrib/gnunet_identity_gtk_advertise_dialog.glade
@@ -7,22 +7,13 @@
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
-  <object class="GtkListStore" id="GNUNET_GTK_identity_advertise_metadata_liststore">
+  <object class="GtkListStore" id="GNUNET_GTK_identity_advertise_keywords_liststore">
     <columns>
-      <!-- column-name TypeBin -->
-      <column type="gint"/>
-      <!-- column-name Type -->
-      <column type="gchararray"/>
-      <!-- column-name Value -->
+      <!-- column-name Keyword -->
       <column type="gchararray"/>
     </columns>
   </object>
-  <object class="GtkAdjustment" id="GNUNET_GTK_identity_advertise_metadata_vadj">
-    <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" id="GNUNET_GTK_identity_advertise_metadata_hadj">
+  <object class="GtkAdjustment" id="GNUNET_GTK_identity_advertise_keywords_vadj">
     <property name="upper">100</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
@@ -54,7 +45,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <child>
-                      <object class="GtkHBox" id="hbox1">
+                      <object class="GtkHBox" id="GNUNET_GTK_identity_advertise_metadata_add_hbox">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -74,6 +65,13 @@
                           <object class="GtkComboBox" id="GNUNET_GTK_identity_advertise_metadata_type_combobox">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
+                            <property name="model">GNUNET_GTK_identity_metadata_types_liststore</property>
+                            <child>
+                              <object class="GtkCellRendererText" id="GNUNET_GTK_identity_metadata_type_cellrenderertext"/>
+                              <attributes>
+                                <attribute name="text">0</attribute>
+                              </attributes>
+                            </child>
                           </object>
                           <packing>
                             <property name="expand">True</property>
@@ -163,8 +161,8 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="model">GNUNET_GTK_identity_advertise_keywords_liststore</property>
-                            <property name="hadjustment">GNUNET_GTK_identity_advertise_keywords_hadj</property>
-                            <property name="vadjustment">GNUNET_GTK_identity_advertise_keywords_vadj</property>
+                            <property name="hadjustment">GNUNET_GTK_identity_advertise_metadata_hadj</property>
+                            <property name="vadjustment">GNUNET_GTK_identity_advertise_metadata_vadj</property>
                             <property name="headers_clickable">False</property>
                             <property name="rules_hint">True</property>
                             <property name="search_column">0</property>
@@ -237,6 +235,7 @@
               <object class="GtkButton" id="GNUNET_GTK_identity_advertise_ok_button">
                 <property name="label">gtk-execute</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="tooltip_text" translatable="yes">Execute advertisement.</property>
@@ -286,8 +285,8 @@
                   <object class="GtkScrolledWindow" id="GNUNET_GTK_identity_advertise_keywords_scrolledwindow">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="hadjustment">GNUNET_GTK_identity_advertise_keywords_order_hadj</property>
-                    <property name="vadjustment">GNUNET_GTK_identity_advertise_keywords_order_vadj</property>
+                    <property name="hadjustment">GNUNET_GTK_identity_advertise_keywords_hadj</property>
+                    <property name="vadjustment">GNUNET_GTK_identity_advertise_keywords_vadj</property>
                     <property name="hscrollbar_policy">automatic</property>
                     <property name="vscrollbar_policy">automatic</property>
                     <child>
@@ -295,8 +294,8 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="model">GNUNET_GTK_identity_advertise_keywords_liststore</property>
-                        <property name="hadjustment">GNUNET_GTK_identity_advertise_keywords_order_hadj</property>
-                        <property name="vadjustment">GNUNET_GTK_identity_advertise_keywords_order_vadj</property>
+                        <property name="hadjustment">GNUNET_GTK_identity_advertise_keywords_hadj</property>
+                        <property name="vadjustment">GNUNET_GTK_identity_advertise_keywords_vadj</property>
                         <property name="reorderable">True</property>
                         <property name="enable_search">False</property>
                         <property name="search_column">0</property>
@@ -346,15 +345,32 @@
       <action-widget response="-6">GNUNET_GTK_identity_advertise_cancel_button</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkListStore" id="GNUNET_GTK_identity_advertise_keywords_liststore">
+  <object class="GtkAdjustment" id="GNUNET_GTK_identity_advertise_metadata_hadj">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkListStore" id="GNUNET_GTK_identity_advertise_metadata_liststore">
     <columns>
-      <!-- column-name Keyword -->
+      <!-- column-name TypeBin -->
+      <column type="gint"/>
+      <!-- column-name Type -->
+      <column type="gchararray"/>
+      <!-- column-name Value -->
       <column type="gchararray"/>
     </columns>
   </object>
-  <object class="GtkAdjustment" id="GNUNET_GTK_identity_advertise_keywords_vadj">
+  <object class="GtkAdjustment" id="GNUNET_GTK_identity_advertise_metadata_vadj">
     <property name="upper">100</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
+  <object class="GtkListStore" id="GNUNET_GTK_identity_metadata_types_liststore">
+    <columns>
+      <!-- column-name type_as_string -->
+      <column type="gchararray"/>
+      <!-- column-name type_as_enum -->
+      <column type="guint"/>
+    </columns>
+  </object>
 </interface>