Merge lp:~evfool/software-center/fixnavigation into lp:software-center

[Robert Roth]

As using the search terms did update the search terms for the category pathbutton in this case, thus resulting in wrong navigation item. The fix restricts the updating search terms functionality to Search pathbar elements only, this way we won't have search terms stored in non-search pathbar elements, which seems to be the expected behavior.

[Gary Lasker (gary-lasker)]

Nice fix, thanks Robert!

review: Approve

=== modified file 'softwarecenter/ui/gtk/navhistory.py'
--- softwarecenter/ui/gtk/navhistory.py	2011-05-17 08:02:58 +0000
+++ softwarecenter/ui/gtk/navhistory.py	2011-06-24 08:07:27 +0000
@@ -19,6 +19,7 @@
 import gobject
 import logging
 
+from softwarecenter.enums import NavButtons
 from softwarecenter.utils import unescape
 
 # FIXME: sucks, move elsewhere
@@ -99,7 +100,9 @@
         """
         The search terms changed, track them in the current navigation item
         """
-        self._nav_stack[self._nav_stack.cursor].apps_search_term = terms
+        # only track search term changes in search pathbar items (lp: #801114)
+        if self._nav_stack[self._nav_stack.cursor].parts[-1].get_name() == NavButtons.SEARCH:
+            self._nav_stack[self._nav_stack.cursor].apps_search_term = terms
 
     def reset(self):
         """