[seed] cairo: Some code reorg

[Robert Carr <racarr src gnome org>]

commit f3061db7b8d4d454d96ff2fb0709959d575fee1f
Author: Robert Carr <racarr svn gnome org>
Date:   Thu May 14 04:44:06 2009 -0400

    cairo: Some code reorg
---
 modules/cairo/seed-cairo-image-surface.c |    1 +
 modules/cairo/seed-cairo-image-surface.h |    1 -
 modules/cairo/seed-cairo.c               |    9 ++++-----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/modules/cairo/seed-cairo-image-surface.c b/modules/cairo/seed-cairo-image-surface.c
index 9ab8714..debc78f 100644
--- a/modules/cairo/seed-cairo-image-surface.c
+++ b/modules/cairo/seed-cairo-image-surface.c
@@ -131,4 +131,5 @@ seed_define_cairo_image_surface (SeedContext 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", image_surface_constructor_ref);
 }
diff --git a/modules/cairo/seed-cairo-image-surface.h b/modules/cairo/seed-cairo-image-surface.h
index b6c3c3a..c36132b 100644
--- a/modules/cairo/seed-cairo-image-surface.h
+++ b/modules/cairo/seed-cairo-image-surface.h
@@ -4,7 +4,6 @@
 #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.c b/modules/cairo/seed-cairo.c
index 96ab97e..cfa7ba5 100644
--- a/modules/cairo/seed-cairo.c
+++ b/modules/cairo/seed-cairo.c
@@ -7,7 +7,6 @@
 
 
 SeedEngine *eng;
-SeedObject namespace_ref;
 
 #define CAIRO_CONTEXT_PRIV(obj) ((cairo_t *)seed_object_get_private(obj))
 
@@ -94,6 +93,7 @@ seed_cairo_construct_context (SeedContext ctx,
 SeedObject
 seed_module_init(SeedEngine * local_eng)
 {
+  SeedObject namespace_ref;
   SeedObject context_constructor_ref;
   seed_class_definition cairo_def = seed_empty_class;
   eng = local_eng;
@@ -101,7 +101,7 @@ seed_module_init(SeedEngine * local_eng)
   
   // Temporary hack until API changes.
   seed_value_protect (eng->context, namespace_ref);
-  seed_define_cairo_enums (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";
@@ -109,10 +109,9 @@ seed_module_init(SeedEngine * local_eng)
   seed_cairo_context_class = seed_create_class (&cairo_def);
 
   context_constructor_ref = seed_make_constructor (eng->context,
-					   seed_cairo_context_class,
-					   seed_cairo_construct_context);
+						   seed_cairo_context_class,
+						   seed_cairo_construct_context);
   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;
 }