From c9865c176b97e2082a998b439ec51c31832e55f6 Mon Sep 17 00:00:00 2001
From: Andy Spencer <andy753421@gmail.com>
Date: Sat, 14 Nov 2009 14:33:18 +0000
Subject: [PATCH] Update example plugin

---
 examples/plugin/teapot.c | 17 +++--------------
 examples/plugin/teapot.h |  4 ++--
 src/plugins/Makefile.am  |  5 +++++
 3 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/examples/plugin/teapot.c b/examples/plugin/teapot.c
index 982756c..06d466e 100644
--- a/examples/plugin/teapot.c
+++ b/examples/plugin/teapot.c
@@ -30,7 +30,7 @@ static gboolean rotate(gpointer _self)
 	GisPluginTeapot *self = _self;
 	if (gtk_toggle_button_get_active(self->button)) {
 		self->rotation += 1.0;
-		gis_opengl_redraw(self->opengl);
+		gtk_widget_queue_draw(GTK_WIDGET(self->viewer));
 	}
 	return TRUE;
 }
@@ -39,12 +39,11 @@ static gboolean rotate(gpointer _self)
 /***********
  * Methods *
  ***********/
-GisPluginTeapot *gis_plugin_teapot_new(GisWorld *world, GisView *view, GisOpenGL *opengl)
+GisPluginTeapot *gis_plugin_teapot_new(GisViewer *viewer, GisPrefs *prefs)
 {
 	g_debug("GisPluginTeapot: new");
 	GisPluginTeapot *self = g_object_new(GIS_TYPE_PLUGIN_TEAPOT, NULL);
-	self->opengl = opengl;
-
+	self->viewer = viewer;
 	return self;
 }
 
@@ -105,7 +104,6 @@ static void gis_plugin_teapot_init(GisPluginTeapot *self)
 	self->button    = GTK_TOGGLE_BUTTON(gtk_toggle_button_new_with_label("Rotate"));
 	self->rotate_id = g_timeout_add(1000/60, rotate, self);
 	self->rotation  = 30.0;
-	self->opengl    = NULL;
 }
 static void gis_plugin_teapot_dispose(GObject *gobject)
 {
@@ -115,18 +113,9 @@ static void gis_plugin_teapot_dispose(GObject *gobject)
 	/* Drop references */
 	G_OBJECT_CLASS(gis_plugin_teapot_parent_class)->dispose(gobject);
 }
-static void gis_plugin_teapot_finalize(GObject *gobject)
-{
-	g_debug("GisPluginTeapot: finalize");
-	GisPluginTeapot *self = GIS_PLUGIN_TEAPOT(gobject);
-	/* Free data */
-	G_OBJECT_CLASS(gis_plugin_teapot_parent_class)->finalize(gobject);
-
-}
 static void gis_plugin_teapot_class_init(GisPluginTeapotClass *klass)
 {
 	g_debug("GisPluginTeapot: class_init");
 	GObjectClass *gobject_class = (GObjectClass*)klass;
 	gobject_class->dispose  = gis_plugin_teapot_dispose;
-	gobject_class->finalize = gis_plugin_teapot_finalize;
 }
diff --git a/examples/plugin/teapot.h b/examples/plugin/teapot.h
index 1baf358..34b5cb1 100644
--- a/examples/plugin/teapot.h
+++ b/examples/plugin/teapot.h
@@ -34,10 +34,10 @@ struct _GisPluginTeapot {
 	GObject parent_instance;
 
 	/* instance members */
+	GisViewer       *viewer;
 	GtkToggleButton *button;
 	guint            rotate_id;
 	float            rotation;
-	GisOpenGL       *opengl;
 };
 
 struct _GisPluginTeapotClass {
@@ -47,6 +47,6 @@ struct _GisPluginTeapotClass {
 GType gis_plugin_teapot_get_type();
 
 /* Methods */
-GisPluginTeapot *gis_plugin_teapot_new(GisWorld *world, GisView *view, GisOpenGL *opengl);
+GisPluginTeapot *gis_plugin_teapot_new(GisViewer *viewer, GisPrefs *prefs);
 
 #endif
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 7d27bc6..905bfd7 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -12,5 +12,10 @@ bmng_la_SOURCES     = bmng.c bmng.h
 srtm_la_SOURCES     = srtm.c srtm.h
 test_la_SOURCES     = test.c test.h
 
+noinst_LTLIBRARIES  = teapot.la
+teapot_la_SOURCES   = \
+	$(top_srcdir)/examples/plugin/teapot.c
+	$(top_srcdir)/examples/plugin/teapot.h
+
 test:
 	( cd ../; make test )
-- 
2.43.2