From: Andy Spencer <andy753421@gmail.com>
Date: Mon, 24 Jan 2011 04:47:01 +0000 (+0000)
Subject: Misc Grits/formatting updates
X-Git-Tag: v0.5~29
X-Git-Url: http://pileus.org/git/?p=aweather;a=commitdiff_plain;h=7d1ba2779e584e8e323400afcb17aa95cbf94e27

Misc Grits/formatting updates

- Use viewer from GritsObject instead of storing twice
---

diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 83a4e82..ce9f557 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -1,6 +1,7 @@
 AM_CFLAGS   = -Wall --std=gnu99 $(GRITS_CFLAGS)
 AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/lib
 AM_LDFLAGS  = -module -avoid-version -no-undefined
+LIBS        = $(GRITS_LIBS)
 
 pluginsdir  = $(pkglibdir)
 
diff --git a/src/plugins/level2.c b/src/plugins/level2.c
index b5ac6f5..0dcd308 100644
--- a/src/plugins/level2.c
+++ b/src/plugins/level2.c
@@ -201,7 +201,7 @@ static gboolean _set_sweep_cb(gpointer _self)
 	g_debug("AWeatherLevel2: _set_sweep_cb");
 	AWeatherLevel2 *self = _self;
 	_load_sweep_gl(self);
-	gtk_widget_queue_draw(GTK_WIDGET(self->viewer));
+	grits_object_queue_draw(_self);
 	g_object_unref(self);
 	return FALSE;
 }
@@ -228,12 +228,10 @@ void aweather_level2_set_sweep(AWeatherLevel2 *self,
 	g_idle_add(_set_sweep_cb, self);
 }
 
-AWeatherLevel2 *aweather_level2_new(GritsViewer *viewer,
-		AWeatherColormap *colormap, Radar *radar)
+AWeatherLevel2 *aweather_level2_new(Radar *radar, AWeatherColormap *colormap)
 {
 	g_debug("AWeatherLevel2: new - %s", radar->h.radar_name);
 	AWeatherLevel2 *self = g_object_new(AWEATHER_TYPE_LEVEL2, NULL);
-	self->viewer   = viewer;
 	self->radar    = radar;
 	self->colormap = colormap;
 	aweather_level2_set_sweep(self, DZ_INDEX, 0);
@@ -247,9 +245,8 @@ AWeatherLevel2 *aweather_level2_new(GritsViewer *viewer,
 	return self;
 }
 
-AWeatherLevel2 *aweather_level2_new_from_file(GritsViewer *viewer,
-		AWeatherColormap *colormap,
-		const gchar *file, const gchar *site)
+AWeatherLevel2 *aweather_level2_new_from_file(const gchar *file, const gchar *site,
+		AWeatherColormap *colormap)
 {
 	g_debug("AWeatherLevel2: new_from_file %s %s", site, file);
 
@@ -276,7 +273,7 @@ AWeatherLevel2 *aweather_level2_new_from_file(GritsViewer *viewer,
 	if (!radar)
 		return NULL;
 
-	return aweather_level2_new(viewer, colormaps, radar);
+	return aweather_level2_new(radar, colormaps);
 }
 
 static void _on_sweep_clicked(GtkRadioButton *button, gpointer _level2)
diff --git a/src/plugins/level2.h b/src/plugins/level2.h
index ee4d3ba..3f522cb 100644
--- a/src/plugins/level2.h
+++ b/src/plugins/level2.h
@@ -34,7 +34,6 @@ typedef struct _AWeatherLevel2Class AWeatherLevel2Class;
 
 struct _AWeatherLevel2 {
 	GritsObject       parent;
-	GritsViewer      *viewer;
 	Radar            *radar;
 	AWeatherColormap *colormap;
 
@@ -51,15 +50,13 @@ struct _AWeatherLevel2Class {
 
 GType aweather_level2_get_type(void);
 
-AWeatherLevel2 *aweather_level2_new(GritsViewer *viewer,
-		AWeatherColormap *colormap, Radar *radar);
+AWeatherLevel2 *aweather_level2_new(Radar *radar, AWeatherColormap *colormap);
 
-AWeatherLevel2 *aweather_level2_new_from_file(GritsViewer *viewer,
-		AWeatherColormap *colormap,
-		const gchar *file, const gchar *site);
+AWeatherLevel2 *aweather_level2_new_from_file(const gchar *file, const gchar *site,
+		AWeatherColormap *colormap);
 
 void aweather_level2_set_sweep(AWeatherLevel2 *level2,
-		int type, float elev);
+		int type, gfloat elev);
 
 GtkWidget *aweather_level2_get_config(AWeatherLevel2 *level2);
 
diff --git a/src/plugins/radar.c b/src/plugins/radar.c
index 1bb9e34..a37ce5b 100644
--- a/src/plugins/radar.c
+++ b/src/plugins/radar.c
@@ -135,7 +135,8 @@ gboolean _site_update_end(gpointer _site)
 	RadarSite *site = _site;
 	if (site->message) {
 		g_warning("RadarSite: update_end - %s", site->message);
-		_gtk_bin_set_child(GTK_BIN(site->config), gtk_label_new(site->message));
+		_gtk_bin_set_child(GTK_BIN(site->config),
+				gtk_label_new(site->message));
 	} else {
 		_gtk_bin_set_child(GTK_BIN(site->config),
 				aweather_level2_get_config(site->level2));
@@ -188,7 +189,7 @@ gpointer _site_update_thread(gpointer _site)
 	/* Load and add new volume */
 	g_debug("RadarSite: update_thread - load - %s", site->city->code);
 	site->level2 = aweather_level2_new_from_file(
-			site->viewer, colormaps, file, site->city->code);
+			file, site->city->code, colormaps);
 	g_free(file);
 	if (!site->level2) {
 		site->message = "Load failed";