Fix various memory leaks, mostly in plugins

[grits] / src / plugins / env.c

diff --git a/src/plugins/env.c b/src/plugins/env.c
index 7deea1fee3e08db85bb36a5d2d23b1cade99e42c..a15c023578557883466920ddd8f152310ebac80c 100644 (file)
--- a/src/plugins/env.c
+++ b/src/plugins/env.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Andy Spencer <spenceal@rose-hulman.edu>
+ * Copyright (C) 2009-2010 Andy Spencer <andy753421@gmail.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
 #include <gtk/gtkgl.h>
 #include <GL/gl.h>
 
-#include <gis/gis.h>
+#include <gis.h>
 
 #include "env.h"
 
@@ -79,11 +79,20 @@ GisPluginEnv *gis_plugin_env_new(GisViewer *viewer, GisPrefs *prefs)
 {
        g_debug("GisPluginEnv: new");
        GisPluginEnv *self = g_object_new(GIS_TYPE_PLUGIN_ENV, NULL);
-       self->viewer = viewer;
+       self->viewer = g_object_ref(viewer);
+
+       /* Create objects */
+       GisCallback *callback   = gis_callback_new(expose, self);
+       GisTile     *background = gis_tile_new(NULL, NORTH, SOUTH, EAST, WEST);
+       glGenTextures(1, &self->tex);
+       background->data = &self->tex;
 
        /* Add renderers */
-       GisCallback *callback = gis_callback_new(expose, self);
-       gis_viewer_add(viewer, GIS_OBJECT(callback), GIS_LEVEL_BACKGROUND, 0);
+       gpointer ref1, ref2;
+       ref1 = gis_viewer_add(viewer, GIS_OBJECT(callback),   GIS_LEVEL_BACKGROUND, FALSE);
+       ref2 = gis_viewer_add(viewer, GIS_OBJECT(background), GIS_LEVEL_BACKGROUND, FALSE);
+       self->refs = g_list_prepend(self->refs, ref1);
+       self->refs = g_list_prepend(self->refs, ref2);
 
        return self;
 }
@@ -113,11 +122,19 @@ static void gis_plugin_env_dispose(GObject *gobject)
        g_debug("GisPluginEnv: dispose");
        GisPluginEnv *self = GIS_PLUGIN_ENV(gobject);
        /* Drop references */
+       if (self->viewer) {
+               for (GList *cur = self->refs; cur; cur = cur->next)
+                       gis_viewer_remove(self->viewer, cur->data);
+               g_list_free(self->refs);
+               g_object_unref(self->viewer);
+               glDeleteTextures(1, &self->tex);
+               self->viewer = NULL;
+       }
        G_OBJECT_CLASS(gis_plugin_env_parent_class)->dispose(gobject);
 }
 static void gis_plugin_env_class_init(GisPluginEnvClass *klass)
 {
        g_debug("GisPluginEnv: class_init");
        GObjectClass *gobject_class = (GObjectClass*)klass;
-       gobject_class->dispose  = gis_plugin_env_dispose;
+       gobject_class->dispose = gis_plugin_env_dispose;
 }