From d4d52d011600b56587a088760b734fbb52f6a588 Mon Sep 17 00:00:00 2001
From: Andy Spencer <andy753421@gmail.com>
Date: Wed, 3 Feb 2010 12:50:44 +0000
Subject: [PATCH] Update for libgis

- Change includes from <gis/gis.h> -> <gis.h>
- Use tiles as objects
---
 src/aweather-gui.c  |  2 +-
 src/aweather-gui.h  |  2 +-
 src/main.c          |  2 +-
 src/plugins/radar.c | 14 +++++++-------
 src/plugins/radar.h |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/aweather-gui.c b/src/aweather-gui.c
index 155b70f..42fc9ec 100644
--- a/src/aweather-gui.c
+++ b/src/aweather-gui.c
@@ -20,7 +20,7 @@
 #include <gdk/gdkkeysyms.h>
 #include <math.h>
 
-#include <gis/gis.h>
+#include <gis.h>
 
 #include "aweather-gui.h"
 #include "aweather-location.h"
diff --git a/src/aweather-gui.h b/src/aweather-gui.h
index fb4415f..396955c 100644
--- a/src/aweather-gui.h
+++ b/src/aweather-gui.h
@@ -21,7 +21,7 @@
 #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())
diff --git a/src/main.c b/src/main.c
index aef6c6a..83517e1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -19,7 +19,7 @@
 #include <gtk/gtk.h>
 #include <gtk/gtkgl.h>
 
-#include <gis/gis.h>
+#include <gis.h>
 
 #include "aweather-gui.h"
 
diff --git a/src/plugins/radar.c b/src/plugins/radar.c
index e475200..4efa6cb 100644
--- a/src/plugins/radar.c
+++ b/src/plugins/radar.c
@@ -23,7 +23,7 @@
 #include <math.h>
 #include <rsl.h>
 
-#include <gis/gis.h>
+#include <gis.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);
+
+	/* Draw wsr88d */
 	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 */
-	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;
 }
diff --git a/src/plugins/radar.h b/src/plugins/radar.h
index c4964cb..ad8826b 100644
--- a/src/plugins/radar.h
+++ b/src/plugins/radar.h
@@ -22,7 +22,7 @@
 #include <libsoup/soup.h>
 #include <rsl.h>
 
-#include <gis/gis.h>
+#include <gis.h>
 
 #include "marching.h"
 
-- 
2.43.2