gtk-engines r1039 - in trunk: . engines/clearlooks/src themes/Clearlooks/gtk-2.0

[acimitan svn gnome org]

Author: acimitan
Date: Mon Jan 28 19:33:18 2008
New Revision: 1039
URL: http://svn.gnome.org/viewvc/gtk-engines?rev=1039&view=rev

Log:
2008-01-28  Andrea Cimitan  <andrea cimitan gmail com>

	* engines/clearlooks/src/clearlooks_rc_style.c:
	(clearlooks_rc_style_init):
	* engines/clearlooks/src/clearlooks_style.c:
	(clearlooks_style_init_from_rc):
	* themes/Clearlooks/gtk-2.0/gtkrc:
	Clearlooks/Gummy MUST set reliefstyle = 1 to looks as the 
	default theme.
	You should update your Clearlooks themes!


Modified:
   trunk/ChangeLog
   trunk/engines/clearlooks/src/clearlooks_rc_style.c
   trunk/engines/clearlooks/src/clearlooks_style.c
   trunk/themes/Clearlooks/gtk-2.0/gtkrc

Modified: trunk/engines/clearlooks/src/clearlooks_rc_style.c
==============================================================================
--- trunk/engines/clearlooks/src/clearlooks_rc_style.c	(original)
+++ trunk/engines/clearlooks/src/clearlooks_rc_style.c	Mon Jan 28 19:33:18 2008
@@ -133,6 +133,7 @@
 	clearlooks_rc->flags = 0;
 
 	clearlooks_rc->contrast = 1.0;
+	clearlooks_rc->reliefstyle = 0;
 	clearlooks_rc->menubarstyle = 0;
 	clearlooks_rc->toolbarstyle = 0;
 	clearlooks_rc->animation = FALSE;

Modified: trunk/engines/clearlooks/src/clearlooks_style.c
==============================================================================
--- trunk/engines/clearlooks/src/clearlooks_style.c	(original)
+++ trunk/engines/clearlooks/src/clearlooks_style.c	Mon Jan 28 19:33:18 2008
@@ -1237,15 +1237,7 @@
 	g_assert ((CLEARLOOKS_RC_STYLE (rc_style)->style >= 0) && (CLEARLOOKS_RC_STYLE (rc_style)->style < CL_NUM_STYLES));
 	clearlooks_style->style               = CLEARLOOKS_RC_STYLE (rc_style)->style;
 
-	if (!(CLEARLOOKS_RC_STYLE (rc_style)->flags & CL_FLAG_RELIEFSTYLE))
-	{
-		if (clearlooks_style->style == CL_STYLE_GUMMY)
-			clearlooks_style->reliefstyle = 1;
-		else
-			clearlooks_style->reliefstyle = 0;
-	}
-	else
-		clearlooks_style->reliefstyle = CLEARLOOKS_RC_STYLE (rc_style)->reliefstyle;
+	clearlooks_style->reliefstyle         = CLEARLOOKS_RC_STYLE (rc_style)->reliefstyle;
 	clearlooks_style->menubarstyle        = CLEARLOOKS_RC_STYLE (rc_style)->menubarstyle;
 	clearlooks_style->toolbarstyle        = CLEARLOOKS_RC_STYLE (rc_style)->toolbarstyle;
 	clearlooks_style->has_focus_color     = CLEARLOOKS_RC_STYLE (rc_style)->flags & CL_FLAG_FOCUS_COLOR;

Modified: trunk/themes/Clearlooks/gtk-2.0/gtkrc
==============================================================================
--- trunk/themes/Clearlooks/gtk-2.0/gtkrc	(original)
+++ trunk/themes/Clearlooks/gtk-2.0/gtkrc	Mon Jan 28 19:33:18 2008
@@ -65,10 +65,11 @@
 	engine "clearlooks" 
 	{
 		colorize_scrollbar = TRUE
-		menubarstyle      = 2      # 0 = flat, 1 = sunken, 2 = flat gradient
-		toolbarstyle      = 1      # 0 = flat, 1 = enable effects
-		animation         = FALSE
-		style             = GUMMY
+		reliefstyle        = 1
+		menubarstyle       = 2      # 0 = flat, 1 = sunken, 2 = flat gradient
+		toolbarstyle       = 1      # 0 = flat, 1 = enable effects
+		animation          = FALSE
+		style              = GUMMY
 
 		# Set a hint to disable backward compatibility fallbacks.
 		hint = "use-hints"