From 202d25a4af0406af3847f1fa2e93121622abb7a9 Mon Sep 17 00:00:00 2001
From: Andy Spencer <andy753421@gmail.com>
Date: Tue, 10 Nov 2009 01:24:43 +0000
Subject: [PATCH] Get example plugin working again

* Remove <config.h> from include files
* Add a second slower but higher priority split-merge callback
---
 examples/plugin/teapot.c |  2 +-
 src/gis-opengl.c         | 13 +++++++++----
 src/gis-opengl.h         |  2 +-
 src/gis-tile.h           |  1 -
 src/gis-wms.h            |  1 -
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/examples/plugin/teapot.c b/examples/plugin/teapot.c
index 9ecfd88..982756c 100644
--- a/examples/plugin/teapot.c
+++ b/examples/plugin/teapot.c
@@ -18,7 +18,7 @@
 #include <gtk/gtkgl.h>
 #include <GL/gl.h>
 
-#include <gis.h>
+#include <gis/gis.h>
 
 #include "teapot.h"
 
diff --git a/src/gis-opengl.c b/src/gis-opengl.c
index 60ed821..c1d48ac 100644
--- a/src/gis-opengl.c
+++ b/src/gis-opengl.c
@@ -450,7 +450,8 @@ static void gis_opengl_init(GisOpenGL *self)
 	g_object_set(self, "can-focus", TRUE, NULL);
 
 #ifndef ROAM_DEBUG
-	self->sm_source = g_timeout_add_full(G_PRIORITY_HIGH_IDLE+30, 33,  (GSourceFunc)on_idle, self, NULL);
+	self->sm_source[0] = g_timeout_add_full(G_PRIORITY_HIGH_IDLE+30, 33,  (GSourceFunc)on_idle, self, NULL);
+	self->sm_source[1] = g_timeout_add_full(G_PRIORITY_HIGH_IDLE+10, 500, (GSourceFunc)on_idle, self, NULL);
 #endif
 
 	g_signal_connect(self, "realize",            G_CALLBACK(on_realize),      NULL);
@@ -472,9 +473,13 @@ static void gis_opengl_dispose(GObject *_self)
 {
 	g_debug("GisOpenGL: dispose");
 	GisOpenGL *self = GIS_OPENGL(_self);
-	if (self->sm_source) {
-		g_source_remove(self->sm_source);
-		self->sm_source = 0;
+	if (self->sm_source[0]) {
+		g_source_remove(self->sm_source[0]);
+		self->sm_source[0] = 0;
+	}
+	if (self->sm_source[1]) {
+		g_source_remove(self->sm_source[1]);
+		self->sm_source[1] = 0;
 	}
 	if (self->sphere) {
 		roam_sphere_free(self->sphere);
diff --git a/src/gis-opengl.h b/src/gis-opengl.h
index 256d0d0..d55254f 100644
--- a/src/gis-opengl.h
+++ b/src/gis-opengl.h
@@ -47,7 +47,7 @@ struct _GisOpenGL {
 	GisView    *view;
 	GisPlugins *plugins;
 	RoamSphere *sphere;
-	guint       sm_source;
+	guint       sm_source[2];
 
 	/* for testing */
 	gboolean    wireframe;
diff --git a/src/gis-tile.h b/src/gis-tile.h
index 4db4f4b..d21b771 100644
--- a/src/gis-tile.h
+++ b/src/gis-tile.h
@@ -18,7 +18,6 @@
 #ifndef __GIS_TILE_H__
 #define __GIS_TILE_H__
 
-#include <config.h>
 #include <glib.h>
 
 typedef struct _GisTile        GisTile;
diff --git a/src/gis-wms.h b/src/gis-wms.h
index 4151cbf..98c5c01 100644
--- a/src/gis-wms.h
+++ b/src/gis-wms.h
@@ -18,7 +18,6 @@
 #ifndef __GIS_WMS_H__
 #define __GIS_WMS_H__
 
-#include <config.h>
 #include <glib.h>
 #include <libsoup/soup.h>
 
-- 
2.43.2