* Remove <config.h> from include files
* Add a second slower but higher priority split-merge callback
#include <gtk/gtkgl.h>
#include <GL/gl.h>
#include <gtk/gtkgl.h>
#include <GL/gl.h>
g_object_set(self, "can-focus", TRUE, NULL);
#ifndef ROAM_DEBUG
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);
#endif
g_signal_connect(self, "realize", G_CALLBACK(on_realize), NULL);
{
g_debug("GisOpenGL: dispose");
GisOpenGL *self = GIS_OPENGL(_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);
}
if (self->sphere) {
roam_sphere_free(self->sphere);
GisView *view;
GisPlugins *plugins;
RoamSphere *sphere;
GisView *view;
GisPlugins *plugins;
RoamSphere *sphere;
/* for testing */
gboolean wireframe;
/* for testing */
gboolean wireframe;
#ifndef __GIS_TILE_H__
#define __GIS_TILE_H__
#ifndef __GIS_TILE_H__
#define __GIS_TILE_H__
#include <glib.h>
typedef struct _GisTile GisTile;
#include <glib.h>
typedef struct _GisTile GisTile;
#ifndef __GIS_WMS_H__
#define __GIS_WMS_H__
#ifndef __GIS_WMS_H__
#define __GIS_WMS_H__
#include <glib.h>
#include <libsoup/soup.h>
#include <glib.h>
#include <libsoup/soup.h>