Merge lp:~osomon/software-center/search_box_text_color into lp:software-center

[Olivier Tilloy]

This branch fixes bug #500174.
The fix was backported from the corresponding code in rhythmbox where it was originally copied from.

As a side note, I'm not convinced that the search entry's background color when not empty should be hardcoded to yellowish (or whichever value). I'd rather use a color defined in the current style for the sake of consistency. This should be assessed by a UI designer.

[Michael Vogt (mvo)]

Thanks, I agree that hardcoding the color value is a bad idea. We need to fix this for maverick.

[Michael Vogt (mvo)]

review: Approve

=== modified file 'softwarecenter/view/widgets/searchentry.py'
--- softwarecenter/view/widgets/searchentry.py	2010-02-23 15:36:26 +0000
+++ softwarecenter/view/widgets/searchentry.py	2010-04-20 09:32:22 +0000
@@ -138,12 +138,15 @@
             self.set_icon_from_stock(gtk.ENTRY_ICON_SECONDARY, None)
         # Based on the Rhythmbox code
         yellowish = gtk.gdk.Color(63479, 63479, 48830)
+        black = gtk.gdk.Color(0, 0, 0)
         if self._a11y == True:
             return
         if self.get_text() == "":
             self.modify_base(gtk.STATE_NORMAL, None)
+            self.modify_text(gtk.STATE_NORMAL, None)
         else:
             self.modify_base(gtk.STATE_NORMAL, yellowish)
+            self.modify_text(gtk.STATE_NORMAL, black)
 
 def on_entry_changed(self, terms):
     print terms