murrine r165 - in trunk: . src

[acimitan svn gnome org]

Author: acimitan
Date: Wed Mar 18 18:07:49 2009
New Revision: 165
URL: http://svn.gnome.org/viewvc/murrine?rev=165&view=rev

Log:
2009-03-18  Andrea Cimitan  <andrea cimitan gmail com>

        * NEWS:
        * src/murrine_style.c (murrine_style_draw_shadow),
        (murrine_style_draw_box), (murrine_style_draw_focus):
        Fixed a crash when using focus_color.



Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/src/murrine_style.c

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Wed Mar 18 18:07:49 2009
@@ -1,3 +1,8 @@
+Overview of Changes in 0.90.1.1 (since 0.90.1)
+==============================================
+Changes in this release:
+- Fixed a crash when using focus_color.
+
 Overview of Changes in 0.90.1 (since 0.90.0)
 ============================================
 Changes in this release:

Modified: trunk/src/murrine_style.c
==============================================================================
--- trunk/src/murrine_style.c	(original)
+++ trunk/src/murrine_style.c	Wed Mar 18 18:07:49 2009
@@ -409,7 +409,9 @@
 		/* Focus color */
 		if (murrine_style->has_focus_color)
 		{
-			ge_gdk_color_to_cairo (&murrine_style->focus_color, &focus.color);
+			murrine_gdk_color_to_rgb (&murrine_style->focus_color, &focus.color.r, 
+			                                                       &focus.color.g,
+			                                                       &focus.color.b);
 			focus.has_color = TRUE;
 		}
 		else
@@ -1239,7 +1241,9 @@
 
 		if (murrine_style->has_scrollbar_color)
 		{
-			murrine_gdk_color_to_rgb (&murrine_style->scrollbar_color, &scrollbar.color.r, &scrollbar.color.g, &scrollbar.color.b);
+			murrine_gdk_color_to_rgb (&murrine_style->scrollbar_color, &scrollbar.color.r,
+			                                                           &scrollbar.color.g,
+			                                                           &scrollbar.color.b);
 			scrollbar.has_color = TRUE;
 		}
 
@@ -2130,7 +2134,9 @@
 	/* Focus color */
 	if (murrine_style->has_focus_color)
 	{
-		murrine_gdk_color_to_rgb (&murrine_style->focus_color, &focus.color.r, &focus.color.g, &focus.color.b);
+		murrine_gdk_color_to_rgb (&murrine_style->focus_color, &focus.color.r,
+		                                                       &focus.color.g,
+		                                                       &focus.color.b);
 		focus.has_color = TRUE;
 	}
 	else