Convert self to real names

[grits] / src / plugins / test.c

diff --git a/src/plugins/test.c b/src/plugins/test.c
index 87b0a6123e8dd9bf7928d3ea90bd5b3883ed9980..986a4f05f5f2730b090e6050e1394d33d5aedf71 100644 (file)
--- a/src/plugins/test.c
+++ b/src/plugins/test.c
@@ -29,15 +29,15 @@
 GisPluginTest *gis_plugin_test_new(GisViewer *viewer)
 {
        g_debug("GisPluginTest: new");
-       GisPluginTest *self = g_object_new(GIS_TYPE_PLUGIN_TEST, NULL);
-       self->viewer = viewer;
+       GisPluginTest *test = g_object_new(GIS_TYPE_PLUGIN_TEST, NULL);
+       test->viewer = g_object_ref(viewer);
 
        GisMarker *marker = gis_marker_new("St. Charles");
        gis_point_set_lle(gis_object_center(GIS_OBJECT(marker)), 38.841847, -90.491982, 0);
        GIS_OBJECT(marker)->lod = EARTH_R/4;
-       gis_viewer_add(self->viewer, GIS_OBJECT(marker), GIS_LEVEL_OVERLAY, 0);
+       test->marker = gis_viewer_add(test->viewer, GIS_OBJECT(marker), GIS_LEVEL_OVERLAY, 0);
 
-       return self;
+       return test;
 }
 
 
@@ -55,11 +55,24 @@ static void gis_plugin_test_plugin_init(GisPluginInterface *iface)
        /* Add methods to the interface */
 }
 /* Class/Object init */
-static void gis_plugin_test_init(GisPluginTest *self)
+static void gis_plugin_test_init(GisPluginTest *test)
 {
        g_debug("GisPluginTest: init");
 }
+static void gis_plugin_test_dispose(GObject *_test)
+{
+       g_debug("GisPluginTest: dispose");
+       GisPluginTest *test = GIS_PLUGIN_TEST(_test);
+       if (test->viewer) {
+               gis_viewer_remove(test->viewer, test->marker);
+               g_object_unref(test->viewer);
+               test->viewer = NULL;
+       }
+       G_OBJECT_CLASS(gis_plugin_test_parent_class)->finalize(_test);
+}
 static void gis_plugin_test_class_init(GisPluginTestClass *klass)
 {
        g_debug("GisPluginTest: class_init");
+       GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
+       gobject_class->dispose = gis_plugin_test_dispose;
 }