Index: profiler/plugin.c
===================================================================
--- profiler/plugin.c	(revision 3772)
+++ profiler/plugin.c	(working copy)
@@ -918,14 +918,14 @@
 profiler_finalize (GObject *obj)
 {
 	/* Finalization codes here */
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, finalize, (obj));
+	G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
 
 static void
 profiler_dispose (GObject *obj)
 {
 	/* Disposition codes */
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, dispose, (obj));
+	G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
 
 static void
Index: file-loader/plugin.c
===================================================================
--- file-loader/plugin.c	(revision 3772)
+++ file-loader/plugin.c	(working copy)
@@ -1221,10 +1221,17 @@
 		g_object_unref (plugin->recent_files_model_bottom);
 		plugin->recent_files_model_bottom = NULL;
 	}
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, dispose, (obj));
+	G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
 
 static void
+finalize (GObject *obj)
+{
+	/* Finalization codes here */
+	G_OBJECT_CLASS (parent_class)->finalize (obj);
+}
+
+static void
 anjuta_file_loader_plugin_instance_init (GObject *obj)
 {
 	AnjutaFileLoaderPlugin *plugin = ANJUTA_PLUGIN_FILE_LOADER (obj);
@@ -1254,6 +1261,7 @@
 	plugin_class->activate = activate_plugin;
 	plugin_class->deactivate = deactivate_plugin;
 	klass->dispose = dispose;
+	klass->finalize = finalize;
 }
 
 static GObject*
Index: symbol-browser/plugin.c
===================================================================
--- symbol-browser/plugin.c	(revision 3772)
+++ symbol-browser/plugin.c	(working copy)
@@ -1090,14 +1090,14 @@
 										   (gpointer)&sv_plugin->ss);
 
 	
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, dispose, (obj));
+	G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
 
 static void
 finalize (GObject *obj)
 {
 	/* SymbolBrowserPlugin *plugin = ANJUTA_PLUGIN_SYMBOL_BROWSER (obj); */
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, finalize, (obj));
+	G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
 
 static void
Index: symbol-browser/an_symbol_iter.c
===================================================================
--- symbol-browser/an_symbol_iter.c	(revision 3772)
+++ symbol-browser/an_symbol_iter.c	(working copy)
@@ -45,14 +45,14 @@
 	AnjutaSymbolIter *si = ANJUTA_SYMBOL_ITER (obj);
 	
 	g_free (si->priv);
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, finalize, (obj));
+	G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
 
 static void
 anjuta_symbol_iter_dispose (GObject * obj)
 {
 	/* AnjutaSymbolIter *si = ANJUTA_SYMBOL_ITER (obj); */
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, dispose, (obj));
+	G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
 
 static void
Index: symbol-browser/an_symbol_search.c
===================================================================
--- symbol-browser/an_symbol_search.c	(revision 3772)
+++ symbol-browser/an_symbol_search.c	(working copy)
@@ -34,7 +34,7 @@
 #include <gtk/gtkscrolledwindow.h>
 #include <gtk/gtktreeview.h>
 #include <gtk/gtktreeselection.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libanjuta/anjuta-debug.h>
 
 #include "an_symbol_search.h"
@@ -132,7 +132,7 @@
 	if (priv->hitlist)
 		priv->hitlist = NULL;
 	
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, dispose, (obj));	
+	G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
 
 /*---------------------------------------------------------------------------*/
@@ -148,7 +148,7 @@
 	g_completion_free (priv->completion);
 	g_free (priv);
 			
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, finalize, (obj));
+	G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
 
 /*-----------------------------------------------------------------------------
Index: symbol-browser/an_symbol_view.c
===================================================================
--- symbol-browser/an_symbol_view.c	(revision 3772)
+++ symbol-browser/an_symbol_view.c	(working copy)
@@ -29,7 +29,7 @@
 #include <ctype.h>
 #include <regex.h>
 #include <libgnomeui/gnome-stock-icons.h> 
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libgnome/gnome-macros.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 #include <libanjuta/anjuta-utils.h>
@@ -966,7 +966,7 @@
 	g_hash_table_destroy (sv->priv->tm_files);
 	tm_workspace_free ((gpointer) sv->priv->tm_workspace);
 	g_free (sv->priv);
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, finalize, (obj));
+	G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
 
 static void
@@ -978,7 +978,7 @@
 
 	/* All file symbol refs would be freed when the hash table is distroyed */
 	sv->priv->file_symbol_model = NULL;
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, dispose, (obj));
+	G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
 
 /* Anjuta symbol view class */
Index: symbol-browser/an_symbol.c
===================================================================
--- symbol-browser/an_symbol.c	(revision 3772)
+++ symbol-browser/an_symbol.c	(working copy)
@@ -44,7 +44,7 @@
 	if (s->priv->uri)
 		g_free (s->priv->uri);
 	g_free (s->priv);
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, finalize, (obj));
+	G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
 
 static void
Index: cvs-plugin/plugin.c
===================================================================
--- cvs-plugin/plugin.c	(revision 3772)
+++ cvs-plugin/plugin.c	(working copy)
@@ -406,14 +406,14 @@
 finalize (GObject *obj)
 {
 	// CVSPlugin *plugin = ANJUTA_PLUGIN_CVS (obj);
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, finalize, (G_OBJECT(obj)));
+	G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
 
 static void
 dispose (GObject *obj)
 {
 	// CVSPlugin *plugin = ANJUTA_PLUGIN_CVS (obj);
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, dispose, (G_OBJECT(obj)));
+	G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
 
 static void
Index: devhelp/plugin.c
===================================================================
--- devhelp/plugin.c	(revision 3772)
+++ devhelp/plugin.c	(working copy)
@@ -457,7 +457,7 @@
 	/* Finalization codes here */
 	AnjutaDevhelp *plugin = ANJUTA_PLUGIN_DEVHELP (obj);
 	
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, finalize, (obj));
+	G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
 
 static void
@@ -469,7 +469,7 @@
 	// g_object_unref(G_OBJECT(devhelp->base));
 
 	/* Disposition codes */
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, dispose, (obj));
+	G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
 #endif
 
Index: sourceview/plugin.c
===================================================================
--- sourceview/plugin.c	(revision 3772)
+++ sourceview/plugin.c	(working copy)
@@ -96,14 +96,14 @@
 sourceview_plugin_finalize (GObject *obj)
 {
 	/* Finalization codes here */
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, finalize, (obj));
+	G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
 
 static void
 sourceview_plugin_dispose (GObject *obj)
 {
 	/* Disposition codes */
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, dispose, (obj));
+	G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
 
 static void
Index: language-manager/plugin.c
===================================================================
--- language-manager/plugin.c	(revision 3772)
+++ language-manager/plugin.c	(working copy)
@@ -155,7 +155,7 @@
 language_manager_finalize (GObject *obj)
 {
 	/* Finalization codes here */
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, finalize, (obj));
+	G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
 
 static void
@@ -165,7 +165,7 @@
 	LanguageManager* lang = LANGUAGE_MANAGER (obj);
 	
 	g_hash_table_unref (lang->languages);
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, dispose, (obj));
+	G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
 
 static void
Index: class-inheritance/plugin.c
===================================================================
--- class-inheritance/plugin.c	(revision 3772)
+++ class-inheritance/plugin.c	(working copy)
@@ -24,7 +24,7 @@
 #include <config.h>
 #include <libanjuta/anjuta-shell.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libanjuta/interfaces/ianjuta-document-manager.h>
 #include <libanjuta/interfaces/ianjuta-project-manager.h>
 #include <libanjuta/anjuta-debug.h>
@@ -169,14 +169,14 @@
 		g_free (ci_plugin->top_dir);
 	
 	/* Finalization codes here */
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, finalize, (obj));
+	G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
 
 static void
 class_inheritance_dispose (GObject *obj)
 {
 	/* Disposition codes */
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, dispose, (obj));
+	G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
 
 static void
Index: debug-manager/plugin.c
===================================================================
--- debug-manager/plugin.c	(revision 3772)
+++ debug-manager/plugin.c	(working copy)
@@ -1283,7 +1283,7 @@
 static void
 dma_plugin_dispose (GObject* obj)
 {
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, dispose, (G_OBJECT (obj)));
+	G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
 
 /* finalize is the last destruction step. It must free all memory allocated
@@ -1304,7 +1304,7 @@
 		g_object_remove_weak_pointer (G_OBJECT (self->current_editor), (gpointer *)(gpointer)&self->current_editor);
 	}
 	
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, finalize, (G_OBJECT (obj)));
+	G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
 
 /* class_init intialize the class itself not the instance */
Index: debug-manager/queue.c
===================================================================
--- debug-manager/queue.c	(revision 3772)
+++ debug-manager/queue.c	(working copy)
@@ -898,7 +898,7 @@
 
 	dma_debugger_queue_clear (self);
 
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, dispose, (obj));
+	G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
 
 /* finalize is the last destruction step. It must free all memory allocated
@@ -912,7 +912,7 @@
 
 	g_queue_free (self->queue);
 
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, finalize, (obj));
+	G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
 
 /* instance_init is the constructor. All functions should work after this
Index: subversion/plugin.c
===================================================================
--- subversion/plugin.c	(revision 3772)
+++ subversion/plugin.c	(working copy)
@@ -527,14 +527,14 @@
 finalize (GObject *obj)
 {
 	apr_terminate ();
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, finalize, (G_OBJECT(obj)));
+	G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
 
 static void
 dispose (GObject *obj)
 {
 	// Subversion *plugin = ANJUTA_PLUGIN_SUBVERSION (obj);
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, dispose, (G_OBJECT(obj)));
+	G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
 
 static void
Index: patch/plugin.c
===================================================================
--- patch/plugin.c	(revision 3772)
+++ patch/plugin.c	(working copy)
@@ -122,14 +122,14 @@
 	PatchPlugin *p_plugin;
 	p_plugin = ANJUTA_PLUGIN_PATCH (obj);
 	/*/
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, finalize, (obj));
+	G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
 
 
 static void
 patch_plugin_dispose (GObject *obj)
 {
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, dispose, (obj));
+	G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
 
 
Index: tools/plugin.c
===================================================================
--- tools/plugin.c	(revision 3772)
+++ tools/plugin.c	(working copy)
@@ -164,9 +164,17 @@
 {
 	/* Warning this function could be called several times */
 
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, dispose, (G_OBJECT (obj)));
+	G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
 
+static void
+atp_plugin_finalize (GObject *obj)
+{
+	/* Warning this function could be called several times */
+
+	G_OBJECT_CLASS (parent_class)->finalize (obj);
+}
+
 /* finalize used to free object created with instance init is not used */
 
 static gboolean
@@ -238,6 +246,7 @@
 	plugin_class->activate = atp_plugin_activate;
 	plugin_class->deactivate = atp_plugin_deactivate;
 	klass->dispose = atp_plugin_dispose;
+	klass->finalize = atp_plugin_finalize;
 }
 
 ANJUTA_PLUGIN_BOILERPLATE (ATPPlugin, atp_plugin);
Index: project-wizard/plugin.c
===================================================================
--- project-wizard/plugin.c	(revision 3772)
+++ project-wizard/plugin.c	(working copy)
@@ -62,9 +62,15 @@
 		this->view = NULL;
 	}
 
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, dispose, (G_OBJECT (obj)));
+	G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
 
+static void
+npw_plugin_finalize (GObject *obj)
+{
+	G_OBJECT_CLASS (parent_class)->finalize (obj);
+}
+
 /* finalize used to free object created with instance init is not used */
 
 static gboolean
@@ -91,6 +97,7 @@
 	plugin_class->activate = npw_plugin_activate;
 	plugin_class->deactivate = npw_plugin_deactivate;
 	klass->dispose = npw_plugin_dispose;
+	klass->finalize = npw_plugin_finalize;
 }
 
 static void
Index: search/plugin.c
===================================================================
--- search/plugin.c	(revision 3772)
+++ search/plugin.c	(working copy)
@@ -269,10 +269,18 @@
 {
 	//SearchPlugin *plugin = ANJUTA_PLUGIN_SEARCH (obj);
 	
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, dispose, (obj));
+	G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
 
 static void
+finalize (GObject *obj)
+{
+	//SearchPlugin *plugin = ANJUTA_PLUGIN_SEARCH (obj);
+	
+	G_OBJECT_CLASS (parent_class)->finalize (obj);
+}
+
+static void
 search_plugin_instance_init (GObject *obj)
 {
 	//SearchPlugin *plugin = ANJUTA_PLUGIN_SEARCH (obj);
@@ -288,6 +296,7 @@
 	plugin_class->activate = activate_plugin;
 	plugin_class->deactivate = deactivate_plugin;
 	klass->dispose = dispose;
+	klass->finalize = finalize;
 }
 ANJUTA_PLUGIN_BEGIN (SearchPlugin, search_plugin);
 ANJUTA_PLUGIN_END;
Index: build-basic-autotools/build-basic-autotools.c
===================================================================
--- build-basic-autotools/build-basic-autotools.c	(revision 3772)
+++ build-basic-autotools/build-basic-autotools.c	(working copy)
@@ -2134,7 +2134,7 @@
 static void
 dispose (GObject *obj)
 {
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, dispose, (G_OBJECT(obj)));
+	G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
 
 static void
@@ -2163,7 +2163,7 @@
 	ba_plugin->program_args = NULL;
 	ba_plugin->configure_args = NULL;
 	
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, finalize, (G_OBJECT(obj)));
+	G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
 
 static void
Index: valgrind/plugin.c
===================================================================
--- valgrind/plugin.c	(revision 3772)
+++ valgrind/plugin.c	(working copy)
@@ -23,7 +23,7 @@
 
 #include <config.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libgnomevfs/gnome-vfs.h>
 #include <libgnome/gnome-util.h>
 #include <libgnomeui/gnome-about.h>
@@ -613,14 +613,14 @@
 valgrind_finalize (GObject *obj)
 {
 	/* Finalization codes here */
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, finalize, (obj));
+	G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
 
 static void
 valgrind_dispose (GObject *obj)
 {
 	/* Disposition codes */
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, dispose, (obj));
+	G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
 
 static void
Index: terminal/terminal.c
===================================================================
--- terminal/terminal.c	(revision 3772)
+++ terminal/terminal.c	(working copy)
@@ -648,13 +648,13 @@
 static void
 terminal_plugin_dispose (GObject *obj)
 {
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, dispose, (obj));
+	G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
 
 static void
 terminal_plugin_finalize (GObject *obj)
 {
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, finalize, (obj));
+	G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
 
 static void
Index: class-gen/plugin.c
===================================================================
--- class-gen/plugin.c	(revision 3772)
+++ class-gen/plugin.c	(working copy)
@@ -20,7 +20,7 @@
 #include <config.h>
 #include <gtk/gtkactiongroup.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libanjuta/anjuta-preferences.h>
 #include <libanjuta/anjuta-debug.h>
 #include <libanjuta/interfaces/ianjuta-wizard.h>
@@ -128,7 +128,7 @@
 static void
 dispose (GObject *obj)
 {
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, dispose, (obj));
+	G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
 
 static void
@@ -143,7 +143,7 @@
 	if(cg_plugin->generator != NULL)
 		g_object_unref(G_OBJECT(cg_plugin->generator));
 
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, finalize, (obj));
+	G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
 
 static void
Index: gtodo/plugin.c
===================================================================
--- gtodo/plugin.c	(revision 3772)
+++ gtodo/plugin.c	(working copy)
@@ -226,13 +226,13 @@
 static void
 finalize (GObject *obj)
 {
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, finalize, (obj));
+	G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
 
 static void
 dispose (GObject *obj)
 {
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, dispose, (obj));
+	G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
 
 static void
Index: project-import/plugin.c
===================================================================
--- project-import/plugin.c	(revision 3772)
+++ project-import/plugin.c	(working copy)
@@ -20,7 +20,7 @@
 
 #include <config.h>
 #include <gtk/gtkactiongroup.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libanjuta/anjuta-debug.h>
 #include <libanjuta/interfaces/ianjuta-wizard.h>
 #include <libanjuta/interfaces/ianjuta-file.h>
@@ -56,10 +56,16 @@
 static void
 dispose (GObject *obj)
 {
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, dispose, (obj));
+	G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
 
 static void
+finalize (GObject *obj)
+{
+	G_OBJECT_CLASS (parent_class)->finalize (obj);
+}
+
+static void
 project_import_plugin_instance_init (GObject *obj)
 {
 	// AnjutaFileWizardPlugin *plugin = ANJUTA_PLUGIN_PROJECT_IMPORT (obj);
@@ -75,6 +81,7 @@
 	plugin_class->activate = activate_plugin;
 	plugin_class->deactivate = deactivate_plugin;
 	klass->dispose = dispose;
+	klass->finalize = finalize;
 }
 
 static void
Index: project-manager/plugin.c
===================================================================
--- project-manager/plugin.c	(revision 3772)
+++ project-manager/plugin.c	(working copy)
@@ -1524,14 +1524,14 @@
 project_manager_plugin_finalize (GObject *obj)
 {
 	/* FIXME: */
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, finalize, (obj));
+	G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
 
 static void
 project_manager_plugin_dispose (GObject *obj)
 {
 	/* FIXME: */
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, dispose, (obj));
+	G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
 
 static void
Index: indent/plugin.c
===================================================================
--- indent/plugin.c	(revision 3772)
+++ indent/plugin.c	(working copy)
@@ -282,14 +282,14 @@
 indent_plugin_finalize (GObject *obj)
 {
 	/* Finalization codes here */
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, finalize, (obj));
+	G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
 
 static void
 indent_plugin_dispose (GObject *obj)
 {
 	/* Disposition codes */
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, dispose, (obj));
+	G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
 
 static void
Index: editor/plugin.c
===================================================================
--- editor/plugin.c	(revision 3772)
+++ editor/plugin.c	(working copy)
@@ -67,10 +67,17 @@
 {
 	/* EditorPlugin *eplugin = ANJUTA_PLUGIN_EDITOR (obj); */
 
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, dispose, (obj));
+	G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
 
 static void
+finalize (GObject *obj)
+{
+	/* Finalization codes here */
+	G_OBJECT_CLASS (parent_class)->finalize (obj);
+}
+
+static void
 editor_plugin_instance_init (GObject *obj)
 {
 	/* EditorPlugin *plugin = ANJUTA_PLUGIN_EDITOR (obj); */
@@ -86,6 +93,7 @@
 	plugin_class->activate = activate_plugin;
 	plugin_class->deactivate = deactivate_plugin;
 	klass->dispose = dispose;
+	klass->finalize = finalize;
 }
 
 static IAnjutaEditor*
Index: editor/text_editor.c
===================================================================
--- editor/text_editor.c	(revision 3772)
+++ editor/text_editor.c	(working copy)
@@ -538,7 +538,7 @@
 		text_editor_prefs_finalize (te);
 		te->gconf_notify_ids = NULL;
 	}
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, dispose, (G_OBJECT(te)));
+	G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
 
 void
@@ -551,7 +551,7 @@
 	g_free (te->force_hilite);
 	g_free (te->last_saved_content);
 	
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, finalize, (G_OBJECT(te)));
+	G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
 
 void
Index: document-manager/plugin.c
===================================================================
--- document-manager/plugin.c	(revision 3772)
+++ document-manager/plugin.c	(working copy)
@@ -1819,10 +1819,17 @@
 dispose (GObject *obj)
 {
 	// DocmanPlugin *eplugin = ANJUTA_PLUGIN_DOCMAN (obj);
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, dispose, (obj));
+	G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
 
 static void
+finalize (GObject *obj)
+{
+	/* Finalization codes here */
+	G_OBJECT_CLASS (parent_class)->finalize (obj);
+}
+
+static void
 docman_plugin_instance_init (GObject *obj)
 {
 	DocmanPlugin *plugin = ANJUTA_PLUGIN_DOCMAN (obj);
@@ -1842,6 +1849,7 @@
 	plugin_class->activate = activate_plugin;
 	plugin_class->deactivate = deactivate_plugin;
 	klass->dispose = dispose;
+	klass->finalize = finalize;
 }
 
 /* Implement IAnjutaDocumentManager interfaces */
Index: document-manager/anjuta-docman.c
===================================================================
--- document-manager/anjuta-docman.c	(revision 3772)
+++ document-manager/anjuta-docman.c	(working copy)
@@ -610,7 +610,7 @@
 		}
 		g_list_free (pages);
 	}
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, dispose, (G_OBJECT(obj)));
+	G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
 
 static void
@@ -627,7 +627,7 @@
 		g_free (docman->priv);
 		docman->priv = NULL;
 	}
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, finalize, (G_OBJECT(obj)));
+	G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
 
 static void
Index: file-manager/plugin.c
===================================================================
--- file-manager/plugin.c	(revision 3772)
+++ file-manager/plugin.c	(working copy)
@@ -286,14 +286,14 @@
 	g_list_free(plugin->gconf_notify_ids);
 	
 	/* Finalization codes here */
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, finalize, (obj));
+	G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
 
 static void
 file_manager_dispose (GObject *obj)
 {
 	/* Disposition codes */
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, dispose, (obj));
+	G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
 
 static void
Index: symbol-db/plugin.c
===================================================================
--- symbol-db/plugin.c	(revision 3772)
+++ symbol-db/plugin.c	(working copy)
@@ -1170,14 +1170,14 @@
 {
 	DEBUG_PRINT ("Symbol-DB finalize");
 	/* Finalization codes here */
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, finalize, (obj));
+	G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
 
 static void
 symbol_db_dispose (GObject *obj)
 {
 	/* Disposition codes */
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, dispose, (obj));
+	G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
 
 static void
Index: gdb/plugin.c
===================================================================
--- gdb/plugin.c	(revision 3772)
+++ gdb/plugin.c	(working copy)
@@ -253,7 +253,7 @@
 		debugger_free (this->debugger);
 		this->debugger = NULL;
 	}
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, dispose, (G_OBJECT (obj)));
+	G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
 
 /* finalize is the last destruction step. It must free all memory allocated
@@ -263,7 +263,7 @@
 static void
 gdb_plugin_finalize (GObject* obj)
 {
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, finalize, (G_OBJECT (obj)));
+	G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
 
 /* class_init intialize the class itself not the instance */
Index: gdb/debugger.c
===================================================================
--- gdb/debugger.c	(revision 3772)
+++ gdb/debugger.c	(working copy)
@@ -3724,7 +3724,7 @@
 		debugger->priv->launcher = NULL;
 	}
 
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, dispose, (obj));
+	G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
 
 static void
@@ -3735,7 +3735,7 @@
 	g_string_free (debugger->priv->stdo_acc, TRUE);
 	g_string_free (debugger->priv->stde_line, TRUE);
 	g_free (debugger->priv);
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, finalize, (obj));
+	G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
 
 static void
Index: language-support-cpp-java/plugin.c
===================================================================
--- language-support-cpp-java/plugin.c	(revision 3772)
+++ language-support-cpp-java/plugin.c	(working copy)
@@ -1811,14 +1811,14 @@
 	/* CppJavaPlugin* plugin = ANJUTA_PLUGIN_CPP_JAVA (obj); */
 
 	/* Finalization codes here */
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, finalize, (obj));
+	G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
 
 static void
 cpp_java_plugin_dispose (GObject *obj)
 {
 	/* Disposition codes */
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, dispose, (obj));
+	G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
 
 static void
Index: message-view/plugin.c
===================================================================
--- message-view/plugin.c	(revision 3772)
+++ message-view/plugin.c	(working copy)
@@ -260,14 +260,14 @@
 message_view_plugin_dispose (GObject *obj)
 {
 	// MessageViewPlugin *plugin = ANJUTA_PLUGIN_MESSAGE_VIEW (obj);
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, dispose, (obj));
+	G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
 
 static void
 message_view_plugin_finalize (GObject *obj)
 {
 	// MessageViewPlugin *plugin = ANJUTA_PLUGIN_MESSAGE_VIEW (obj);
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, finalize, (obj));
+	G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
 
 static void
Index: message-view/anjuta-msgman.c
===================================================================
--- message-view/anjuta-msgman.c	(revision 3772)
+++ message-view/anjuta-msgman.c	(working copy)
@@ -182,7 +182,7 @@
 	{
 		anjuta_msgman_remove_all_views (msgman);
 	}
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, dispose, (G_OBJECT(obj)));
+	G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
 
 static void
@@ -195,7 +195,7 @@
 		g_free (msgman->priv);
 		msgman->priv = NULL;
 	}
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, finalize, (G_OBJECT(obj)));
+	G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
 
 static void
Index: message-view/message-view.c
===================================================================
--- message-view/message-view.c	(revision 3772)
+++ message-view/message-view.c	(working copy)
@@ -668,7 +668,7 @@
 	{
 		mview->privat->tree_view = NULL;
 	}
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, dispose, (G_OBJECT(obj)));
+	G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
 
 static void
@@ -679,7 +679,7 @@
 	g_free (mview->privat->label);
 	g_free (mview->privat->pixmap);
 	g_free (mview->privat);
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, finalize, (G_OBJECT(obj)));
+	G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
 
 static void
Index: macro/plugin.c
===================================================================
--- macro/plugin.c	(revision 3772)
+++ macro/plugin.c	(working copy)
@@ -147,7 +147,7 @@
 static void
 finalize (GObject * obj)
 {
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, finalize, (G_OBJECT (obj)));
+	G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
 
 static void
@@ -157,7 +157,7 @@
 	if (plugin->macro_dialog != NULL)
 		g_object_unref (plugin->macro_dialog);
 	g_object_unref(plugin->macro_db);
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, dispose, (G_OBJECT (obj)));
+	G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
 
 static void
Index: macro/macro-dialog.c
===================================================================
--- macro/macro-dialog.c	(revision 3772)
+++ macro/macro-dialog.c	(working copy)
@@ -232,15 +232,22 @@
 		g_object_unref (dialog->macro_db);
 		dialog->macro_db = NULL;
 	}
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, dispose, (G_OBJECT (object)));
+	G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
 
 static void
+macro_dialog_finalize (GObject *object)
+{
+	G_OBJECT_CLASS (parent_class)->finalize (obj);
+}
+
+static void
 macro_dialog_class_init (MacroDialogClass * klass)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
 	parent_class = g_type_class_peek_parent (klass);
 	object_class->dispose = macro_dialog_dispose;
+	object_class->finalize = macro_dialog_finalize;
 }
 
 static void
Index: macro/macro-db.c
===================================================================
--- macro/macro-db.c	(revision 3772)
+++ macro/macro-db.c	(working copy)
@@ -218,15 +218,24 @@
 {
 	DEBUG_PRINT ("Disposing MacroDB");
 	macro_db_save (MACRO_DB (db));
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, dispose, (G_OBJECT (db)));
+	G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
 
 static void
+macro_db_finalize (GObject * db)
+{
+	DEBUG_PRINT ("Disposing MacroDB");
+	macro_db_save (MACRO_DB (db));
+	G_OBJECT_CLASS (parent_class)->finalize (obj);
+}
+
+static void
 macro_db_class_init (MacroDBClass * klass)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
 	parent_class = g_type_class_peek_parent (klass);
 	object_class->dispose = macro_db_dispose;
+	object_class->finalize = macro_db_finalize;
 }
 
 static void
Index: macro/macro-edit.c
===================================================================
--- macro/macro-edit.c	(revision 3772)
+++ macro/macro-edit.c	(working copy)
@@ -168,15 +168,24 @@
 {
 	//MacroEdit *medit = MACRO_EDIT (edit);
 	//g_object_unref(medit->gxml);
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, dispose, (G_OBJECT (edit)));
+	G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
 
 static void
+macro_edit_finalize (GObject * edit)
+{
+	//MacroEdit *medit = MACRO_EDIT (edit);
+	//g_object_unref(medit->gxml);
+	G_OBJECT_CLASS (parent_class)->finalize (obj);
+}
+
+static void
 macro_edit_class_init (MacroEditClass * klass)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
 	parent_class = g_type_class_peek_parent (klass);
 	object_class->dispose = macro_edit_dispose;
+	object_class->finalize = macro_edit_finalize;
 }
 
 static void
Index: sample1/plugin.c
===================================================================
--- sample1/plugin.c	(revision 3772)
+++ sample1/plugin.c	(working copy)
@@ -102,14 +102,14 @@
 sample_plugin_finalize (GObject *obj)
 {
 	/* Finalization codes here */
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, finalize, (obj));
+	G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
 
 static void
 sample_plugin_dispose (GObject *obj)
 {
 	/* Disposition codes */
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, dispose, (obj));
+	G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
 
 static void
Index: gvim/plugin.c
===================================================================
--- gvim/plugin.c	(revision 3772)
+++ gvim/plugin.c	(working copy)
@@ -51,14 +51,14 @@
 static void
 anjuta_vim_plugin_finalize (GObject *obj)
 {
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, finalize, (obj));
+	G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
 
 
 static void
 anjuta_vim_plugin_dispose (GObject *obj)
 {
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, dispose, (obj));
+	G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
 
 static void
Index: glade/plugin.c
===================================================================
--- glade/plugin.c	(revision 3772)
+++ glade/plugin.c	(working copy)
@@ -582,7 +582,7 @@
 	/* GladePlugin *plugin = ANJUTA_PLUGIN_GLADE (obj); */
 	
 	/* FIXME: Glade widgets should be destroyed */
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, dispose, (obj));
+	G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
 
 static void
@@ -590,7 +590,7 @@
 {
 	GladePlugin *plugin = ANJUTA_PLUGIN_GLADE (obj);
 	g_free (plugin->priv);
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, finalize, (obj));
+	G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
 
 static void
@@ -616,7 +616,7 @@
 	plugin_class->activate = activate_plugin;
 	plugin_class->deactivate = deactivate_plugin;
 	klass->dispose = glade_plugin_dispose;
-	klass->dispose = glade_plugin_finalize;
+	klass->finalize = glade_plugin_finalize;
 }
 
 gchar* glade_get_filename(GladePlugin *plugin)
Index: file-wizard/plugin.c
===================================================================
--- file-wizard/plugin.c	(revision 3772)
+++ file-wizard/plugin.c	(working copy)
@@ -20,7 +20,7 @@
 
 #include <config.h>
 #include <gtk/gtkactiongroup.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 #include <libanjuta/anjuta-debug.h>
 #include <libanjuta/interfaces/ianjuta-document-manager.h>
@@ -100,10 +100,17 @@
 static void
 dispose (GObject *obj)
 {
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, dispose, (obj));
+	G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
 
 static void
+finalize (GObject *obj)
+{
+	/* Finalization codes here */
+	G_OBJECT_CLASS (parent_class)->finalize (obj);
+}
+
+static void
 file_wizard_plugin_instance_init (GObject *obj)
 {
 	AnjutaFileWizardPlugin *plugin = ANJUTA_PLUGIN_FILE_WIZARD (obj);
@@ -120,6 +127,7 @@
 	plugin_class->activate = activate_plugin;
 	plugin_class->deactivate = deactivate_plugin;
 	klass->dispose = dispose;
+	klass->finalize = finalize;
 }
 
 static void
