Update for libgis

- Change includes from <gis/gis.h> -> <gis.h>
- Use tiles as objects

diff --git a/src/aweather-gui.c b/src/aweather-gui.c
index 155b70f02e94c6bcc11c87897f411e195fe15964..42fc9ec59baf5f4ec4168e3bb89e4dea06e2a8f8 100644 (file)
--- a/src/aweather-gui.c
+++ b/src/aweather-gui.c
@@ -20,7 +20,7 @@
 #include <gdk/gdkkeysyms.h>
 #include <math.h>
 
 #include <gdk/gdkkeysyms.h>
 #include <math.h>
 

-#include <gis/gis.h>
+#include <gis.h>

 
 #include "aweather-gui.h"
 #include "aweather-location.h"
 
 #include "aweather-gui.h"
 #include "aweather-location.h"

diff --git a/src/aweather-gui.h b/src/aweather-gui.h
index fb4415f6b0b29f203b8d9eb2ef770194df21ce8f..396955cf35730dbb6d6f5c6d05b52d7d9d75c61d 100644 (file)
--- a/src/aweather-gui.h
+++ b/src/aweather-gui.h
@@ -21,7 +21,7 @@
 #include <gtk/gtk.h>
 #include <glib-object.h>
 
 #include <gtk/gtk.h>
 #include <glib-object.h>
 

-#include <gis/gis.h>
+#include <gis.h>

 
 /* Type macros */
 #define AWEATHER_TYPE_GUI            (aweather_gui_get_type())
 
 /* Type macros */
 #define AWEATHER_TYPE_GUI            (aweather_gui_get_type())

diff --git a/src/main.c b/src/main.c
index aef6c6a0c7b71cb71031d612124a9dfe138cf4b5..83517e11e575822de0cfd9e547c8f0f3fc68e7a4 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -19,7 +19,7 @@
 #include <gtk/gtk.h>
 #include <gtk/gtkgl.h>
 
 #include <gtk/gtk.h>
 #include <gtk/gtkgl.h>
 

-#include <gis/gis.h>
+#include <gis.h>

 
 #include "aweather-gui.h"
 
 
 #include "aweather-gui.h"
 

diff --git a/src/plugins/radar.c b/src/plugins/radar.c
index e4752006c24180bd8d36891f085b99bf389f2ed1..4efa6cb57a126a408ed0102d078cb67283340286 100644 (file)
--- a/src/plugins/radar.c
+++ b/src/plugins/radar.c
@@ -23,7 +23,7 @@
 #include <math.h>
 #include <rsl.h>
 
 #include <math.h>
 #include <rsl.h>
 

-#include <gis/gis.h>
+#include <gis.h>

 
 #include "radar.h"
 #include "marching.h"
 
 #include "radar.h"
 #include "marching.h"


@@ -491,6 +491,8 @@ static void _on_location_changed(GisViewer *viewer,
 static gpointer _draw_radar(GisCallback *callback, gpointer _self)
 {
        GisPluginRadar *self = GIS_PLUGIN_RADAR(_self);
 static gpointer _draw_radar(GisCallback *callback, gpointer _self)
 {
        GisPluginRadar *self = GIS_PLUGIN_RADAR(_self);

+
+       /* Draw wsr88d */

        if (self->cur_sweep == NULL)
                return NULL;
        g_debug("GisPluginRadar: _draw_radar");
        if (self->cur_sweep == NULL)
                return NULL;
        g_debug("GisPluginRadar: _draw_radar");


@@ -645,13 +647,11 @@ GisPluginRadar *gis_plugin_radar_new(GisViewer *viewer, GisPrefs *prefs)
        }
 
        /* Add renderers */
        }
 
        /* Add renderers */

-       GisCallback *callback;
-
-       callback = gis_callback_new(_draw_radar, self);
-       gis_viewer_add(viewer, GIS_OBJECT(callback), GIS_LEVEL_WORLD, TRUE);
+       GisCallback *radar_cb = gis_callback_new(_draw_radar, self);
+       GisCallback *hud_cb   = gis_callback_new(_draw_hud, self);

 
 

-       callback = gis_callback_new(_draw_hud, self);
-       gis_viewer_add(viewer, GIS_OBJECT(callback), GIS_LEVEL_HUD, FALSE);
+       gis_viewer_add(viewer, GIS_OBJECT(radar_cb),    GIS_LEVEL_WORLD, TRUE);
+       gis_viewer_add(viewer, GIS_OBJECT(hud_cb),      GIS_LEVEL_HUD,   FALSE);

 
        return self;
 }
 
        return self;
 }

diff --git a/src/plugins/radar.h b/src/plugins/radar.h
index c4964cb5b88923ecc9a9f915cf3540668370112d..ad8826bc0edd0b50fe73fb71dcd475acf1e501d0 100644 (file)
--- a/src/plugins/radar.h
+++ b/src/plugins/radar.h
@@ -22,7 +22,7 @@
 #include <libsoup/soup.h>
 #include <rsl.h>
 
 #include <libsoup/soup.h>
 #include <rsl.h>
 

-#include <gis/gis.h>
+#include <gis.h>

 
 #include "marching.h"
 
 
 #include "marching.h"