[gtk-engines/gnome3: 1/5] Some GNOME 3 theme work.

[Benjamin Berg <bberg src gnome org>]

commit b526f852d551eaf596a4d50cd5e5297c44de40b6
Author: Benjamin Berg <benjamin sipsolutions net>
Date:   Thu Mar 18 21:08:25 2010 +0100

    Some GNOME 3 theme work.

 configure.ac                                 |    4 +++-
 engines/clearlooks/Makefile.am               |    1 +
 engines/clearlooks/src/clearlooks_draw.h     |    1 +
 engines/clearlooks/src/clearlooks_rc_style.c |    7 ++++++-
 engines/clearlooks/src/clearlooks_style.c    |    5 +++++
 engines/clearlooks/src/clearlooks_types.h    |    3 ++-
 themes/Makefile.am                           |    2 +-
 7 files changed, 19 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index b627a3e..842a7c3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,7 +58,7 @@ BUILD_SCHEMAS=""
 
 if test $clearlooks = "yes"; then
 	BUILD_ENGINES="$BUILD_ENGINES clearlooks"
-	BUILD_THEMES="$BUILD_THEMES Clearlooks"
+	BUILD_THEMES="$BUILD_THEMES Clearlooks GNOME3"
 	if test $schemas = "yes"; then
 		BUILD_SCHEMAS="$BUILD_SCHEMAS clearlooks.xml"
 	fi
@@ -185,6 +185,8 @@ engines/lua/Makefile
 themes/Makefile
 themes/Clearlooks/Makefile
 themes/Clearlooks/gtk-2.0/Makefile
+themes/GNOME3/Makefile
+themes/GNOME3/gtk-2.0/Makefile
 themes/Crux/Makefile
 themes/Crux/gtk-2.0/Makefile
 themes/Industrial/Makefile
diff --git a/engines/clearlooks/Makefile.am b/engines/clearlooks/Makefile.am
index 07c46fb..187dc41 100644
--- a/engines/clearlooks/Makefile.am
+++ b/engines/clearlooks/Makefile.am
@@ -39,6 +39,7 @@ libclearlooks_la_SOURCES =		\
 	./src/clearlooks_draw_glossy.c	\
 	./src/clearlooks_draw_inverted.c	\
 	./src/clearlooks_draw_gummy.c	\
+	./src/clearlooks_draw_gnome3.c	\
 	./src/clearlooks_draw.h		\
 	./src/clearlooks_types.h
 
diff --git a/engines/clearlooks/src/clearlooks_draw.h b/engines/clearlooks/src/clearlooks_draw.h
index f5d0dde..cfa9966 100644
--- a/engines/clearlooks/src/clearlooks_draw.h
+++ b/engines/clearlooks/src/clearlooks_draw.h
@@ -36,6 +36,7 @@ GE_INTERNAL void clearlooks_register_style_classic (ClearlooksStyleFunctions *fu
 GE_INTERNAL void clearlooks_register_style_glossy (ClearlooksStyleFunctions *functions, ClearlooksStyleConstants *constants);
 GE_INTERNAL void clearlooks_register_style_gummy (ClearlooksStyleFunctions *functions, ClearlooksStyleConstants *constants);
 GE_INTERNAL void clearlooks_register_style_inverted (ClearlooksStyleFunctions *functions, ClearlooksStyleConstants *constants);
+GE_INTERNAL void clearlooks_register_style_gnome3 (ClearlooksStyleFunctions *functions, ClearlooksStyleConstants *constants);
 
 /* Fallback focus function */
 GE_INTERNAL void clearlooks_draw_focus (cairo_t *cr,
diff --git a/engines/clearlooks/src/clearlooks_rc_style.c b/engines/clearlooks/src/clearlooks_rc_style.c
index 31c464b..d042895 100644
--- a/engines/clearlooks/src/clearlooks_rc_style.c
+++ b/engines/clearlooks/src/clearlooks_rc_style.c
@@ -68,6 +68,7 @@ enum
 	TOKEN_GLOSSY,
 	TOKEN_INVERTED,
 	TOKEN_GUMMY,
+	TOKEN_GNOME3,
 
 	TOKEN_TRUE,
 	TOKEN_FALSE,
@@ -97,6 +98,7 @@ static gchar* clearlooks_rc_symbols =
 	"GLOSSY\0"
 	"INVERTED\0"
 	"GUMMY\0"
+	"GNOME3\0"
 
 	"TRUE\0"
 	"FALSE\0";
@@ -256,7 +258,7 @@ clearlooks_gtk2_rc_parse_style (GtkSettings      *settings,
 {
 	guint token;
 
-	g_assert (CL_NUM_STYLES == CL_STYLE_GUMMY + 1); /* so that people don't forget ;-) */
+	g_assert (CL_NUM_STYLES == CL_STYLE_GNOME3 + 1); /* so that people don't forget ;-) */
 
 	/* Skip 'style' */
 	token = g_scanner_get_next_token (scanner);
@@ -281,6 +283,9 @@ clearlooks_gtk2_rc_parse_style (GtkSettings      *settings,
 		case TOKEN_GUMMY:
 		   *style = CL_STYLE_GUMMY;
 		   break;
+		case TOKEN_GNOME3:
+		   *style = CL_STYLE_GNOME3;
+		   break;
 		default:
 		   return TOKEN_CLASSIC;
 	}
diff --git a/engines/clearlooks/src/clearlooks_style.c b/engines/clearlooks/src/clearlooks_style.c
index 97ff857..240a662 100644
--- a/engines/clearlooks/src/clearlooks_style.c
+++ b/engines/clearlooks/src/clearlooks_style.c
@@ -2022,6 +2022,11 @@ clearlooks_style_class_init (ClearlooksStyleClass * klass)
 	klass->style_constants[CL_STYLE_GUMMY] = klass->style_constants[CL_STYLE_CLASSIC];
 	clearlooks_register_style_gummy (&klass->style_functions[CL_STYLE_GUMMY],
 	                                 &klass->style_constants[CL_STYLE_GUMMY]);
+
+	klass->style_functions[CL_STYLE_GNOME3] = klass->style_functions[CL_STYLE_CLASSIC];
+	klass->style_constants[CL_STYLE_GNOME3] = klass->style_constants[CL_STYLE_CLASSIC];
+	clearlooks_register_style_gnome3 (&klass->style_functions[CL_STYLE_GNOME3],
+	                                  &klass->style_constants[CL_STYLE_GNOME3]);
 }
 
 static void
diff --git a/engines/clearlooks/src/clearlooks_types.h b/engines/clearlooks/src/clearlooks_types.h
index 7751d97..2c08cfb 100644
--- a/engines/clearlooks/src/clearlooks_types.h
+++ b/engines/clearlooks/src/clearlooks_types.h
@@ -37,7 +37,8 @@ typedef enum
 	CL_STYLE_GLOSSY = 1,
 	CL_STYLE_INVERTED = 2,
 	CL_STYLE_GUMMY = 3,
-	CL_NUM_STYLES = 4
+	CL_STYLE_GNOME3 = 4,
+	CL_NUM_STYLES = 5
 } ClearlooksStyles;
 
 typedef enum
diff --git a/themes/Makefile.am b/themes/Makefile.am
index 2b761b4..c672744 100644
--- a/themes/Makefile.am
+++ b/themes/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = $(BUILD_THEMES)
 
-DIST_SUBDIRS = Clearlooks Industrial Redmond Crux Mist ThinIce
+DIST_SUBDIRS = GNOME3 Clearlooks Industrial Redmond Crux Mist ThinIce
 
 -include $(top_srcdir)/git.mk