X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fplugins%2Fradar.c;h=62b55c0ec501640ec8170aa24e61f3b049a937b7;hb=2f49abcf87f8a16bab10bc485ec0cd95c535091f;hp=555534f9c9b9c3d528ec0a10f4cf8eba5139d599;hpb=e8392701f15e8367dc621b3faa42e6a6b4a6de2b;p=aweather

diff --git a/src/plugins/radar.c b/src/plugins/radar.c
index 555534f..62b55c0 100644
--- a/src/plugins/radar.c
+++ b/src/plugins/radar.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2010 Andy Spencer <andy753421@gmail.com>
+ * Copyright (C) 2009-2011 Andy Spencer <andy753421@gmail.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
  */
 
 #define _XOPEN_SOURCE
-#include <sys/time.h>
+#include <time.h>
 #include <config.h>
 #include <glib/gstdio.h>
 #include <gtk/gtk.h>
@@ -41,7 +41,7 @@ static void _gtk_bin_set_child(GtkBin *bin, GtkWidget *new)
 }
 
 static gchar *_find_nearest(time_t time, GList *files,
-		gsize offset, gchar *format)
+		gsize offset)
 {
 	g_debug("RadarSite: find_nearest ...");
 	time_t  nearest_time = 0;
@@ -50,7 +50,11 @@ static gchar *_find_nearest(time_t time, GList *files,
 	struct tm tm = {};
 	for (GList *cur = files; cur; cur = cur->next) {
 		gchar *file = cur->data;
-		strptime(file+offset, format, &tm);
+		sscanf(file+offset, "%4d%2d%2d_%2d%2d",
+				&tm.tm_year, &tm.tm_mon, &tm.tm_mday,
+				&tm.tm_hour, &tm.tm_min);
+		tm.tm_year -= 1900;
+		tm.tm_mon  -= 1;
 		if (ABS(time - mktime(&tm)) <
 		    ABS(time - nearest_time)) {
 			nearest_file = file;
@@ -144,7 +148,7 @@ gpointer _site_update_thread(gpointer _site)
 			"^\\w{4}_\\d{8}_\\d{4}$", site->city->code,
 			"\\d+ (.*)", (offline ? NULL : dir_list));
 	g_free(dir_list);
-	gchar *nearest = _find_nearest(site->time, files, 5, "%Y%m%d_%H%M");
+	gchar *nearest = _find_nearest(site->time, files, 5);
 	g_list_foreach(files, (GFunc)g_free, NULL);
 	g_list_free(files);
 	if (!nearest) {
@@ -179,7 +183,7 @@ gpointer _site_update_thread(gpointer _site)
 	}
 	grits_object_hide(GRITS_OBJECT(site->level2), site->hidden);
 	grits_viewer_add(site->viewer, GRITS_OBJECT(site->level2),
-			GRITS_LEVEL_WORLD, TRUE);
+			GRITS_LEVEL_WORLD+1, TRUE);
 
 out:
 	g_idle_add(_site_update_end, site);
@@ -203,7 +207,7 @@ void _site_update(RadarSite *site)
 	/* Remove old volume */
 	g_debug("RadarSite: update - remove - %s", site->city->code);
 	if (site->level2) {
-		grits_viewer_remove(site->viewer, site->level2);
+		grits_viewer_remove(site->viewer, GRITS_OBJECT(site->level2));
 		site->level2 = NULL;
 	}
 
@@ -231,7 +235,7 @@ void radar_site_unload(RadarSite *site)
 
 	/* Remove radar */
 	if (site->level2) {
-		grits_viewer_remove(site->viewer, site->level2);
+		grits_viewer_remove(site->viewer, GRITS_OBJECT(site->level2));
 		site->level2 = NULL;
 	}
 
@@ -318,7 +322,7 @@ RadarSite *radar_site_new(city_t *city, GtkWidget *pconfig,
 void radar_site_free(RadarSite *site)
 {
 	radar_site_unload(site);
-	grits_viewer_remove(site->viewer, site->marker);
+	grits_viewer_remove(site->viewer, GRITS_OBJECT(site->marker));
 	if (site->location_id)
 		g_signal_handler_disconnect(site->viewer, site->location_id);
 	grits_http_free(site->http);
@@ -493,17 +497,18 @@ gpointer _conus_update_thread(gpointer _conus)
 	if (time(NULL) - conus->time < 60*60*5 && !offline) {
 		/* radar.weather.gov is full of lies.
 		 * the index pages get cached and out of date */
-		struct tm tm;
-		gmtime_r(&conus->time, &tm);
-		time_t onthe8 = conus->time - 60*((tm.tm_min+1)%10+1);
-		gmtime_r(&onthe8, &tm);
+		/* gmtime is not thread safe, but it's not used very often so
+		 * hopefully it'll be alright for now... :-( */
+		struct tm *tm = gmtime(&conus->time);
+		time_t onthe8 = conus->time - 60*((tm->tm_min+1)%10+1);
+		tm = gmtime(&onthe8);
 		nearest = g_strdup_printf("Conus_%04d%02d%02d_%02d%02d_N0Ronly.gif",
-				tm.tm_year+1900, tm.tm_mon+1, tm.tm_mday,
-				tm.tm_hour, tm.tm_min);
+				tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday,
+				tm->tm_hour, tm->tm_min);
 	} else {
 		GList *files = grits_http_available(conus->http,
 				"^Conus_[^\"]*_N0Ronly.gif$", "", NULL, NULL);
-		nearest = _find_nearest(conus->time, files, 6, "%Y%m%d_%H%M");
+		nearest = _find_nearest(conus->time, files, 6);
 		g_list_foreach(files, (GFunc)g_free, NULL);
 		g_list_free(files);
 		if (!nearest) {
@@ -590,7 +595,7 @@ void radar_conus_free(RadarConus *conus)
 			glDeleteTextures(1, tile->data);
 			g_free(tile->data);
 		}
-		grits_viewer_remove(conus->viewer, tile);
+		grits_viewer_remove(conus->viewer, GRITS_OBJECT(tile));
 	}
 
 	g_object_unref(conus->viewer);
@@ -770,7 +775,7 @@ static void grits_plugin_radar_dispose(GObject *gobject)
 	g_debug("GritsPluginRadar: dispose");
 	GritsPluginRadar *self = GRITS_PLUGIN_RADAR(gobject);
 	g_signal_handler_disconnect(self->config, self->tab_id);
-	grits_viewer_remove(self->viewer, self->hud);
+	grits_viewer_remove(self->viewer, GRITS_OBJECT(self->hud));
 	radar_conus_free(self->conus);
 	/* Drop references */
 	G_OBJECT_CLASS(grits_plugin_radar_parent_class)->dispose(gobject);