From 70ed2f423371befa980d116f1e5c432fcd591c1e Mon Sep 17 00:00:00 2001
From: Matthew Allum <mallum@openedhand.com>
Date: Mon, 29 May 2006 20:01:49 +0000
Subject: [PATCH] 2006-05-29  Matthew Allum  <mallum@openedhand.com>

        * clutter/clutter-color.c: (clutter_color_set):
        Fix bit shifts in clutter color setters.
---
 ChangeLog               | 5 +++++
 clutter/clutter-color.c | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cb87c31d6..37056d194 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-29  Matthew Allum  <mallum@openedhand.com>
+
+	* clutter/clutter-color.c: (clutter_color_set):
+	Fix bit shifts in clutter color setters.
+
 2006-05-29  Matthew Allum  <mallum@openedhand.com>
 
 	* clutter/clutter-element.c:
diff --git a/clutter/clutter-color.c b/clutter/clutter-color.c
index f2bc38e5b..7b29e6e08 100644
--- a/clutter/clutter-color.c
+++ b/clutter/clutter-color.c
@@ -28,7 +28,7 @@
 ClutterColor
 clutter_color_new (guint8 r, guint8 g, guint8 b, guint8 a)
 {
-  return ( r | g << 8 | b << 16 | a << 24 );
+  return ( a | b << 8 | g << 16  | r << 24 );
 }
 
 void
@@ -38,7 +38,7 @@ clutter_color_set (ClutterColor *color,
 		   guint8        b, 
 		   guint8        a)
 {
-  *color = ( r | g << 8 | b << 16 | a << 24 );
+  *color = ( a | b << 8 | g << 16  | r << 24 );
 }
 
 void