[gnome-settings-daemon: 4/4] Merge fix for bgo#556050 - fix the label color in the randr tray icon

[Federico Mena Quintero <federico src gnome org>]

commit 74144fa3940471b8157e5bfb1a026fedab4340fd
Merge: dc32cdd... 8655754...
Author: Federico Mena Quintero <federico novell com>
Date:   Wed May 6 13:34:50 2009 -0500

    Merge fix for bgo#556050 - fix the label color in the randr tray icon

 ChangeLog                           |    9 +++++++++
 plugins/xrandr/gsd-xrandr-manager.c |    7 +++++++
 2 files changed, 16 insertions(+), 0 deletions(-)

diff --cc ChangeLog
index c8c90aa,bb9fb53..9a58fa1
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,14 -1,12 +1,23 @@@
+ 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.
+ 
 +2009-04-15  Thomas H.P. Andersen  <phomes gmail com>
 +
 +	* plugins/xrandr/gsd-xrandr-manager.c: (status_icon_start):
 +	* configure.ac: Replace deprecated gtk symbol gtk_status_icon_set_tooltip.
 +	Bump required gtk to 2.16. (bug #578480)
 +
 +2009-04-14  Jens Granseuer  <jensgr gmx net>
 +
 +	* plugins/xrandr/gsd-xrandr-manager.c: (print_countdown_text): use
 +	ngettext for the reset dialog (bug #575409)
 +
  ==================== 2.26.1 ====================
  
  2009-04-14  Jens Granseuer  <jensgr gmx net>