More reference counting updates

The viewer now adds it's own references and doesn't take references from
the caller. In almost all cases the caller needs to keep it's reference
so that it can remove the object when the plugin is unloaded.

diff --git a/src/grits-opengl.c b/src/grits-opengl.c
index 49a9c533015d9413c5f9d28fb67aae432beafb71..a17ddda235fb2a624633f7f92c095685c66f38d5 100644 (file)
--- a/src/grits-opengl.c
+++ b/src/grits-opengl.c
@@ -618,6 +618,7 @@ static void grits_opengl_add(GritsViewer *_opengl, GritsObject *object,
                list->next->prev = link;
        list->next = link;
        object->ref = link;
+       g_object_ref(object);
        g_mutex_unlock(&opengl->objects_lock);
 }
 
@@ -625,6 +626,8 @@ void grits_opengl_remove(GritsViewer *_opengl, GritsObject *object)
 {
        g_assert(GRITS_IS_OPENGL(_opengl));
        GritsOpenGL *opengl = GRITS_OPENGL(_opengl);
+       if (!object->ref)
+               return;
        g_mutex_lock(&opengl->objects_lock);
        GList *link = object->ref;
        /* Just unlink and free it, link->prev is assured */
@@ -632,6 +635,8 @@ void grits_opengl_remove(GritsViewer *_opengl, GritsObject *object)
        if (link->next)
                link->next->prev = link->prev;
        g_free(link);
+       object->ref = NULL;
+       g_object_unref(object);
        g_mutex_unlock(&opengl->objects_lock);
 }
 

diff --git a/src/grits-plugin.c b/src/grits-plugin.c
index d79fdd19be15805b00034d5efe38e262abee758e..60b3bbd7280be8d9cddabd7677c9b1ec92e60724 100644 (file)
--- a/src/grits-plugin.c
+++ b/src/grits-plugin.c
@@ -171,7 +171,7 @@ void grits_plugins_free(GritsPlugins *plugins)
        g_debug("GritsPlugins: free");
        for (GList *cur = plugins->plugins; cur; cur = cur->next) {
                GritsPluginStore *store = cur->data;
-               g_debug("GritsPlugin: freeing %s refs=%d->%d", store->name,
+               g_debug("GritsPlugins: freeing %s refs=%d->%d", store->name,
                        G_OBJECT(store->plugin)->ref_count,
                        G_OBJECT(store->plugin)->ref_count-1);
                grits_plugins_free_store(store);

diff --git a/src/grits-viewer.c b/src/grits-viewer.c
index 52fbaf97a5269d9205e0ece6cbbc7c644e72f98c..aa5c3a578752556e42e33861604130e7261fbf1b 100644 (file)
--- a/src/grits-viewer.c
+++ b/src/grits-viewer.c
@@ -565,7 +565,6 @@ void grits_viewer_add(GritsViewer *viewer, GritsObject *object,
  * @object: the object to remove
  *
  * Remove an object from the viewer.
- * The objects reference count is decremented.
  */
 void grits_viewer_remove(GritsViewer *viewer, GritsObject *object)
 {
@@ -576,7 +575,6 @@ void grits_viewer_remove(GritsViewer *viewer, GritsObject *object)
                g_warning("GritsViewer: remove - Unimplemented");
        object->viewer = NULL;
        klass->remove(viewer, object);
-       g_object_unref(object);
 }
 
 /****************

diff --git a/src/objects/grits-callback.c b/src/objects/grits-callback.c
index 36ba3af833924c4a0bf42767037591525e3c728b..2532c993bfbda714737c76277d306647a9932ab1 100644 (file)
--- a/src/objects/grits-callback.c
+++ b/src/objects/grits-callback.c
@@ -60,6 +60,7 @@ G_DEFINE_TYPE(GritsCallback, grits_callback, GRITS_TYPE_OBJECT);
 static void grits_callback_finalize(GObject *cb)
 {
        g_debug("GritsCallback: finalize");
+       G_OBJECT_CLASS(grits_callback_parent_class)->finalize(cb);
 }
 static void grits_callback_init(GritsCallback *cb)
 {

diff --git a/src/plugins/elev.c b/src/plugins/elev.c
index 7540a0816bc1d3bb7569fe93ac8d7a2528a1cd41..db7b9775e535650cd16c3c91be774c154ad385a2 100644 (file)
--- a/src/plugins/elev.c
+++ b/src/plugins/elev.c
@@ -343,8 +343,7 @@ static void grits_plugin_elev_dispose(GObject *gobject)
                        grits_viewer_clear_height_func(viewer);
                if (LOAD_TEX)
                        grits_viewer_remove(viewer, GRITS_OBJECT(elev->tiles));
-               else
-                       g_object_unref(elev->tiles);
+               g_object_unref(elev->tiles);
                soup_session_abort(elev->wms->http->soup);
                g_thread_pool_free(elev->threads, TRUE, TRUE);
                while (gtk_events_pending())

diff --git a/src/plugins/env.c b/src/plugins/env.c
index d833b43c5afdbeb37c6cf931a5278ea8666d99a7..6312f3b2ae7e7f9e76d0058ff720061dd2aabf02 100644 (file)
--- a/src/plugins/env.c
+++ b/src/plugins/env.c
@@ -376,7 +376,7 @@ static void grits_plugin_env_dispose(GObject *gobject)
        if (env->viewer) {
                for (GList *cur = env->refs; cur; cur = cur->next)
                        grits_viewer_remove(env->viewer, cur->data);
-               g_list_free(env->refs);
+               g_list_free_full(env->refs, g_object_unref);
                g_object_unref(env->viewer);
                g_object_unref(env->prefs);
                glDeleteTextures(1, &env->tex);

diff --git a/src/plugins/map.c b/src/plugins/map.c
index bb585e1556d395def2d0eec495ba138e021d79b3..13f986c10e5dd2dbdc22245ff03d0a09483c1408 100644 (file)
--- a/src/plugins/map.c
+++ b/src/plugins/map.c
@@ -248,6 +248,7 @@ static void grits_plugin_map_dispose(GObject *gobject)
                map->viewer = NULL;
                g_signal_handler_disconnect(viewer, map->sigid);
                grits_viewer_remove(viewer, GRITS_OBJECT(map->tiles));
+               g_object_unref(map->tiles);
                soup_session_abort(map->tms->http->soup);
                //soup_session_abort(map->wms->http->soup);
                g_thread_pool_free(map->threads, TRUE, TRUE);

diff --git a/src/plugins/sat.c b/src/plugins/sat.c
index d9d08918b12882f53aae8816d13471925a612f4a..8fe6e091ab27a3de2bd2807b8ceeab12cf6e9c81 100644 (file)
--- a/src/plugins/sat.c
+++ b/src/plugins/sat.c
@@ -226,6 +226,7 @@ static void grits_plugin_sat_dispose(GObject *gobject)
                sat->viewer = NULL;
                g_signal_handler_disconnect(viewer, sat->sigid);
                grits_viewer_remove(viewer, GRITS_OBJECT(sat->tiles));
+               g_object_unref(sat->tiles);
                soup_session_abort(sat->wms->http->soup);
                g_thread_pool_free(sat->threads, TRUE, TRUE);
                while (gtk_events_pending())

diff --git a/src/plugins/test.c b/src/plugins/test.c
index 8a7e8a6588c39877bb4605ae46985f883384f3c1..cfc999b854143e3e932aa0a9ed2b16e9a1e95fa8 100644 (file)
--- a/src/plugins/test.c
+++ b/src/plugins/test.c
@@ -180,6 +180,9 @@ static void grits_plugin_test_dispose(GObject *_test)
                grits_viewer_remove(viewer, GRITS_OBJECT(test->marker));
                grits_viewer_remove(viewer, GRITS_OBJECT(test->poly));
                grits_viewer_remove(viewer, GRITS_OBJECT(test->line));
+               g_object_unref(test->marker);
+               g_object_unref(test->poly);
+               g_object_unref(test->line);
                g_object_unref(viewer);
        }
        G_OBJECT_CLASS(grits_plugin_test_parent_class)->dispose(_test);