-glade fixes

2 files changed, 23 insertions, 24 deletions

diff --git a/contrib/gnunet_fs_gtk_enter_nick_dialog.glade b/contrib/gnunet_fs_gtk_enter_nick_dialog.glade
index 79b46428..aba1c058 100644
--- a/contrib/gnunet_fs_gtk_enter_nick_dialog.glade
+++ b/contrib/gnunet_fs_gtk_enter_nick_dialog.glade
@@ -28,7 +28,7 @@
                 <property name="can_focus">False</property>
                 <property name="label" translatable="yes">_Nickname:</property>
                 <property name="use_underline">True</property>
-                <property name="mnemonic_widget">GNUNET_GTK_open_url_dialog_url_textview</property>
+                <property name="mnemonic_widget">GNUNET_GTK_enter_nick_window_nick_entry</property>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/contrib/gnunet_fs_gtk_main_window.glade b/contrib/gnunet_fs_gtk_main_window.glade
index 2838108f..1301ff67 100644
--- a/contrib/gnunet_fs_gtk_main_window.glade
+++ b/contrib/gnunet_fs_gtk_main_window.glade
@@ -44,6 +44,28 @@
       <column type="gchararray"/>
     </columns>
   </object>
+  <object class="GtkListStore" id="GNUNET_GTK_peer_info_list_store">
+    <columns>
+      <!-- column-name peer_identity -->
+      <column type="gchararray"/>
+      <!-- column-name number_of_known_addresses -->
+      <column type="guint"/>
+      <!-- column-name country_name -->
+      <column type="gchararray"/>
+      <!-- column-name country_flag -->
+      <column type="GdkPixbuf"/>
+      <!-- column-name bandwidth -->
+      <column type="guint64"/>
+    </columns>
+  </object>
+  <object class="GtkListStore" id="GNUNET_GTK_select_pseudonym_liststore">
+    <columns>
+      <!-- column-name namespace_name -->
+      <column type="gchararray"/>
+      <!-- column-name namespace_handle -->
+      <column type="gpointer"/>
+    </columns>
+  </object>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="upper">100</property>
     <property name="step_increment">1</property>
@@ -345,7 +367,6 @@
                   <object class="GtkComboBox" id="main_window_search_namespace_combobox">
                     <property name="can_focus">False</property>
                     <property name="model">namespace_label_liststore</property>
-                    <property name="button_sensitivity">off</property>
                     <property name="has_entry">True</property>
                     <property name="entry_text_column">0</property>
                     <signal name="changed" handler="main_window_search_namespace_combobox_changed_cb" swapped="no"/>
@@ -934,28 +955,6 @@ This operation will be executed using the anonymity level specified on the right
       </object>
     </child>
   </object>
-  <object class="GtkListStore" id="GNUNET_GTK_peer_info_list_store">
-    <columns>
-      <!-- column-name peer_identity -->
-      <column type="gchararray"/>
-      <!-- column-name number_of_known_addresses -->
-      <column type="guint"/>
-      <!-- column-name country_name -->
-      <column type="gchararray"/>
-      <!-- column-name country_flag -->
-      <column type="GdkPixbuf"/>
-      <!-- column-name bandwidth -->
-      <column type="guint64"/>
-    </columns>
-  </object>
-  <object class="GtkListStore" id="GNUNET_GTK_select_pseudonym_liststore">
-    <columns>
-      <!-- column-name namespace_name -->
-      <column type="gchararray"/>
-      <!-- column-name namespace_handle -->
-      <column type="gpointer"/>
-    </columns>
-  </object>
   <object class="GtkAdjustment" id="adjustment3">
     <property name="upper">100</property>
     <property name="step_increment">1</property>