[seed] cairo: Fix some warnings while I wait for WebKit to build

[Robert Carr <racarr src gnome org>]

commit 9e7766ce51dfb098abd534bb0d153cc801e2af1b
Author: Robert Carr <racarr svn gnome org>
Date:   Thu May 14 04:33:53 2009 -0400

    cairo: Fix some warnings while I wait for WebKit to build
---
 modules/cairo/Makefile.am                |    1 +
 modules/cairo/seed-cairo-image-surface.c |    6 +++---
 modules/cairo/seed-cairo-image-surface.h |    1 +
 modules/cairo/seed-cairo-surface.c       |    3 ++-
 modules/cairo/seed-cairo.c               |   12 ++++++++----
 modules/os/os.c                          |    4 ++--
 6 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/modules/cairo/Makefile.am b/modules/cairo/Makefile.am
index 272a434..551e677 100644
--- a/modules/cairo/Makefile.am
+++ b/modules/cairo/Makefile.am
@@ -13,6 +13,7 @@ libcairo_la_SOURCES = \
 	seed-cairo-enums.c 
 
 libcairo_la_CFLAGS = \
+	-Wall \
         $(GOBJECT_INTROSPECTION_CFLAGS) \
 	-I top_srcdir@/libseed/ \
 	$(CAIRO_CFLAGS) \
diff --git a/modules/cairo/seed-cairo-image-surface.c b/modules/cairo/seed-cairo-image-surface.c
index aa58f58..9ab8714 100644
--- a/modules/cairo/seed-cairo-image-surface.c
+++ b/modules/cairo/seed-cairo-image-surface.c
@@ -20,6 +20,8 @@
       return seed_make_##res (ctx);}
 
 SeedClass seed_cairo_image_surface_class;
+SeedObject image_surface_constructor_ref;
+
 
 static SeedObject
 seed_object_from_cairo_image_surface (SeedContext ctx, cairo_surface_t *surf)
@@ -119,7 +121,6 @@ void
 seed_define_cairo_image_surface (SeedContext ctx,
 				 SeedObject namespace_ref)
 {
-  SeedObject constructor_ref;
   seed_class_definition image_def = seed_empty_class;
   
   image_def.class_name = "CairoImageSurface";
@@ -127,8 +128,7 @@ seed_define_cairo_image_surface (SeedContext ctx,
   image_def.parent_class = seed_get_cairo_surface_class ();
   seed_cairo_image_surface_class = seed_create_class (&image_def);
   
-  constructor_ref = seed_make_constructor (ctx,
+  image_surface_constructor_ref = seed_make_constructor (ctx,
 					   seed_cairo_image_surface_class,
 					   seed_cairo_construct_image_surface);
-  seed_object_set_property (ctx, namespace_ref, "ImageSurface", constructor_ref);
 }
diff --git a/modules/cairo/seed-cairo-image-surface.h b/modules/cairo/seed-cairo-image-surface.h
index c36132b..b6c3c3a 100644
--- a/modules/cairo/seed-cairo-image-surface.h
+++ b/modules/cairo/seed-cairo-image-surface.h
@@ -4,6 +4,7 @@
 #include <seed.h>
 #include <cairo/cairo.h>
 
+extern SeedObject image_surface_constructor_ref;
 void seed_define_cairo_image_surface (SeedContext ctx, SeedObject namespace_ref);
 
 #endif
diff --git a/modules/cairo/seed-cairo-surface.c b/modules/cairo/seed-cairo-surface.c
index 14f15db..3d2b126 100644
--- a/modules/cairo/seed-cairo-surface.c
+++ b/modules/cairo/seed-cairo-surface.c
@@ -2,6 +2,7 @@
 #include <cairo/cairo.h>
 
 #include "seed-cairo.h"
+#include "seed-cairo-image-surface.h"
 
 #define CAIRO_SURFACE_PRIV(obj) ((cairo_surface_t *)seed_object_get_private(obj))
 
@@ -322,7 +323,7 @@ seed_cairo_surface_has_show_text_glyphs(SeedContext ctx,
 {
   CHECK_THIS(null);
   return seed_value_from_boolean (ctx, 
-				  cairo_surface_has_show_text_glpys (seed_object_to_cairo_surface(ctx, this_object, exception)), exception);
+				  cairo_surface_has_show_text_glyphs (seed_object_to_cairo_surface(ctx, this_object, exception)), exception);
 }
 
 
diff --git a/modules/cairo/seed-cairo.c b/modules/cairo/seed-cairo.c
index bc400f6..96ab97e 100644
--- a/modules/cairo/seed-cairo.c
+++ b/modules/cairo/seed-cairo.c
@@ -1,8 +1,11 @@
 #include <seed.h>
 #include <cairo/cairo.h>
+#include "seed-cairo.h"
 #include "seed-cairo-surface.h"
+#include "seed-cairo-image-surface.h"
 #include "seed-cairo-enums.h"
 
+
 SeedEngine *eng;
 SeedObject namespace_ref;
 
@@ -91,24 +94,25 @@ seed_cairo_construct_context (SeedContext ctx,
 SeedObject
 seed_module_init(SeedEngine * local_eng)
 {
-  SeedObject constructor_ref;
+  SeedObject context_constructor_ref;
   seed_class_definition cairo_def = seed_empty_class;
   eng = local_eng;
   namespace_ref = seed_make_object (eng->context, NULL, NULL);
   
   // Temporary hack until API changes.
   seed_value_protect (eng->context, namespace_ref);
-  seed_define_cairo_surface (eng->context, namespace_ref);
   seed_define_cairo_enums (eng->context, namespace_ref);
+  seed_define_cairo_surface (eng->context, namespace_ref);
   
   cairo_def.class_name = "CairoContext";
   cairo_def.finalize = seed_cairo_context_finalize;
   seed_cairo_context_class = seed_create_class (&cairo_def);
 
-  constructor_ref = seed_make_constructor (eng->context,
+  context_constructor_ref = seed_make_constructor (eng->context,
 					   seed_cairo_context_class,
 					   seed_cairo_construct_context);
-  seed_object_set_property (eng->context, namespace_ref, "ImageSurface", constructor_ref);
+  seed_object_set_property (eng->context, namespace_ref, "Context", context_constructor_ref);
+  seed_object_set_property (eng->context, namespace_ref, "ImageSurface", image_surface_constructor_ref);
   
   return namespace_ref;
 }
diff --git a/modules/os/os.c b/modules/os/os.c
index 32a3d85..753c452 100644
--- a/modules/os/os.c
+++ b/modules/os/os.c
@@ -23,9 +23,9 @@
 
 SeedObject os_namespace;
 
-#define EXPECTED_EXCEPTION(name, argnum, res)				\
+#define EXPECTED_EXCEPTION(name, argnum)				\
   seed_make_exception (ctx, exception, "ArgumentError", name " expected " argnum " got %Zd", argument_count); \
-  return seed_make_##res (ctx);
+  return seed_make_undefined (ctx);
 
 SeedValue
 seed_os_chdir (SeedContext ctx,