[gnome-software] Move the headerbar to the content for now, to accomodate glade

[Matthias Clasen <matthiasc src gnome org>]

commit 53d24166423092359b88cf1e3155cd74813d11b5
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Aug 15 07:48:59 2013 -0400

    Move the headerbar to the content for now, to accomodate glade
    
    glade doesn't know about titlebar children of gtkwindow yet, sadly.

 src/gnome-software.ui |  298 ++++++++++++++++++++++++------------------------
 1 files changed, 149 insertions(+), 149 deletions(-)
---
diff --git a/src/gnome-software.ui b/src/gnome-software.ui
index ffc1e21..675069f 100644
--- a/src/gnome-software.ui
+++ b/src/gnome-software.ui
@@ -25,214 +25,214 @@
   <object class="GtkWindow" id="window_software">
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Software</property>
-    <child type="titlebar">
-      <object class="GtkHeaderBar" id="header">
+    <child>
+      <object class="GtkBox" id="box1">
         <property name="visible">True</property>
-        <property name="show-close-button">True</property>
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">5</property>
         <child>
-          <object class="GtkButton" id="button_back">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <style>
-              <class name="image-button"/>
-            </style>
-            <child>
-              <object class="GtkImage" id="back_image">
-                <property name="visible">True</property>
-                <property name="icon-name">go-previous</property>
-                <property name="icon-size">1</property>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="pack-type">start</property>
-          </packing>
-        </child>
-        <child type="title">
-          <object class="GtkButtonBox" id="buttonbox_main">
+          <object class="GtkHeaderBar" id="header">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="layout_style">center</property>
-            <style>
-              <class name="linked"/>
-            </style>
+            <property name="show-close-button">True</property>
             <child>
-              <object class="GtkToggleButton" id="button_all">
+              <object class="GtkButton" id="button_back">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
                 <style>
-                  <class name="toolbar-primary-buttons-software"/>
+                  <class name="image-button"/>
                 </style>
                 <child>
-                  <object class="GtkLabel" id="label_button_all">
+                  <object class="GtkImage" id="back_image">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">All</property>
+                    <property name="icon-name">go-previous</property>
+                    <property name="icon-size">1</property>
                   </object>
                 </child>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
+                <property name="pack-type">start</property>
               </packing>
             </child>
-            <child>
-              <object class="GtkToggleButton" id="button_installed">
+            <child type="title">
+              <object class="GtkButtonBox" id="buttonbox_main">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">False</property>
+                <property name="layout_style">center</property>
                 <style>
-                  <class name="toolbar-primary-buttons-software"/>
+                  <class name="linked"/>
                 </style>
                 <child>
-                  <object class="GtkLabel" id="label_button_installed">
+                  <object class="GtkToggleButton" id="button_all">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Installed</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <style>
+                      <class name="toolbar-primary-buttons-software"/>
+                    </style>
+                    <child>
+                      <object class="GtkLabel" id="label_button_all">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">All</property>
+                      </object>
+                    </child>
                   </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
                 </child>
+                <child>
+                  <object class="GtkToggleButton" id="button_installed">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <style>
+                      <class name="toolbar-primary-buttons-software"/>
+                    </style>
+                    <child>
+                      <object class="GtkLabel" id="label_button_installed">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Installed</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkToggleButton" id="button_updates">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <style>
+                      <class name="toolbar-primary-buttons-software"/>
+                    </style>
+                    <child>
+                      <object class="GtkLabel" id="label_button_updates">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Updates</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkButton" id="button_update_all">
+                <property name="label" translatable="yes">Update All</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <style>
+                  <class name="suggested-action"/>
+                </style>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
+                <property name="pack-type">end</property>
               </packing>
             </child>
             <child>
-              <object class="GtkToggleButton" id="button_updates">
+              <object class="GtkButton" id="button_install">
+                <property name="label" translatable="yes">Install</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <style>
-                  <class name="toolbar-primary-buttons-software"/>
+                  <class name="suggested-action"/>
                 </style>
-                <child>
-                  <object class="GtkLabel" id="label_button_updates">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Updates</property>
-                  </object>
-                </child>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">2</property>
+                <property name="pack-type">end</property>
               </packing>
             </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkButton" id="button_update_all">
-            <property name="label" translatable="yes">Update All</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <style>
-              <class name="suggested-action"/>
-            </style>
-          </object>
-          <packing>
-            <property name="pack-type">end</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkButton" id="button_install">
-            <property name="label" translatable="yes">Install</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <style>
-              <class name="suggested-action"/>
-            </style>
-          </object>
-          <packing>
-            <property name="pack-type">end</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <child>
-      <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">5</property>
-        <child>
-          <object class="GtkToolbar" id="search_bar">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <style>
-              <class name="primary-toolbar"/>
-            </style>
             <child>
-              <object class="GtkToolItem" id="search_toolitem">
+              <object class="GtkToolbar" id="search_bar">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <style>
+                  <class name="primary-toolbar"/>
+                </style>
                 <child>
-                  <object class="GtkBox" id="search_toolbox">
+                  <object class="GtkToolItem" id="search_toolitem">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <child>
-                      <object class="GtkBox" id="box_left">
+                      <object class="GtkBox" id="search_toolbox">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="orientation">vertical</property>
-                        <property name="halign">start</property>
-                        <property name="hexpand">True</property>
                         <child>
-                          <placeholder/>
+                          <object class="GtkBox" id="box_left">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="orientation">vertical</property>
+                            <property name="halign">start</property>
+                            <property name="hexpand">True</property>
+                            <child>
+                              <placeholder/>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
                         </child>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkSearchEntry" id="entry_search">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="activates_default">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkBox" id="box_right">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="orientation">vertical</property>
-                        <property name="halign">start</property>
-                        <property name="hexpand">True</property>
                         <child>
-                          <placeholder/>
+                          <object class="GtkSearchEntry" id="entry_search">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="activates_default">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkBox" id="box_right">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="orientation">vertical</property>
+                            <property name="halign">start</property>
+                            <property name="hexpand">True</property>
+                            <child>
+                              <placeholder/>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">2</property>
+                          </packing>
                         </child>
                       </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
                     </child>
                   </object>
+                  <packing>
+                    <property name="expand">True</property>
+                  </packing>
                 </child>
               </object>
               <packing>
-                <property name="expand">True</property>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
               </packing>
             </child>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-          </packing>
         </child>
         <child>
           <object class="GtkNotebook" id="notebook_main">