Use grits_object_destroy api and fix memory leaks

diff --git a/src/plugins/alert.c b/src/plugins/alert.c
index 3ab84a98b29d79af12f7b4636fb0593ee1336459..bbdae3ff37a39fa46c60e5fd67b515ee55dd8198 100644 (file)
--- a/src/plugins/alert.c
+++ b/src/plugins/alert.c
@@ -759,10 +759,8 @@ static void _update_warnings(GritsPluginAlert *alert, GList *old)
        /* Remove old messages */
        for (GList *cur = old; cur; cur = cur->next) {
                AlertMsg *msg = cur->data;
-               if (msg->county_based) grits_viewer_remove(alert->viewer,
-                               GRITS_OBJECT(msg->county_based));
-               if (msg->storm_based) grits_viewer_remove(alert->viewer,
-                               GRITS_OBJECT(msg->storm_based));
+               grits_object_destroy_pointer(&msg->county_based);
+               grits_object_destroy_pointer(&msg->storm_based);
        }
 
        /* Add new messages */
@@ -981,13 +979,11 @@ static void grits_plugin_alert_dispose(GObject *gobject)
                alert->viewer = NULL;
                for (GList *cur = alert->msgs; cur; cur = cur->next) {
                        AlertMsg *msg = cur->data;
-                       if (msg->county_based) grits_viewer_remove(viewer,
-                                       GRITS_OBJECT(msg->county_based));
-                       if (msg->storm_based) grits_viewer_remove(viewer,
-                                       GRITS_OBJECT(msg->storm_based));
+                       grits_object_destroy_pointer(&msg->county_based);
+                       grits_object_destroy_pointer(&msg->storm_based);
                }
                for (GList *cur = alert->states; cur; cur = cur->next)
-                       grits_viewer_remove(viewer, cur->data);
+                       grits_object_destroy_pointer(&cur->data);
                gtk_widget_destroy(alert->details);
                g_object_unref(alert->prefs);
                g_object_unref(viewer);

diff --git a/src/plugins/gps-plugin.c b/src/plugins/gps-plugin.c
index fe693e325423a07852e398867038557f8a32fc1f..f91382d5a85989167642d7931d8978709b9e6729 100644 (file)
--- a/src/plugins/gps-plugin.c
+++ b/src/plugins/gps-plugin.c
@@ -514,11 +514,7 @@ gboolean gps_redraw_all(gpointer data)
                gps_track_add_point(&gps->track,
                          gps_data->fix.latitude, gps_data->fix.longitude, 0.0);
 
-               if (gps->track.line) {
-                       grits_viewer_remove(gps->viewer,
-                           GRITS_OBJECT(gps->track.line));
-                       gps->track.line = NULL;
-               }
+               grits_object_destroy_pointer(&gps->track.line);
 
                gps->track.line = grits_line_new(gps->track.points);
                gps->track.line->color[0]  = 1.0;
@@ -533,11 +529,7 @@ gboolean gps_redraw_all(gpointer data)
        }
 
        if (gps_data_is_valid(gps_data)) {
-               if (gps->marker) {
-                       grits_viewer_remove(gps->viewer,
-                           GRITS_OBJECT(gps->marker));
-                       gps->marker = NULL;
-               }
+               grits_object_destroy_pointer(&gps->marker);
 
                gchar *path = find_path(GPS_MARKER_ICON_PATH, GPS_MARKER_ICON);
                if (path) {
@@ -949,9 +941,7 @@ static void grits_plugin_gps_dispose(GObject *gobject)
        if (gps->viewer) {
                GritsViewer *viewer = gps->viewer;
                gps->viewer = NULL;
-               if (gps->marker)
-                       grits_viewer_remove(viewer,
-                              GRITS_OBJECT(gps->marker));
+               grits_object_destroy_pointer(&gps->marker);
                g_object_unref(gps->prefs);
                g_object_unref(viewer);
        }

diff --git a/src/plugins/level2.c b/src/plugins/level2.c
index 2f595c9bd26f3ffbd7ebdd6b7189f8b9a3f409ef..585c46047eea85906620d14d809d8909ee1e674c 100644 (file)
--- a/src/plugins/level2.c
+++ b/src/plugins/level2.c
@@ -523,11 +523,7 @@ static void aweather_level2_dispose(GObject *_level2)
 {
        AWeatherLevel2 *level2 = AWEATHER_LEVEL2(_level2);
        g_debug("AWeatherLevel2: dispose - %p", _level2);
-       if (level2->volume) {
-               grits_viewer_remove(GRITS_OBJECT(level2->volume)->viewer,
-                               GRITS_OBJECT(level2->volume));
-               level2->volume = NULL;
-       }
+       grits_object_destroy_pointer(&level2->volume);
        G_OBJECT_CLASS(aweather_level2_parent_class)->dispose(_level2);
 }
 static void aweather_level2_finalize(GObject *_level2)

diff --git a/src/plugins/radar.c b/src/plugins/radar.c
index 560adc830f3f7f347b56c74de5e02c043d8fcc81..50c66a8bab19011a77949951a206e70563a7fc62 100644 (file)
--- a/src/plugins/radar.c
+++ b/src/plugins/radar.c
@@ -218,10 +218,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, GRITS_OBJECT(site->level2));
-               site->level2 = NULL;
-       }
+       grits_object_destroy_pointer(&site->level2);
 
        /* Fork loading right away so updating the
         * list of times doesn't take too long */
@@ -249,10 +246,7 @@ void radar_site_unload(RadarSite *site)
                gtk_widget_destroy(site->config);
 
        /* Remove radar */
-       if (site->level2) {
-               grits_viewer_remove(site->viewer, GRITS_OBJECT(site->level2));
-               site->level2 = NULL;
-       }
+       grits_object_destroy_pointer(&site->level2);
 
        site->status = STATUS_UNLOADED;
 }
@@ -355,7 +349,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, GRITS_OBJECT(site->marker));
+       grits_object_destroy_pointer(&site->marker);
        if (site->location_id)
                g_signal_handler_disconnect(site->viewer, site->location_id);
        grits_http_free(site->http);
@@ -626,11 +620,8 @@ void radar_conus_free(RadarConus *conus)
        if (conus->idle_source)
                g_source_remove(conus->idle_source);
 
-       for (int i = 0; i < 2; i++) {
-               GritsTile *tile = conus->tile[i];
-               grits_viewer_remove(conus->viewer, GRITS_OBJECT(tile));
-               g_object_unref(tile);
-       }
+       for (int i = 0; i < 2; i++)
+               grits_object_destroy_pointer(&conus->tile[i]);
 
        g_object_unref(conus->viewer);
        g_free(conus);
@@ -812,11 +803,10 @@ static void grits_plugin_radar_dispose(GObject *gobject)
                GritsViewer *viewer = self->viewer;
                self->viewer = NULL;
                g_signal_handler_disconnect(self->config, self->tab_id);
-               grits_viewer_remove(viewer, GRITS_OBJECT(self->hud));
+               grits_object_destroy_pointer(&self->hud);
                radar_conus_free(self->conus);
                g_hash_table_destroy(self->sites);
                g_object_unref(self->config);
-               g_object_unref(self->hud);
                g_object_unref(self->prefs);
                g_object_unref(viewer);
        }