[metacity/cowbell: 4/11] fixed stubs; but they are still only stubs.

[Thomas James Alexander Thurman <tthurman src gnome org>]

commit f834e8c1e68779bb14ec6ba906b124b79c5d31f3
Author: Thomas Thurman <tthurman gnome org>
Date:   Sun Sep 20 17:42:57 2009 -0400

    fixed stubs; but they are still only stubs.

 src/Makefile.am |   13 ++++---------
 src/ui/theme.c  |    5 +++++
 src/ui/theme.h  |   12 ++++++++++++
 3 files changed, 21 insertions(+), 9 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index bd3420f..403ed0c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -90,8 +90,6 @@ metacity_SOURCES= 				\
 	include/resizepopup.h			\
 	ui/tabpopup.c				\
 	include/tabpopup.h				\
-	ui/theme-parser.c			\
-	ui/theme-parser.h			\
 	ui/theme.c				\
 	ui/theme.h				\
 	ui/themewidget.c			\
@@ -112,8 +110,6 @@ libmetacity_private_la_SOURCES=			\
 	include/common.h			\
 	ui/preview-widget.c			\
 	ui/preview-widget.h			\
-	ui/theme-parser.c			\
-	ui/theme-parser.h			\
 	ui/theme.c				\
 	ui/theme.h
 
@@ -128,11 +124,10 @@ libmetacityinclude_HEADERS =			\
 	include/util.h				\
 	include/common.h			\
 	ui/preview-widget.h			\
-	ui/theme-parser.h			\
 	ui/theme.h
 
-metacity_theme_viewer_SOURCES=  \
-	ui/theme-viewer.c
+#metacity_theme_viewer_SOURCES=  \
+#	ui/theme-viewer.c
 
 schema_bindings_SOURCES =       \
         core/schema-bindings.c			\
@@ -143,11 +138,11 @@ metacity.schemas.in: schema_bindings ${srcdir}/metacity.schemas.in.in
 	@echo Generating keybinding schemas... ${srcdir}/metacity.schemas.in.in
 	${builddir}/schema_bindings ${srcdir}/metacity.schemas.in.in ${builddir}/metacity.schemas.in
 
-bin_PROGRAMS=metacity metacity-theme-viewer
+bin_PROGRAMS=metacity # metacity-theme-viewer
 
 EFENCE=
 metacity_LDADD= METACITY_LIBS@ $(EFENCE)
-metacity_theme_viewer_LDADD= @METACITY_LIBS@ libmetacity-private.la
+#metacity_theme_viewer_LDADD= @METACITY_LIBS@ libmetacity-private.la
 
 testboxes_SOURCES=include/util.h core/util.c include/boxes.h core/boxes.c core/testboxes.c
 testgradient_SOURCES=ui/gradient.h ui/gradient.c ui/testgradient.c
diff --git a/src/ui/theme.c b/src/ui/theme.c
index cedf8ef..7acab38 100644
--- a/src/ui/theme.c
+++ b/src/ui/theme.c
@@ -6,6 +6,7 @@ MetaTheme*
 meta_theme_get_current (void)
 {
   /* stub */
+  return NULL;
 }
 
 void
@@ -21,6 +22,7 @@ meta_theme_get_frame_style (MetaTheme     *theme,
                             MetaFrameFlags flags)
 {
   /* stub */
+  return NULL;
 }
 
 double
@@ -29,6 +31,7 @@ meta_theme_get_title_scale (MetaTheme     *theme,
                             MetaFrameFlags flags)
 {
   /* stub */
+  return 0.0;
 }
 
 void
@@ -85,6 +88,7 @@ meta_gtk_widget_get_font_desc        (GtkWidget            *widget,
                                       const PangoFontDescription *override)
 {
   /* stub */
+  return NULL;
 }
 
 int
@@ -92,6 +96,7 @@ meta_pango_font_desc_get_text_height (const PangoFontDescription *font_desc,
                                       PangoContext         *context)
 {
   /* stub */
+  return 0;
 }
 
 #if 0
diff --git a/src/ui/theme.h b/src/ui/theme.h
index 64ddf50..e3f0ba7 100644
--- a/src/ui/theme.h
+++ b/src/ui/theme.h
@@ -59,6 +59,11 @@ typedef enum
   META_BUTTON_STATE_LAST
 } MetaButtonState;
 
+typedef struct
+{
+  gboolean dummy;
+} MetaColorSpec;
+
 /**
  * The computed size of a button (really just a way of tying its
  * visible and clickable areas together).
@@ -131,6 +136,13 @@ typedef struct {
 
 typedef struct {
   gboolean dummy;
+
+  /**
+   * Background colour of the window. Only present in theme formats
+   * 2 and above. Can be NULL to use the standard GTK theme engine.
+   */
+  MetaColorSpec *window_background_color;
+
 } MetaFrameStyle;
 
 MetaTheme* meta_theme_get_current (void);