X-Git-Url: http://pileus.org/git/?p=aweather;a=blobdiff_plain;f=src%2Fplugins%2Fradar.c;h=c4e497d3f3ac32320c82b939b53f45fe52a141ce;hp=cc2e1c4988b2d47de65d977a39d154a33abbc5e8;hb=97fe64bdcc7dfc9c005d822ff236c27171344bbb;hpb=594785a88b936b2f96ebbd0bd23d58198c2c4f68

diff --git a/src/plugins/radar.c b/src/plugins/radar.c
index cc2e1c4..c4e497d 100644
--- a/src/plugins/radar.c
+++ b/src/plugins/radar.c
@@ -219,7 +219,7 @@ void _site_update(RadarSite *site)
 
 	/* Fork loading right away so updating the
 	 * list of times doesn't take too long */
-	g_thread_create(_site_update_thread, site, FALSE, NULL);
+	g_thread_new("site-update-thread", _site_update_thread, site);
 }
 
 /* RadarSite methods */
@@ -290,15 +290,6 @@ void _site_on_location_changed(GritsViewer *viewer,
 		radar_site_unload(site);
 }
 
-gboolean _site_add_marker(RadarSite *site)
-{
-	site->marker = grits_marker_new(site->city->name);
-	GRITS_OBJECT(site->marker)->center = site->city->pos;
-	GRITS_OBJECT(site->marker)->lod    = EARTH_R*0.75*site->city->lod;
-	grits_viewer_add(site->viewer, GRITS_OBJECT(site->marker),
-			GRITS_LEVEL_OVERLAY, FALSE);
-	return FALSE;
-}
 RadarSite *radar_site_new(city_t *city, GtkWidget *pconfig,
 		GritsViewer *viewer, GritsPrefs *prefs, GritsHttp *http)
 {
@@ -319,7 +310,11 @@ RadarSite *radar_site_new(city_t *city, GtkWidget *pconfig,
 	_site_on_location_changed(viewer, lat, lon, elev, site);
 
 	/* Add marker */
-	_site_add_marker(site);
+	site->marker = grits_marker_new(site->city->name);
+	GRITS_OBJECT(site->marker)->center = site->city->pos;
+	GRITS_OBJECT(site->marker)->lod    = EARTH_R*0.75*site->city->lod;
+	grits_viewer_add(site->viewer, GRITS_OBJECT(site->marker),
+			GRITS_LEVEL_HUD, FALSE);
 
 	/* Connect signals */
 	site->location_id  = g_signal_connect(viewer, "location-changed",
@@ -355,7 +350,7 @@ struct _RadarConus {
 	GtkWidget   *config;
 	time_t       time;
 	const gchar *message;
-	GStaticMutex loading;
+	GMutex       loading;
 
 	gchar       *path;
 	GritsTile   *tile[2];
@@ -490,7 +485,7 @@ gboolean _conus_update_end(gpointer _conus)
 
 out:
 	g_free(conus->path);
-	g_static_mutex_unlock(&conus->loading);
+	g_mutex_unlock(&conus->loading);
 	return FALSE;
 }
 
@@ -548,7 +543,7 @@ out:
 
 void _conus_update(RadarConus *conus)
 {
-	if (!g_static_mutex_trylock(&conus->loading))
+	if (!g_mutex_trylock(&conus->loading))
 		return;
 	conus->time = grits_viewer_get_time(conus->viewer);
 	g_debug("Conus: update - %d",
@@ -559,7 +554,7 @@ void _conus_update(RadarConus *conus)
 	gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progress), "Loading...");
 	_gtk_bin_set_child(GTK_BIN(conus->config), progress);
 
-	g_thread_create(_conus_update_thread, conus, FALSE, NULL);
+	g_thread_new("conus-update-thread", _conus_update_thread, conus);
 }
 
 RadarConus *radar_conus_new(GtkWidget *pconfig,
@@ -569,7 +564,7 @@ RadarConus *radar_conus_new(GtkWidget *pconfig,
 	conus->viewer  = g_object_ref(viewer);
 	conus->http    = http;
 	conus->config  = gtk_alignment_new(0, 0, 1, 1);
-	g_static_mutex_init(&conus->loading);
+	g_mutex_init(&conus->loading);
 
 	gdouble south =  CONUS_NORTH - CONUS_DEG_PER_PX*CONUS_HEIGHT;
 	gdouble east  =  CONUS_WEST  + CONUS_DEG_PER_PX*CONUS_WIDTH;