Merge lp:~mvo/software-center/lp977889 into lp:software-center

[Michael Vogt]

This fixes the disappearing sort combobox described in bug #977889. To reproduce:

1. search "foo"
2. click on "back"
3. click on "more" in "What's New" in the lobby view
4. click on back
5. search "bar"

with trunk the sort combo is no longer there, with this branch is should be there.

[Gary Lasker (gary-lasker)]

Does the trick perfectly, thanks!

review: Approve

=== modified file 'softwarecenter/ui/gtk3/panes/availablepane.py'
--- softwarecenter/ui/gtk3/panes/availablepane.py	2012-03-30 09:46:20 +0000
+++ softwarecenter/ui/gtk3/panes/availablepane.py	2012-04-10 15:01:24 +0000
@@ -500,6 +500,13 @@
                 iconnames.append(self.db.get_iconname(doc))
         self.backend.install_multiple(apps, iconnames)
 
+    def _show_or_hide_search_combo_box(self, view_state):
+        # show/hide the sort combobox headers if the category forces a
+        # custom sort mode
+        category = view_state.category
+        allow_user_sort = category is None or not category.is_forced_sort_mode
+        self.app_view.set_allow_user_sorting(allow_user_sort)
+
     def set_state(self, nav_item):
         pass
 
@@ -603,6 +610,7 @@
 
         header_strings = self._get_header_for_view_state(view_state)
         self.app_view.set_header_labels(*header_strings)
+        self._show_or_hide_search_combo_box(view_state)
 
         self.app_view.vadj = view_state.vadjustment
 
@@ -631,10 +639,7 @@
 
         header_strings = self._get_header_for_view_state(view_state)
         self.app_view.set_header_labels(*header_strings)
-        # hide the sort combobox headers if the category forces a
-        # custom sort mode
-        allow_user_sort = category is None or not category.is_forced_sort_mode
-        self.app_view.set_allow_user_sorting(allow_user_sort)
+        self._show_or_hide_search_combo_box(view_state)
 
         if view_state.search_term:
             self._clear_search()