1 files changed, 58 insertions, 51 deletions

diff --git a/contrib/gnunet_fs_gtk_publish_tab.glade b/contrib/gnunet_fs_gtk_publish_tab.glade
index 4ef49c98..94f3d812 100644
--- a/contrib/gnunet_fs_gtk_publish_tab.glade
+++ b/contrib/gnunet_fs_gtk_publish_tab.glade
@@ -1,70 +1,89 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="2.20"/>
-  <!-- interface-naming-policy project-wide -->
+  <object class="GtkTreeStore" id="_publish_frame_tree_store">
+    <columns>
+      <!-- column-name filename -->
+      <column type="gchararray"/>
+      <!-- column-name filesize -->
+      <column type="gchararray"/>
+      <!-- column-name bgcolour -->
+      <column type="gchararray"/>
+      <!-- column-name progress -->
+      <column type="guint"/>
+      <!-- column-name ent -->
+      <column type="gpointer"/>
+      <!-- column-name result_string -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
   <object class="GtkWindow" id="_publish_frame_window">
+    <property name="can_focus">False</property>
     <property name="title">You should never see this</property>
-
-                   <child>
-                      <object class="GtkScrolledWindow" id="_publish_frame_scrolled_window">
-                        <property name="height_request">100</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="hscrollbar_policy">automatic</property>
-                        <property name="vscrollbar_policy">automatic</property>
-
     <child>
-      <object class="GtkTreeView" id="_publish_frame">
+      <object class="GtkScrolledWindow" id="_publish_frame_scrolled_window">
+        <property name="height_request">100</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
-        <property name="model">_publish_frame_tree_store</property>
-        <property name="reorderable">True</property>
-        <property name="enable_tree_lines">True</property>
         <child>
-          <object class="GtkTreeViewColumn" id="filename">
-            <property name="sizing">autosize</property>
-            <property name="title" translatable="yes">Filename</property>
-            <property name="expand">True</property>
+          <object class="GtkTreeView" id="_publish_frame">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="model">_publish_frame_tree_store</property>
+            <property name="reorderable">True</property>
+            <property name="enable_tree_lines">True</property>
+            <child internal-child="selection">
+              <object class="GtkTreeSelection" id="treeview-selection1"/>
+            </child>
             <child>
-              <object class="GtkCellRendererProgress" id="filename_renderer"/>
-              <attributes>
-                <attribute name="cell-background">2</attribute>
-                <attribute name="text">0</attribute>
-                <attribute name="value">3</attribute>
-              </attributes>
+              <object class="GtkTreeViewColumn" id="filename">
+                <property name="sizing">autosize</property>
+                <property name="title" translatable="yes">Filename</property>
+                <property name="expand">True</property>
+                <child>
+                  <object class="GtkCellRendererProgress" id="filename_renderer"/>
+                  <attributes>
+                    <attribute name="cell-background">2</attribute>
+                    <attribute name="text">0</attribute>
+                    <attribute name="value">3</attribute>
+                  </attributes>
+                </child>
+              </object>
             </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkTreeViewColumn" id="filesize">
-            <property name="sizing">autosize</property>
-            <property name="title" translatable="yes">Size</property>
             <child>
-              <object class="GtkCellRendererText" id="size_renderer"/>
-              <attributes>
-                <attribute name="background">2</attribute>
-                <attribute name="text">1</attribute>
-              </attributes>
+              <object class="GtkTreeViewColumn" id="filesize">
+                <property name="sizing">autosize</property>
+                <property name="title" translatable="yes">Size</property>
+                <child>
+                  <object class="GtkCellRendererText" id="size_renderer"/>
+                  <attributes>
+                    <attribute name="background">2</attribute>
+                    <attribute name="text">1</attribute>
+                  </attributes>
+                </child>
+              </object>
             </child>
           </object>
         </child>
       </object>
     </child>
   </object>
-    </child>
-  </object>
   <object class="GtkWindow" id="_publish_label_window">
+    <property name="can_focus">False</property>
     <child>
       <object class="GtkHBox" id="_publish_label_hbox">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="border_width">5</property>
         <child>
           <object class="GtkLabel" id="_publish_label_window_label">
             <property name="height_request">30</property>
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Publishing</property>
           </object>
           <packing>
+            <property name="expand">True</property>
             <property name="fill">False</property>
             <property name="padding">5</property>
             <property name="position">0</property>
@@ -72,6 +91,7 @@
         </child>
         <child>
           <object class="GtkButton" id="_publish_label_close_button">
+            <property name="use_action_appearance">False</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
@@ -80,6 +100,7 @@
             <child>
               <object class="GtkImage" id="close_icon_stock_image">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="stock">gtk-close</property>
                 <property name="icon-size">2</property>
               </object>
@@ -94,18 +115,4 @@
       </object>
     </child>
   </object>
-  <object class="GtkTreeStore" id="_publish_frame_tree_store">
-    <columns>
-      <!-- column-name filename -->
-      <column type="gchararray"/>
-      <!-- column-name filesize -->
-      <column type="gchararray"/>
-      <!-- column-name bgcolour -->
-      <column type="gchararray"/>
-      <!-- column-name progress -->
-      <column type="guint"/>
-      <!-- column-name ent -->
-      <column type="gpointer"/>
-    </columns>
-  </object>
 </interface>