[geary/gtk-3.10: 50/50] Regression: Search upgrade prog monitor not shown

[Jim Nelson <jnelson src gnome org>]

commit b482808c79c9bc1a7c82e91eb390bfa4f4dde38c
Author: Jim Nelson <jim yorba org>
Date:   Tue May 27 15:00:43 2014 -0700

    Regression: Search upgrade prog monitor not shown

 src/client/components/main-toolbar.vala |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/src/client/components/main-toolbar.vala b/src/client/components/main-toolbar.vala
index ee03aa8..5168d9d 100644
--- a/src/client/components/main-toolbar.vala
+++ b/src/client/components/main-toolbar.vala
@@ -80,6 +80,7 @@ public class MainToolbar : PillToolbar {
         search_entry.key_press_event.connect(on_search_key_press);
         on_search_entry_changed(); // set initial state
         search_entry.has_focus = true;
+        add_end(search_upgrade_progress_bar);
         add_end(search_entry);
         
         // Search upgrade progress bar.
@@ -87,12 +88,6 @@ public class MainToolbar : PillToolbar {
         search_upgrade_progress_bar.margin_bottom = 3;
         search_upgrade_progress_bar.show_text = true;
         
-        // Set the progress bar's width to match the search entry's width.
-        int minimum_width = 0;
-        int natural_width = 0;
-        search_entry.get_preferred_width(out minimum_width, out natural_width);
-        search_upgrade_progress_bar.width_request = minimum_width;
-        
         // Application button.  If we exported an app menu, we don't need this.
         if (!Gtk.Settings.get_default().gtk_shell_shows_app_menu) {
             insert.clear();
@@ -157,6 +152,12 @@ public class MainToolbar : PillToolbar {
     }
     
     private void on_search_upgrade_start() {
+        // Set the progress bar's width to match the search entry's width.
+        int minimum_width = 0;
+        int natural_width = 0;
+        search_entry.get_preferred_width(out minimum_width, out natural_width);
+        search_upgrade_progress_bar.width_request = minimum_width;
+        
         search_entry.hide();
         search_upgrade_progress_bar.show();
     }