[meld] meldwindow: Add a second toolbar to pack a progress indicator in

[Kai Willadsen <kaiw src gnome org>]

commit 72f2277e0e914e17951b29642decbae63353eb07
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Tue Dec 17 06:48:40 2013 +1000

    meldwindow: Add a second toolbar to pack a progress indicator in

 data/ui/meldapp.ui |   11 +++++++++++
 meld/meldwindow.py |    4 +++-
 2 files changed, 14 insertions(+), 1 deletions(-)
---
diff --git a/data/ui/meldapp.ui b/data/ui/meldapp.ui
index 6314f44..246c6fc 100644
--- a/data/ui/meldapp.ui
+++ b/data/ui/meldapp.ui
@@ -13,6 +13,17 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <child>
+          <object class="GtkBox" id="toolbar_holder">
+            <property name="visible">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child>
           <object class="MeldStatusBar" id="statusbar">
             <property name="visible">True</property>
           </object>
diff --git a/meld/meldwindow.py b/meld/meldwindow.py
index e3d5e82..f4fc146 100644
--- a/meld/meldwindow.py
+++ b/meld/meldwindow.py
@@ -195,7 +195,9 @@ class MeldWindow(gnomeglade.Component):
         self._update_page_action_sensitivity()
 
         self.appvbox.pack_start(self.menubar, False, True, 0)
-        self.appvbox.pack_start(self.toolbar, False, True, 0)
+        self.toolbar_holder.pack_start(self.toolbar, True, True, 0)
+        self.secondary_toolbar = Gtk.Toolbar()
+        self.toolbar_holder.pack_end(self.secondary_toolbar, True, True, 0)
         self._menu_context = self.statusbar.get_context_id("Tooltips")
         self.widget.drag_dest_set(
             Gtk.DestDefaults.MOTION | Gtk.DestDefaults.HIGHLIGHT |