rhythmbox r5575 - in trunk: . widgets

[jmatthew svn gnome org]

Author: jmatthew
Date: Tue Feb 12 14:15:08 2008
New Revision: 5575
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=5575&view=rev

Log:
2008-02-13  Jonathan Matthew  <jonathan d14n org>

	* widgets/rb-search-entry.c: (rb_search_entry_check_style):
	Make the text in the search box black, regardless of theme colour,
	since we make the background yellow the same way.  Fixes #414699.


Modified:
   trunk/ChangeLog
   trunk/widgets/rb-search-entry.c

Modified: trunk/widgets/rb-search-entry.c
==============================================================================
--- trunk/widgets/rb-search-entry.c	(original)
+++ trunk/widgets/rb-search-entry.c	Tue Feb 12 14:15:08 2008
@@ -192,23 +192,19 @@
 static void
 rb_search_entry_check_style (RBSearchEntry *entry)
 {
-	/*GdkColor fg_colour;*/
-	GdkColor bg_colour;
-	static const GdkColor fallback_bg_colour = { 0, 0xf7f7, 0xf7f7, 0xbebe }; /* yellow-ish */
+	static const GdkColor bg_colour = { 0, 0xf7f7, 0xf7f7, 0xbebe }; /* yellow-ish */
+	static const GdkColor fg_colour = { 0, 0, 0, 0 }; /* black. */
 	const gchar* text;
 
 	if (entry->priv->is_a11y_theme)
 		return;
 
-	/*fg_colour = GTK_WIDGET(entry)->style->text[GTK_STATE_NORMAL];*/
-	bg_colour = fallback_bg_colour;
-
 	text = gtk_entry_get_text (GTK_ENTRY (entry->priv->entry));
 	if (text && *text) {
-		/*gtk_widget_modify_text (entry->priv->entry, GTK_STATE_NORMAL, &fg_colour);*/
+		gtk_widget_modify_text (entry->priv->entry, GTK_STATE_NORMAL, &fg_colour);
 		gtk_widget_modify_base (entry->priv->entry, GTK_STATE_NORMAL, &bg_colour);
 	} else {
-		/*gtk_widget_modify_text (entry->priv->entry, GTK_STATE_NORMAL, NULL);*/
+		gtk_widget_modify_text (entry->priv->entry, GTK_STATE_NORMAL, NULL);
 		gtk_widget_modify_base (entry->priv->entry, GTK_STATE_NORMAL, NULL);
 	}