Get example plugin working again

* Remove <config.h> from include files
* Add a second slower but higher priority split-merge callback

diff --git a/examples/plugin/teapot.c b/examples/plugin/teapot.c
index 9ecfd88cd21d3c7d3c2bb56f38c2cc3605aa7d21..982756c42970071f10af723ee084a5f5e9f61b0d 100644 (file)
--- 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 60ed8218304af8c790a2160d55c95272155bff8b..c1d48ace1b691802c56482b2428aa11332c42a68 100644 (file)
--- 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 256d0d077600e2f7da097aefb3f819dccab43db6..d55254f6ed606d44607e57b8ffcfc4e28f900255 100644 (file)
--- 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 4db4f4bace9867ea426c2ef2ef469e34e4a7dd2e..d21b771477076aaa51406d66d1f7c0f713f52ba1 100644 (file)
--- 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 4151cbfb517a1a82ea12809950496258740690c7..98c5c015bc0deb0426d6eaa1bbb4f31b96f05293 100644 (file)
--- 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>