X-Git-Url: http://pileus.org/git/?p=aweather;a=blobdiff_plain;f=src%2Fplugins%2Falert.c;fp=src%2Fplugins%2Falert.c;h=bbdae3ff37a39fa46c60e5fd67b515ee55dd8198;hp=3ab84a98b29d79af12f7b4636fb0593ee1336459;hb=09e7e102e065b1984669c93fb4f8d324a774116b;hpb=276728b7cc42bad3ec38acfe375c3a30ae87e587

diff --git a/src/plugins/alert.c b/src/plugins/alert.c
index 3ab84a9..bbdae3f 100644
--- 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);