From 7c6319901f86ae2a104048c96343a2504c9d5772 Mon Sep 17 00:00:00 2001 From: Qball Cow Date: Mon, 19 May 2008 07:45:13 +0200 Subject: [PATCH] Cleanups --- src/stuffkeeper-plugin-mb.gob | 48 ++++++++++++++++++++++++++++++++----------- 1 file changed, 36 insertions(+), 12 deletions(-) diff --git a/src/stuffkeeper-plugin-mb.gob b/src/stuffkeeper-plugin-mb.gob index 47f6732..572752f 100644 --- a/src/stuffkeeper-plugin-mb.gob +++ b/src/stuffkeeper-plugin-mb.gob @@ -45,17 +45,9 @@ class Stuffkeeper:Plugin:Mb from Stuffkeeper:Plugin private GtkListStore *schema_list = {NULL}; private GtkListStore *import_list = {NULL}; - private GList *import_mapping = {NULL}; - - - public - StuffkeeperPlugin * - new(void) - { - printf("Creating mb plugin\n"); - return STUFFKEEPER_PLUGIN(GET_NEW); - } + + /* mapping */ private void @@ -111,7 +103,7 @@ class Stuffkeeper:Plugin:Mb from Stuffkeeper:Plugin gtk_box_pack_start(GTK_BOX(hbox), wid, FALSE, TRUE, 0); gtk_combo_box_set_active(GTK_COMBO_BOX(wid), 0); - gtk_container_add(exo, hbox); + gtk_container_add(GTK_CONTAINER(exo), hbox); g_object_set_data_full(G_OBJECT(wid), "field-id", g_strdup(retv[i]), g_free); self->_priv->import_mapping = g_list_append(self->_priv->import_mapping, wid); @@ -433,11 +425,43 @@ class Stuffkeeper:Plugin:Mb from Stuffkeeper:Plugin } + + + public + StuffkeeperPlugin * + new(void) + { + printf("Creating mb plugin\n"); + return STUFFKEEPER_PLUGIN(GET_NEW); + } + override (G:Object) void finalize(G:Object *obj) { - printf("Finalizing\n"); + Self *self = SELF(obj); + printf("Finalizing\n"); + + if(self->_priv->album_list) + { + g_object_unref(self->_priv->album_list); + self->_priv->album_list = NULL; + } + if(self->_priv->schema_list) + { + g_object_unref(self->_priv->schema_list); + self->_priv->schema_list = NULL; + } + if(self->_priv->import_list) + { + g_object_unref(self->_priv->import_list); + self->_priv->import_list = NULL; + } + if(self->_priv->import_mapping) + { + g_list_free(self->_priv->import_mapping); + self->_priv->import_mapping = NULL; + } } /** -- 2.11.4.GIT