[maemo-commits] [maemo-commits] r18019 - in projects/haf/trunk/gtk+: . gtk

[From: subversion at stage.maemo.org]

Author: kris
Date: 2009-04-06 12:33:55 +0300 (Mon, 06 Apr 2009)
New Revision: 18019

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtkcellrenderertoggle.c
Log:
2009-04-06  Kristian Rietveld  <kris at imendio.com>

	Fixes: NB:95718 - Set correct state for GtkCellView in
	HildonCheckButton

	* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
	follow insensitive state of widget requesting rendering.



Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2009-04-06 08:50:41 UTC (rev 18018)
+++ projects/haf/trunk/gtk+/ChangeLog	2009-04-06 09:33:55 UTC (rev 18019)
@@ -1,3 +1,11 @@
+2009-04-06  Kristian Rietveld  <kris at imendio.com>
+
+	Fixes: NB:95718 - Set correct state for GtkCellView in
+	HildonCheckButton
+
+	* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
+	follow insensitive state of widget requesting rendering.
+
 2009-04-02  Michael Natterer  <mitch at imendio.com>
 
 	Fixes: NB#90356 - Do not show shortcuts in legacy application

Modified: projects/haf/trunk/gtk+/gtk/gtkcellrenderertoggle.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkcellrenderertoggle.c	2009-04-06 08:50:41 UTC (rev 18018)
+++ projects/haf/trunk/gtk+/gtk/gtkcellrenderertoggle.c	2009-04-06 09:33:55 UTC (rev 18019)
@@ -353,7 +353,7 @@
   else
     shadow = celltoggle->active ? GTK_SHADOW_IN : GTK_SHADOW_OUT;
 
-  if (!cell->sensitive)
+  if (GTK_WIDGET_STATE (widget) == GTK_STATE_INSENSITIVE || !cell->sensitive)
     {
       state = GTK_STATE_INSENSITIVE;
     }