Add warning/watch/alert plugin

[aweather] / src / plugins / radar.c

diff --git a/src/plugins/radar.c b/src/plugins/radar.c
index d6bcd7bd4ba76101590840e1664a377f400ec49f..52d94c92d0ed1411c67abb3bafd8a4d255863609 100644 (file)
--- a/src/plugins/radar.c
+++ b/src/plugins/radar.c
@@ -141,7 +141,7 @@ gpointer _site_update_thread(gpointer _site)
        gchar *dir_list = g_strconcat(nexrad_url, "/", site->city->code,
                        "/", "dir.list", NULL);
        GList *files = grits_http_available(site->http,
-                       "^K\\w{3}_\\d{8}_\\d{4}$", site->city->code,
+                       "^\\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");
@@ -179,7 +179,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 +203,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 +231,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 +318,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);
@@ -590,7 +590,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 +770,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);