[gnome-settings-daemon/gnome-2-26] bgo#556050 - Make the RANDR tray icon's per-monitor labels explicitly black

[Federico Mena Quintero <federico src gnome org>]

commit 8655754322a5864ba87d8bf721bdc6495a17ba17
Author: Federico Mena Quintero <federico novell com>
Date:   Wed May 6 13:02:17 2009 -0500

    bgo#556050 - Make the RANDR tray icon's per-monitor labels explicitly black
    
    The labels are always painted against a light pastel background.  Using
    the theme's colors makes the label hard to read on 'inverse' themes.
    
    Signed-off-by: Federico Mena Quintero <federico novell com>
---
 ChangeLog                           |    9 +++++++++
 plugins/xrandr/gsd-xrandr-manager.c |    7 +++++++
 2 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1067895..bb9fb53 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-05-06  Federico Mena Quintero  <federico novell com>
+
+	* plugins/xrandr/gsd-xrandr-manager.c
+	(make_menu_item_for_output_title): Make the menu item label
+	explicitly black.  We don't want to follow the theme's colors, as
+	the label is always shown against a light pastel background ---
+	using the theme's colors makes the label hard to read on "inverse"
+	themes.  Fixes the gnome-settings-daemon part of bug #556050.
+
 ==================== 2.26.1 ====================
 
 2009-04-14  Jens Granseuer  <jensgr gmx net>
diff --git a/plugins/xrandr/gsd-xrandr-manager.c b/plugins/xrandr/gsd-xrandr-manager.c
index 5dcc900..0610639 100644
--- a/plugins/xrandr/gsd-xrandr-manager.c
+++ b/plugins/xrandr/gsd-xrandr-manager.c
@@ -1019,6 +1019,7 @@ make_menu_item_for_output_title (GsdXrandrManager *manager, GnomeOutputInfo *out
         GtkWidget *item;
         GtkWidget *label;
         char *str;
+	GdkColor black = { 0, 0, 0, 0 };
 
         item = gtk_menu_item_new ();
 
@@ -1030,6 +1031,12 @@ make_menu_item_for_output_title (GsdXrandrManager *manager, GnomeOutputInfo *out
         gtk_label_set_markup (GTK_LABEL (label), str);
         g_free (str);
 
+	/* Make the label explicitly black.  We don't want it to follow the
+	 * theme's colors, since the label is always shown against a light
+	 * pastel background.  See bgo#556050
+	 */
+	gtk_widget_modify_fg (label, GTK_WIDGET_STATE (label), &black);
+
         /* Add padding around the label to fit the box that we'll draw for color-coding */
         gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
         gtk_misc_set_padding (GTK_MISC (label),