murrine r166 - in trunk: . src

[acimitan svn gnome org]

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

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

	* configure.ac:
	* src/murrine_rc_style.c (theme_parse_color),
	(murrine_rc_style_parse):
	Bumped Gtk+ version to 2.12.0.
	Use gtk_rc_parse_color_full (Gtk+ 2.12.0), which allows using
	symbolic colors for focus_color and scrollbar_color.


Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/src/murrine_rc_style.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Wed Mar 18 18:16:56 2009
@@ -36,8 +36,8 @@
               [rgba=$enableval],
               [rgba="yes"], )
 
-PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.10.0,,
-                  AC_MSG_ERROR([GTK+-2.10 is required to compile murrine]))
+PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.12.0,,
+                  AC_MSG_ERROR([GTK+-2.12 is required to compile murrine]))
 
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)

Modified: trunk/src/murrine_rc_style.c
==============================================================================
--- trunk/src/murrine_rc_style.c	(original)
+++ trunk/src/murrine_rc_style.c	Wed Mar 18 18:16:56 2009
@@ -243,6 +243,7 @@
 static guint
 theme_parse_color (GtkSettings  *settings,
                    GScanner     *scanner,
+                   GtkRcStyle   *style,
                    GdkColor     *color)
 {
 	guint token;
@@ -254,7 +255,7 @@
 	if (token != G_TOKEN_EQUAL_SIGN)
 		return G_TOKEN_EQUAL_SIGN;
 
-	return gtk_rc_parse_color (scanner, color);
+	return gtk_rc_parse_color_full (scanner, style, color);
 }
 
 static guint
@@ -479,7 +480,7 @@
 				murrine_style->flags |= MRN_FLAG_CONTRAST;
 				break;
 			case TOKEN_FOCUS_COLOR:
-				token = theme_parse_color (settings, scanner, &murrine_style->focus_color);
+				token = theme_parse_color (settings, scanner, rc_style, &murrine_style->focus_color);
 				murrine_style->flags |= MRN_FLAG_FOCUS_COLOR;
 				murrine_style->has_focus_color = TRUE;
 				break;
@@ -560,7 +561,7 @@
 				murrine_style->flags |= MRN_FLAG_ROUNDNESS;
 				break;
 			case TOKEN_SCROLLBAR_COLOR:
-				token = theme_parse_color (settings, scanner, &murrine_style->scrollbar_color);
+				token = theme_parse_color (settings, scanner, rc_style, &murrine_style->scrollbar_color);
 				murrine_style->flags |= MRN_FLAG_SCROLLBAR_COLOR;
 				murrine_style->has_scrollbar_color = TRUE;
 				break;