Use grits_object_destroy api and fix memory leaks

[aweather] / src / plugins / level2.c

diff --git a/src/plugins/level2.c b/src/plugins/level2.c
index 573746a9c7ba0f8268a5ed09429339436d75f9b3..585c46047eea85906620d14d809d8909ee1e674c 100644 (file)
--- a/src/plugins/level2.c
+++ b/src/plugins/level2.c
@@ -408,6 +408,11 @@ static void _on_iso_changed(GtkRange *range, gpointer _level2)
        aweather_level2_set_iso(level2, level);
 }
 
+static gchar *_on_format_value(GtkScale *scale, gdouble value, gpointer _level2)
+{
+       return g_strdup_printf("%.1lf dBZ ", value);
+}
+
 GtkWidget *aweather_level2_get_config(AWeatherLevel2 *level2)
 {
        Radar *radar = level2->radar;
@@ -497,7 +502,8 @@ GtkWidget *aweather_level2_get_config(AWeatherLevel2 *level2)
        gtk_scale_set_value_pos(GTK_SCALE(scale), GTK_POS_LEFT);
        gtk_range_set_inverted(GTK_RANGE(scale), TRUE);
        gtk_range_set_value(GTK_RANGE(scale), ISO_MAX);
-       g_signal_connect(scale, "value-changed", G_CALLBACK(_on_iso_changed), level2);
+       g_signal_connect(scale, "value-changed", G_CALLBACK(_on_iso_changed),  level2);
+       g_signal_connect(scale, "format-value",  G_CALLBACK(_on_format_value), level2);
        gtk_table_attach(GTK_TABLE(table), scale,
                        1,cols+1, rows,rows+1, GTK_FILL|GTK_EXPAND,GTK_FILL, 0,0);
        /* Shove all the buttons to the left, but keep the slider expanded */
@@ -517,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)