[ merge from stable ]

2002-06-04  Daniel Elstner  <daniel.elstner@gmx.net>

[ merge from stable ]

* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render): Really fix #83796: Revert jrb's last patch, and move the second if-clause into the fist one's else-branch.  This is also what the other cell renderers do.

7 files changed, 58 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 00f885dd41..138e1af570 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2002-06-04  Daniel Elstner  <daniel.elstner@gmx.net>
+
+	[ merge from stable ]
+
+	* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
+	Really fix #83796: Revert jrb's last patch, and move the second
+	if-clause into the fist one's else-branch.  This is also what
+	the other cell renderers do.
+
 2002-06-03  Federico Mena Quintero  <federico@ximian.com>
 
 	* gdk/gdkpixbuf-drawable.c (rgb565msb): Fix the MSB -> MSB case.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 00f885dd41..138e1af570 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+2002-06-04  Daniel Elstner  <daniel.elstner@gmx.net>
+
+	[ merge from stable ]
+
+	* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
+	Really fix #83796: Revert jrb's last patch, and move the second
+	if-clause into the fist one's else-branch.  This is also what
+	the other cell renderers do.
+
 2002-06-03  Federico Mena Quintero  <federico@ximian.com>
 
 	* gdk/gdkpixbuf-drawable.c (rgb565msb): Fix the MSB -> MSB case.
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 00f885dd41..138e1af570 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,12 @@
+2002-06-04  Daniel Elstner  <daniel.elstner@gmx.net>
+
+	[ merge from stable ]
+
+	* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
+	Really fix #83796: Revert jrb's last patch, and move the second
+	if-clause into the fist one's else-branch.  This is also what
+	the other cell renderers do.
+
 2002-06-03  Federico Mena Quintero  <federico@ximian.com>
 
 	* gdk/gdkpixbuf-drawable.c (rgb565msb): Fix the MSB -> MSB case.
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 00f885dd41..138e1af570 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,12 @@
+2002-06-04  Daniel Elstner  <daniel.elstner@gmx.net>
+
+	[ merge from stable ]
+
+	* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
+	Really fix #83796: Revert jrb's last patch, and move the second
+	if-clause into the fist one's else-branch.  This is also what
+	the other cell renderers do.
+
 2002-06-03  Federico Mena Quintero  <federico@ximian.com>
 
 	* gdk/gdkpixbuf-drawable.c (rgb565msb): Fix the MSB -> MSB case.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 00f885dd41..138e1af570 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+2002-06-04  Daniel Elstner  <daniel.elstner@gmx.net>
+
+	[ merge from stable ]
+
+	* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
+	Really fix #83796: Revert jrb's last patch, and move the second
+	if-clause into the fist one's else-branch.  This is also what
+	the other cell renderers do.
+
 2002-06-03  Federico Mena Quintero  <federico@ximian.com>
 
 	* gdk/gdkpixbuf-drawable.c (rgb565msb): Fix the MSB -> MSB case.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 00f885dd41..138e1af570 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+2002-06-04  Daniel Elstner  <daniel.elstner@gmx.net>
+
+	[ merge from stable ]
+
+	* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
+	Really fix #83796: Revert jrb's last patch, and move the second
+	if-clause into the fist one's else-branch.  This is also what
+	the other cell renderers do.
+
 2002-06-03  Federico Mena Quintero  <federico@ximian.com>
 
 	* gdk/gdkpixbuf-drawable.c (rgb565msb): Fix the MSB -> MSB case.
diff --git a/gtk/gtkcellrenderertoggle.c b/gtk/gtkcellrenderertoggle.c
index 9a1da63364..3831bfee33 100644
--- a/gtk/gtkcellrenderertoggle.c
+++ b/gtk/gtkcellrenderertoggle.c
@@ -304,13 +304,12 @@ gtk_cell_renderer_toggle_render (GtkCellRenderer *cell,
       else
 	state = GTK_STATE_ACTIVE;
     }
-  if (celltoggle->activatable)
-    {
-      state |= GTK_STATE_NORMAL;
-    }
   else
     {
-      state |= GTK_STATE_INSENSITIVE;
+      if (celltoggle->activatable)
+        state = GTK_STATE_NORMAL;
+      else
+        state = GTK_STATE_INSENSITIVE;
     }
 
   if (celltoggle->radio)