Index: file-loader/plugin.c
===================================================================
--- file-loader/plugin.c	(revision 3772)
+++ file-loader/plugin.c	(working copy)
@@ -1221,7 +1221,7 @@
 		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
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: 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: 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: 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: 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,7 +67,7 @@
 {
 	/* EditorPlugin *eplugin = ANJUTA_PLUGIN_EDITOR (obj); */
 
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, dispose, (obj));
+	G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
 
 static void
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,7 +1819,7 @@
 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
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: 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: 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,7 +100,7 @@
 static void
 dispose (GObject *obj)
 {
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, dispose, (obj));
+	G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
 
 static void
