[gedit/wip/browser-menu] filebrowser: merge combo inside the toolbar

[Ignacio Casal Quinteiro <icq src gnome org>]

commit 348bd99c97dd3de2334ec7b1e5e41ab05266b524
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Sat Apr 20 11:47:27 2013 +0200

    filebrowser: merge combo inside the toolbar

 plugins/filebrowser/gedit-file-browser-widget.ui | 60 +++++++++++++-----------
 1 file changed, 32 insertions(+), 28 deletions(-)
---
diff --git a/plugins/filebrowser/gedit-file-browser-widget.ui 
b/plugins/filebrowser/gedit-file-browser-widget.ui
index 61f769a..e253d90 100644
--- a/plugins/filebrowser/gedit-file-browser-widget.ui
+++ b/plugins/filebrowser/gedit-file-browser-widget.ui
@@ -122,40 +122,44 @@
             <property name="homogeneous">False</property>
           </packing>
         </child>
-      </object>
-      <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">0</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkComboBox" id="combo">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="model">combo_model</property>
-        <child>
-          <object class="GtkCellRendererText" id="indent_renderer"/>
-        </child>
         <child>
-          <object class="GtkCellRendererPixbuf" id="icon_renderer"/>
-          <attributes>
-            <attribute name="pixbuf">1</attribute>
-          </attributes>
-        </child>
-        <child>
-          <object class="GtkCellRendererText" id="name_renderer">
-            <property name="ellipsize">end</property>
+          <object class="GtkToolItem" id="toolbutton3">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <child>
+              <object class="GtkComboBox" id="combo">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="model">combo_model</property>
+                <child>
+                  <object class="GtkCellRendererText" id="indent_renderer"/>
+                </child>
+                <child>
+                  <object class="GtkCellRendererPixbuf" id="icon_renderer"/>
+                  <attributes>
+                    <attribute name="pixbuf">1</attribute>
+                  </attributes>
+                </child>
+                <child>
+                  <object class="GtkCellRendererText" id="name_renderer">
+                    <property name="ellipsize">end</property>
+                  </object>
+                  <attributes>
+                    <attribute name="text">2</attribute>
+                  </attributes>
+                </child>
+              </object>
+            </child>
           </object>
-          <attributes>
-            <attribute name="text">2</attribute>
-          </attributes>
+          <packing>
+            <property name="expand">True</property>
+            <property name="homogeneous">False</property>
+          </packing>
         </child>
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="top_attach">1</property>
+        <property name="top_attach">0</property>
         <property name="width">1</property>
         <property name="height">1</property>
       </packing>