Index: src/anjuta-app.c
===================================================================
--- src/anjuta-app.c	(revision 4852)
+++ src/anjuta-app.c	(working copy)
@@ -896,7 +896,7 @@
 	menuitem = GTK_CHECK_MENU_ITEM (gtk_check_menu_item_new_with_label (title));
 	gtk_widget_show (GTK_WIDGET (menuitem));
 	gtk_check_menu_item_set_active (menuitem, TRUE);
-	gtk_menu_append (GTK_MENU (app->view_menu), GTK_WIDGET (menuitem));
+	gtk_menu_shell_append (GTK_MENU_SHELL (app->view_menu), GTK_WIDGET (menuitem));
 
 	if (locked)
 		g_object_set( G_OBJECT(menuitem), "visible", FALSE, NULL);
Index: src/start-with.c
===================================================================
--- src/start-with.c	(revision 4852)
+++ src/start-with.c	(working copy)
@@ -29,7 +29,7 @@
 on_application_wizard_clicked (GtkButton *button, gpointer data)
 {
 	GtkWidget *dialog = GTK_WIDGET (data);
-	gtk_signal_emit_by_name (GTK_OBJECT (app->menubar.file.new_project),
+	g_signal_emit_by_name (G_OBJECT (app->menubar.file.new_project),
 							 "activate", NULL);
 	gtk_widget_destroy (dialog);
 }
@@ -38,7 +38,7 @@
 on_import_wizard_clicked (GtkButton *button, gpointer data)
 {
 	GtkWidget *dialog = GTK_WIDGET (data);
-	gtk_signal_emit_by_name (GTK_OBJECT (app->menubar.file.import_project),
+	g_signal_emit_by_name (G_OBJECT (app->menubar.file.import_project),
 							 "activate", NULL);
 	gtk_widget_destroy (dialog);
 }
@@ -47,7 +47,7 @@
 on_open_project_clicked (GtkButton *button, gpointer data)
 {
 	GtkWidget *dialog = GTK_WIDGET (data);
-	gtk_signal_emit_by_name (GTK_OBJECT (app->menubar.file.open_project),
+	g_signal_emit_by_name (G_OBJECT (app->menubar.file.open_project),
 							 "activate", NULL);
 	gtk_widget_destroy (dialog);
 }
@@ -72,7 +72,7 @@
 on_open_file_clicked (GtkButton *button, gpointer data)
 {
 	GtkWidget *dialog = GTK_WIDGET (data);
-	gtk_signal_emit_by_name (GTK_OBJECT (app->menubar.file.open_file),
+	g_signal_emit_by_name (G_OBJECT (app->menubar.file.open_file),
 							 "activate", NULL);
 	gtk_widget_destroy (dialog);
 }
@@ -81,7 +81,7 @@
 on_new_file_clicked (GtkButton *button, gpointer data)
 {
 	GtkWidget *dialog = GTK_WIDGET (data);
-	gtk_signal_emit_by_name (GTK_OBJECT (app->menubar.file.new_file),
+	g_signal_emit_by_name (G_OBJECT (app->menubar.file.new_file),
 							 "activate", NULL);
 	gtk_widget_destroy (dialog);
 }
Index: src/shell.c
===================================================================
--- src/shell.c	(revision 4852)
+++ src/shell.c	(working copy)
@@ -76,7 +76,7 @@
 	win = gtk_dialog_new_with_buttons (_("Anjuta Plugins"), GTK_WINDOW (shell),
 									   GTK_DIALOG_DESTROY_WITH_PARENT,
 									   GTK_STOCK_CLOSE, GTK_STOCK_CANCEL, NULL);
-	gtk_box_pack_start_defaults (GTK_BOX (GTK_DIALOG(win)->vbox), accel_editor);
+	gtk_box_pack_start (GTK_BOX (GTK_DIALOG(win)->vbox), accel_editor, TRUE, TRUE, 0);
 	gtk_window_set_default_size (GTK_WINDOW (win), 500, 400);
 	gtk_dialog_run (GTK_DIALOG (win));
 	gtk_widget_destroy (win);
@@ -163,7 +163,7 @@
 	g_list_free (plugins_dirs);
 	
 	plugins = anjuta_plugin_manager_get_plugins_page (shell->plugin_manager);
-	gtk_box_pack_end_defaults (GTK_BOX (shell->box), plugins);
+	gtk_box_pack_end (GTK_BOX (shell->box), plugins, TRUE, TRUE, 0);
 	
 	/* Preferencesnces */
 	shell->preferences = ANJUTA_PREFERENCES (anjuta_preferences_new (shell->plugin_manager));
Index: src/about.c
===================================================================
--- src/about.c	(revision 4852)
+++ src/about.c	(working copy)
@@ -251,7 +251,7 @@
 		authors_v = g_strsplit(authors, ",", -1);
 	}
 	dialog = gtk_about_dialog_new();
-	gtk_about_dialog_set_name(GTK_ABOUT_DIALOG(dialog), name);
+	gtk_about_dialog_set_program_name(GTK_ABOUT_DIALOG(dialog), name);
 	gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(dialog), VERSION);
 	if (license)
 		gtk_about_dialog_set_copyright(GTK_ABOUT_DIALOG(dialog), 
Index: plugins/scintilla/scintilla/include/ScintillaWidget.h
===================================================================
--- plugins/scintilla/scintilla/include/ScintillaWidget.h	(revision 4852)
+++ plugins/scintilla/scintilla/include/ScintillaWidget.h	(working copy)
@@ -15,9 +15,9 @@
 extern "C" {
 #endif
 
-#define SCINTILLA(obj)          GTK_CHECK_CAST (obj, scintilla_get_type (), ScintillaObject)
-#define SCINTILLA_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, scintilla_get_type (), ScintillaClass)
-#define IS_SCINTILLA(obj)       GTK_CHECK_TYPE (obj, scintilla_get_type ())
+#define SCINTILLA(obj)          G_TYPE_CHECK_INSTANCE_CAST (obj, scintilla_get_type (), ScintillaObject)
+#define SCINTILLA_CLASS(klass)  G_TYPE_CHECK_CLASS_CAST (klass, scintilla_get_type (), ScintillaClass)
+#define IS_SCINTILLA(obj)       G_TYPE_CHECK_INSTANCE_TYPE (obj, scintilla_get_type ())
 
 typedef struct _ScintillaObject ScintillaObject;
 typedef struct _ScintillaClass  ScintillaClass;
Index: plugins/scintilla/scintilla/ScintillaGTK.cxx
===================================================================
--- plugins/scintilla/scintilla/ScintillaGTK.cxx	(revision 4852)
+++ plugins/scintilla/scintilla/ScintillaGTK.cxx	(working copy)
@@ -992,7 +992,11 @@
 	if (timer.ticking != on) {
 		timer.ticking = on;
 		if (timer.ticking) {
+#if GLIB_MAJOR_VERSION < 2
 			timer.tickerID = reinterpret_cast<TickerID>(gtk_timeout_add(timer.tickSize, (GtkFunction)TimeOut, this));
+#else
+			timer.tickerID = reinterpret_cast<TickerID>(g_timeout_add(timer.tickSize, (GSourceFunc)TimeOut, this));
+#endif
 		} else {
 			gtk_timeout_remove(GPOINTER_TO_UINT(timer.tickerID));
 		}
Index: plugins/scintilla/style-editor.c
===================================================================
--- plugins/scintilla/style-editor.c	(revision 4852)
+++ plugins/scintilla/style-editor.c	(working copy)
@@ -689,10 +689,10 @@
 		style_data_set_item (sdata, hilite_style[i]);
 		g_object_set_data_full (G_OBJECT (se->priv->dialog),
 					  hilite_style[i], sdata,
-					  (GtkDestroyNotify)style_data_destroy);
+					  (GDestroyNotify)style_data_destroy);
 	}
 	se->priv->default_style =
-		gtk_object_get_data (GTK_OBJECT (se->priv->dialog),
+		g_object_get_data (G_OBJECT (se->priv->dialog),
 				     hilite_style[0]);
 	se->priv->current_style = NULL;
 
@@ -811,7 +811,7 @@
 		if (hilite_style[i] == NULL)
 			break;
 		sdata =
-			gtk_object_get_data (GTK_OBJECT (se->priv->dialog),
+			g_object_get_data (G_OBJECT (se->priv->dialog),
 								 hilite_style[i]);
 		str = style_data_get_string (sdata);
 		if (str)
Index: plugins/file-loader/plugin.c
===================================================================
--- plugins/file-loader/plugin.c	(revision 4852)
+++ plugins/file-loader/plugin.c	(working copy)
@@ -239,7 +239,7 @@
 	
 	/* Document manager plugin */
 	menuitem = gtk_menu_item_new_with_label (_("Document Manager"));
-	gtk_menu_append (menu, menuitem);
+	gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
 	
 	/* Open with plugins menu items */
 	plugin_descs = get_available_plugins_for_mime (ANJUTA_PLUGIN (plugin), mime_type);
@@ -267,7 +267,7 @@
 												  "Location", &name);
 		}
 		menuitem = gtk_menu_item_new_with_label (name);
-		gtk_menu_append (menu, menuitem);
+		gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
 		g_free (name);
 		snode = g_list_next (snode);
 	}
@@ -278,7 +278,7 @@
 	{
 		/* Separator */
 		menuitem = gtk_menu_item_new ();
-		gtk_menu_append (menu, menuitem);
+		gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
 	}	
 	node = mime_apps;
 	while (node)
@@ -288,7 +288,7 @@
 		{
 			menuitem = gtk_menu_item_new_with_label (
 					g_app_info_get_name (mime_app));
-			gtk_menu_append (menu, menuitem);
+			gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
 		}
 		node = g_list_next (node);
 	}
@@ -934,7 +934,7 @@
 		g_object_set_data (G_OBJECT (menuitem), "mime_type", mime_type);			
 		g_signal_connect (G_OBJECT (menuitem), "activate",
 						  G_CALLBACK (callback), callback_data);
-		gtk_menu_append (menu, menuitem);
+		gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
 		g_free (name);
 	}
 	g_list_free (plugin_descs);
@@ -944,7 +944,7 @@
 	if (plugin_descs && mime_apps)
 	{
 		menuitem = gtk_menu_item_new ();
-		gtk_menu_append (menu, menuitem);
+		gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
 	}
 	
 	for (node = mime_apps; node != NULL; node = g_list_next (node))
@@ -959,7 +959,7 @@
 			g_object_set_data (G_OBJECT (menuitem), "mime_type", mime_type);			
 			g_signal_connect (G_OBJECT (menuitem), "activate",
 							  G_CALLBACK (callback), callback_data);
-			gtk_menu_append (menu, menuitem);
+			gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
 		}
 		else
 		{
Index: plugins/sourceview/anjuta-view.h
===================================================================
--- plugins/sourceview/anjuta-view.h	(revision 4852)
+++ plugins/sourceview/anjuta-view.h	(working copy)
@@ -81,7 +81,7 @@
 /*
  * Public methods
  */
-GtkType		 anjuta_view_get_type     	(void) G_GNUC_CONST;
+GType		 anjuta_view_get_type     	(void) G_GNUC_CONST;
 
 GtkWidget	*anjuta_view_new			(Sourceview   *sv);
 
Index: plugins/debug-manager/sharedlib.c
===================================================================
--- plugins/debug-manager/sharedlib.c	(revision 4852)
+++ plugins/debug-manager/sharedlib.c	(working copy)
@@ -309,7 +309,7 @@
 		if(sl->is_showing == FALSE) return;
 			gdk_window_get_root_origin(sl->widgets.window->window,
 									   &sl->win_pos_x, &sl->win_pos_y);
-		gdk_window_get_size(sl ->widgets.window->window, &sl->win_width,
+		gdk_drawable_get_size(sl ->widgets.window->window, &sl->win_width,
 							&sl->win_height);
 		gtk_widget_hide(sl->widgets.window);
 		sl->is_showing = FALSE;
Index: plugins/debug-manager/signals.c
===================================================================
--- plugins/debug-manager/signals.c	(revision 4852)
+++ plugins/debug-manager/signals.c	(working copy)
@@ -363,10 +363,10 @@
 	tv = signals_create_list_store_and_treeview (sg);
 	gtk_widget_show (tv);
 	gtk_container_add (GTK_CONTAINER (scrolledwindow4), tv);
-	gtk_signal_connect (GTK_OBJECT (window3), "delete_event",
-						GTK_SIGNAL_FUNC (on_signals_delete_event),sg);
-	gtk_signal_connect (GTK_OBJECT (window3), "key-press-event",
-						GTK_SIGNAL_FUNC (on_signals_key_press_event), sg);
+	g_signal_connect (G_OBJECT (window3), "delete_event",
+						G_CALLBACK (on_signals_delete_event),sg);
+	g_signal_connect (G_OBJECT (window3), "key-press-event",
+						G_CALLBACK (on_signals_key_press_event), sg);
 	
 	sg->widgets.window = window3;
 	sg->widgets.treeview = tv;
@@ -444,7 +444,7 @@
 			return;
 		gdk_window_get_root_origin (sg->widgets.window->window, &sg->win_pos_x,
 									&sg->win_pos_y);
-		gdk_window_get_size (sg->widgets.window->window, &sg->win_width,
+		gdk_drawable_get_size (sg->widgets.window->window, &sg->win_width,
 							 &sg->win_height);
 		gtk_widget_hide (sg->widgets.window);
 		sg->is_showing = FALSE;
Index: plugins/patch/patch-plugin.c
===================================================================
--- plugins/patch/patch-plugin.c	(revision 4852)
+++ plugins/patch/patch-plugin.c	(working copy)
@@ -123,7 +123,7 @@
 	scale = glade_xml_get_widget(gxml, "patch_level_scale");
 	adj = gtk_range_get_adjustment(GTK_RANGE(scale));
 	g_signal_connect (G_OBJECT(adj), "value_changed",
-			    GTK_SIGNAL_FUNC (patch_level_changed), NULL);
+			    G_CALLBACK (patch_level_changed), NULL);
 		
 	plugin->patch_button = glade_xml_get_widget(gxml, "patch_button");
 	plugin->cancel_button = glade_xml_get_widget(gxml, "cancel_button");
Index: plugins/tools/dialog.c
===================================================================
--- plugins/tools/dialog.c	(revision 4852)
+++ plugins/tools/dialog.c	(working copy)
@@ -344,12 +344,12 @@
 	this->down_bt = glade_xml_get_widget(xml, TOOL_DOWN_BUTTON);
 
 	/* Connect all signals */
-	glade_xml_signal_connect_data (xml, TOOL_ADD_SIGNAL, GTK_SIGNAL_FUNC (on_tool_add), this);
-	glade_xml_signal_connect_data (xml, TOOL_ACTIVATED_SIGNAL, GTK_SIGNAL_FUNC (on_tool_activated), this);
-	glade_xml_signal_connect_data (xml, TOOL_EDIT_SIGNAL, GTK_SIGNAL_FUNC (on_tool_edit), this);
-	glade_xml_signal_connect_data (xml, TOOL_DELETE_SIGNAL, GTK_SIGNAL_FUNC (on_tool_delete), this);
-	glade_xml_signal_connect_data (xml, TOOL_UP_SIGNAL, GTK_SIGNAL_FUNC (on_tool_up), this);
-	glade_xml_signal_connect_data (xml, TOOL_DOWN_SIGNAL, GTK_SIGNAL_FUNC (on_tool_down), this);
+	glade_xml_signal_connect_data (xml, TOOL_ADD_SIGNAL, G_CALLBACK (on_tool_add), this);
+	glade_xml_signal_connect_data (xml, TOOL_ACTIVATED_SIGNAL, G_CALLBACK (on_tool_activated), this);
+	glade_xml_signal_connect_data (xml, TOOL_EDIT_SIGNAL, G_CALLBACK (on_tool_edit), this);
+	glade_xml_signal_connect_data (xml, TOOL_DELETE_SIGNAL, G_CALLBACK (on_tool_delete), this);
+	glade_xml_signal_connect_data (xml, TOOL_UP_SIGNAL, G_CALLBACK (on_tool_up), this);
+	glade_xml_signal_connect_data (xml, TOOL_DOWN_SIGNAL, G_CALLBACK (on_tool_down), this);
 	selection = gtk_tree_view_get_selection (this->view);
 	this->changed_sig = g_signal_connect (G_OBJECT (selection), "changed", G_CALLBACK (on_tool_selection_changed), this);
 
Index: plugins/tools/editor.c
===================================================================
--- plugins/tools/editor.c	(revision 4852)
+++ plugins/tools/editor.c	(working copy)
@@ -463,8 +463,8 @@
 	atp_variable_dialog_populate (this, flag);
 
 	/* Connect all signals */	
-	glade_xml_signal_connect_data (xml, VARIABLE_RESPONSE_SIGNAL, GTK_SIGNAL_FUNC (on_variable_response), this);
-	glade_xml_signal_connect_data (xml, VARIABLE_ACTIVATE_SIGNAL, GTK_SIGNAL_FUNC (on_variable_activate), this);
+	glade_xml_signal_connect_data (xml, VARIABLE_RESPONSE_SIGNAL, G_CALLBACK (on_variable_response), this);
+	glade_xml_signal_connect_data (xml, VARIABLE_ACTIVATE_SIGNAL, G_CALLBACK (on_variable_activate), this);
 	g_signal_connect (G_OBJECT (this->dialog), "delete_event", G_CALLBACK (gtk_widget_hide_on_delete), NULL);
 
 	g_object_unref (xml);
@@ -1012,14 +1012,14 @@
 	atp_update_sensitivity (this);
 
 	/* Connect all signals */	
-	glade_xml_signal_connect_data (xml, EDITOR_RESPONSE_SIGNAL, GTK_SIGNAL_FUNC (on_editor_response), this);
-	glade_xml_signal_connect_data (xml, EDITOR_PARAM_VARIABLE_SIGNAL, GTK_SIGNAL_FUNC (on_editor_param_variable_show), this);
-	glade_xml_signal_connect_data (xml, EDITOR_DIR_VARIABLE_SIGNAL, GTK_SIGNAL_FUNC (on_editor_dir_variable_show), this);
-	glade_xml_signal_connect_data (xml, EDITOR_TOGGLE_SHORCUT_SIGNAL, GTK_SIGNAL_FUNC (on_editor_shortcut_toggle), this);
-	glade_xml_signal_connect_data (xml, EDITOR_TOGGLE_TERMINAL_SIGNAL, GTK_SIGNAL_FUNC (on_editor_terminal_toggle), this);
-	glade_xml_signal_connect_data (xml, EDITOR_TOGGLE_SCRIPT_SIGNAL, GTK_SIGNAL_FUNC (on_editor_script_toggle), this);
-	glade_xml_signal_connect_data (xml, EDITOR_INPUT_VARIABLE_SIGNAL, GTK_SIGNAL_FUNC (on_editor_input_variable_show), this);
-	glade_xml_signal_connect_data (xml, EDITOR_INPUT_CHANGED_SIGNAL, GTK_SIGNAL_FUNC (on_editor_input_changed), this);
+	glade_xml_signal_connect_data (xml, EDITOR_RESPONSE_SIGNAL, G_CALLBACK (on_editor_response), this);
+	glade_xml_signal_connect_data (xml, EDITOR_PARAM_VARIABLE_SIGNAL, G_CALLBACK (on_editor_param_variable_show), this);
+	glade_xml_signal_connect_data (xml, EDITOR_DIR_VARIABLE_SIGNAL, G_CALLBACK (on_editor_dir_variable_show), this);
+	glade_xml_signal_connect_data (xml, EDITOR_TOGGLE_SHORCUT_SIGNAL, G_CALLBACK (on_editor_shortcut_toggle), this);
+	glade_xml_signal_connect_data (xml, EDITOR_TOGGLE_TERMINAL_SIGNAL, G_CALLBACK (on_editor_terminal_toggle), this);
+	glade_xml_signal_connect_data (xml, EDITOR_TOGGLE_SCRIPT_SIGNAL, G_CALLBACK (on_editor_script_toggle), this);
+	glade_xml_signal_connect_data (xml, EDITOR_INPUT_VARIABLE_SIGNAL, G_CALLBACK (on_editor_input_variable_show), this);
+	glade_xml_signal_connect_data (xml, EDITOR_INPUT_CHANGED_SIGNAL, G_CALLBACK (on_editor_input_changed), this);
 
 	g_object_unref (xml);
 
Index: plugins/gtodo/mcategory.c
===================================================================
--- plugins/gtodo/mcategory.c	(revision 4852)
+++ plugins/gtodo/mcategory.c	(working copy)
@@ -48,7 +48,7 @@
 	/* the buttonbox */
 	vbutbox = gtk_vbutton_box_new();
 	gtk_button_box_set_layout(GTK_BUTTON_BOX(vbutbox), GTK_BUTTONBOX_START);    
-	gtk_button_box_set_spacing(GTK_BUTTON_BOX(vbutbox), 6);
+	gtk_box_set_spacing (GTK_BOX(vbutbox), 6);
 	gtk_box_pack_start(GTK_BOX(hbox), vbutbox, FALSE, TRUE, 0);
 
 
Index: plugins/project-manager/gbf-project-model.h
===================================================================
--- plugins/project-manager/gbf-project-model.h	(revision 4852)
+++ plugins/project-manager/gbf-project-model.h	(working copy)
@@ -29,10 +29,10 @@
 #include "gbf-tree-data.h"
 
 #define GBF_TYPE_PROJECT_MODEL            (gbf_project_model_get_type ())
-#define GBF_PROJECT_MODEL(obj)	          (GTK_CHECK_CAST ((obj), GBF_TYPE_PROJECT_MODEL, GbfProjectModel))
-#define GBF_PROJECT_MODEL_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GBF_TYPE_PROJECT_MODEL, GbfProjectModelClass))
-#define GBF_IS_PROJECT_MODEL(obj)	      (GTK_CHECK_TYPE ((obj), GBF_TYPE_PROJECT_MODEL))
-#define GBF_IS_PROJECT_MODEL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GBF_TYPE_PROJECT_MODEL))
+#define GBF_PROJECT_MODEL(obj)	          (G_TYPE_CHECK_INSTANCE_CAST ((obj), GBF_TYPE_PROJECT_MODEL, GbfProjectModel))
+#define GBF_PROJECT_MODEL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GBF_TYPE_PROJECT_MODEL, GbfProjectModelClass))
+#define GBF_IS_PROJECT_MODEL(obj)	      (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GBF_TYPE_PROJECT_MODEL))
+#define GBF_IS_PROJECT_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GBF_TYPE_PROJECT_MODEL))
 
 typedef struct _GbfProjectModel        GbfProjectModel;
 typedef struct _GbfProjectModelClass   GbfProjectModelClass;
Index: plugins/project-manager/gbf-project-view.h
===================================================================
--- plugins/project-manager/gbf-project-view.h	(revision 4852)
+++ plugins/project-manager/gbf-project-view.h	(working copy)
@@ -29,10 +29,10 @@
 G_BEGIN_DECLS
 
 #define GBF_TYPE_PROJECT_VIEW		  (gbf_project_view_get_type ())
-#define GBF_PROJECT_VIEW(obj)		  (GTK_CHECK_CAST ((obj), GBF_TYPE_PROJECT_VIEW, GbfProjectView))
-#define GBF_PROJECT_VIEW_CLASS(klass)	  (GTK_CHECK_CLASS_CAST ((klass), GBF_TYPE_PROJECT_VIEW, GbfProjectViewClass))
-#define GBF_IS_PROJECT_VIEW(obj)	  (GTK_CHECK_TYPE ((obj), GBF_TYPE_PROJECT_VIEW))
-#define GBF_IS_PROJECT_VIEW_CLASS(klass)  (GTK_CHECK_CLASS_TYPE ((obj), GBF_TYPE_PROJECT_VIEW))
+#define GBF_PROJECT_VIEW(obj)		  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GBF_TYPE_PROJECT_VIEW, GbfProjectView))
+#define GBF_PROJECT_VIEW_CLASS(klass)	  (G_TYPE_CHECK_CLASS_CAST ((klass), GBF_TYPE_PROJECT_VIEW, GbfProjectViewClass))
+#define GBF_IS_PROJECT_VIEW(obj)	  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GBF_TYPE_PROJECT_VIEW))
+#define GBF_IS_PROJECT_VIEW_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((obj), GBF_TYPE_PROJECT_VIEW))
 
 typedef struct _GbfProjectView        GbfProjectView;
 typedef struct _GbfProjectViewPrivate GbfProjectViewPrivate;
Index: plugins/indent/indent-dialog.c
===================================================================
--- plugins/indent/indent-dialog.c	(revision 4852)
+++ plugins/indent/indent-dialog.c	(working copy)
@@ -161,12 +161,12 @@
 
 	ptrdata = data;
 	indent_widget_signal_connect(ptrdata->checkbutton,  "toggled",
-	                 GTK_SIGNAL_FUNC(on_indent_checkbutton_toggled), 
+	                 G_CALLBACK(on_indent_checkbutton_toggled), 
 	                 idt);
 	
 	if (ptrdata->spinbutton)
 		indent_widget_signal_connect(ptrdata->spinbutton, "value_changed",
-	                 GTK_SIGNAL_FUNC(on_indent_spinbutton_value_changed), 
+	                 G_CALLBACK(on_indent_spinbutton_value_changed), 
 	                 idt);
 }
 
@@ -276,11 +276,11 @@
 		}
 	}
 	indent_block_widget(PARAMETERS_ENTRY, 
-	                    GTK_SIGNAL_FUNC (on_indent_parameters_entry_changed),
+	                    G_CALLBACK (on_indent_parameters_entry_changed),
                         TRUE, idt);
 	indent_entry_set_chars(line, idt);
 	indent_block_widget(PARAMETERS_ENTRY, 
-	                    GTK_SIGNAL_FUNC (on_indent_parameters_entry_changed),
+	                    G_CALLBACK (on_indent_parameters_entry_changed),
                         FALSE, idt);
 	g_free(line);
 }
@@ -304,11 +304,11 @@
 	line = indent_insert_option(line, option);
 	g_free(option);
 	indent_block_widget(PARAMETERS_ENTRY, 
-	                    GTK_SIGNAL_FUNC (on_indent_parameters_entry_changed),
+	                    G_CALLBACK (on_indent_parameters_entry_changed),
                         TRUE, idt);
 	indent_entry_set_chars(line, idt);
 	indent_block_widget(PARAMETERS_ENTRY, 
-	                    GTK_SIGNAL_FUNC (on_indent_parameters_entry_changed),
+	                    G_CALLBACK (on_indent_parameters_entry_changed),
                         FALSE, idt);
 	g_free(line);
 }
@@ -364,10 +364,10 @@
 	indent_set_style_combo(idt->style_active, idt);
 	
 	g_signal_connect(GTK_OBJECT(idt->dialog), "delete_event",
-                     (GtkSignalFunc)indent_exit,
+                     (GCallBack)indent_exit,
                      NULL);
 	g_signal_connect(GTK_OBJECT(idt->dialog), "destroy",
-                     (GtkSignalFunc)indent_exit,
+                     (GCallBack)indent_exit,
                      NULL);
 	return idt->dialog;
 }
Index: plugins/document-manager/plugin.c
===================================================================
--- plugins/document-manager/plugin.c	(revision 4852)
+++ plugins/document-manager/plugin.c	(working copy)
@@ -1709,7 +1709,7 @@
 	dplugin->uiid = anjuta_ui_merge (ui, UI_FILE);
 	dplugin->vbox = gtk_vbox_new (FALSE, 0);
 	gtk_widget_show (dplugin->vbox);
-	gtk_box_pack_start_defaults (GTK_BOX(dplugin->vbox), docman);
+	gtk_box_pack_start (GTK_BOX(dplugin->vbox), docman, TRUE, TRUE, 0);
 	anjuta_shell_add_widget_full (plugin->shell, dplugin->vbox,
 							 "AnjutaDocumentManager", _("Documents"),
 							 "editor-plugin-icon", 
Index: plugins/document-manager/anjuta-bookmarks.c
===================================================================
--- plugins/document-manager/anjuta-bookmarks.c	(revision 4852)
+++ plugins/document-manager/anjuta-bookmarks.c	(working copy)
@@ -236,8 +236,8 @@
 	g_signal_connect (G_OBJECT(priv->button_remove), "clicked", G_CALLBACK(on_remove_clicked), bookmarks);
 	gtk_widget_set_sensitive (GTK_WIDGET(priv->button_add), FALSE);
 	gtk_widget_set_sensitive (GTK_WIDGET(priv->button_remove), FALSE);
-	gtk_box_pack_start_defaults (GTK_BOX(button_box), priv->button_add);
-	gtk_box_pack_start_defaults (GTK_BOX(button_box), priv->button_remove);
+	gtk_box_pack_start (GTK_BOX(button_box), priv->button_add, TRUE, TRUE, 0);
+	gtk_box_pack_start (GTK_BOX(button_box), priv->button_remove, TRUE, TRUE, 0);
 
 	gtk_box_pack_start(GTK_BOX(priv->window), 
 					   button_box,
Index: plugins/symbol-db/symbol-db-view-search.c
===================================================================
--- plugins/symbol-db/symbol-db-view-search.c	(revision 4852)
+++ plugins/symbol-db/symbol-db-view-search.c	(working copy)
@@ -539,7 +539,7 @@
 	gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (priv->hitlist), FALSE);
 
 	gtk_container_add (GTK_CONTAINER (list_sw), priv->hitlist);
-	gtk_box_pack_end_defaults (GTK_BOX (search), frame);
+	gtk_box_pack_end (GTK_BOX (search), frame, TRUE, TRUE, 0);
 
 	gtk_widget_show_all (GTK_WIDGET (search));
 }
Index: plugins/gdb/utilities.h
===================================================================
--- plugins/gdb/utilities.h	(revision 4852)
+++ plugins/gdb/utilities.h	(working copy)
@@ -278,11 +278,11 @@
 											   const gchar *iconfile,
 											   const gchar *label,
 											   const gchar *tooltip,
-											   GtkSignalFunc callback,
+											   GCallBack callback,
 											   gpointer user_data);
 GtkWidget *
 anjuta_util_toolbar_append_stock (GtkWidget *toolbar, const gchar *stock_icon,
-								  const gchar *tooltip, GtkSignalFunc callback, 
+								  const gchar *tooltip, GCallBack callback, 
 								  gpointer user_data);
 
 GtkWidget*
Index: plugins/message-view/anjuta-msgman.c
===================================================================
--- plugins/message-view/anjuta-msgman.c	(revision 4852)
+++ plugins/message-view/anjuta-msgman.c	(working copy)
@@ -313,7 +313,7 @@
 					  G_CALLBACK (on_message_view_destroy), msgman);
 
 	g_signal_handlers_block_by_func (GTK_OBJECT (msgman),
-									 GTK_SIGNAL_FUNC
+									 G_CALLBACK
 									 (on_notebook_switch_page), msgman);
 
 	page_num =
@@ -329,7 +329,7 @@
 		anjuta_msgman_set_current_view (msgman, NULL);
 
 	g_signal_handlers_unblock_by_func (GTK_OBJECT (msgman),
-									   GTK_SIGNAL_FUNC
+									   G_CALLBACK
 									   (on_notebook_switch_page), msgman);
 }
 
@@ -348,7 +348,7 @@
 	gtk_widget_show_all (page->box);
 	
 	g_signal_handlers_block_by_func (GTK_OBJECT (msgman),
-									 GTK_SIGNAL_FUNC
+									 G_CALLBACK
 									 (on_notebook_switch_page), msgman);
 	msgman->priv->views =
 		g_list_prepend (msgman->priv->views, (gpointer) page);
@@ -359,7 +359,7 @@
 	g_signal_connect (G_OBJECT (mv), "destroy",
 					  G_CALLBACK (on_message_view_destroy), msgman);
 	g_signal_handlers_unblock_by_func (GTK_OBJECT (msgman),
-									   GTK_SIGNAL_FUNC
+									   G_CALLBACK
 									   (on_notebook_switch_page), msgman);
 	g_signal_emit_by_name(G_OBJECT(msgman), "view_changed");
 }
@@ -402,7 +402,7 @@
 	AnjutaMsgmanPage *page;
 	
 	g_signal_handlers_block_by_func (GTK_OBJECT (msgman),
-									 GTK_SIGNAL_FUNC
+									 G_CALLBACK
 									 (on_notebook_switch_page), msgman);
 	views = NULL;
 	node = msgman->priv->views;
@@ -425,7 +425,7 @@
 	msgman->priv->views = NULL;
 	anjuta_msgman_set_current_view (msgman, NULL);
 	g_signal_handlers_unblock_by_func (GTK_OBJECT (msgman),
-									   GTK_SIGNAL_FUNC
+									   G_CALLBACK
 									   (on_notebook_switch_page), msgman);
 }
 
Index: plugins/macro/macro-actions.c
===================================================================
--- plugins/macro/macro-actions.c	(revision 4852)
+++ plugins/macro/macro-actions.c	(working copy)
@@ -137,8 +137,8 @@
 	gtk_window_set_decorated(GTK_WINDOW(window), FALSE);
 
 	gtk_container_add(GTK_CONTAINER(window), hbox);
-	gtk_box_pack_start_defaults(GTK_BOX(hbox), label);
-	gtk_box_pack_end_defaults(GTK_BOX(hbox), entry);
+	gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
+	gtk_box_pack_end(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
 	g_signal_connect (G_OBJECT (window), "key-press-event",
 			  G_CALLBACK (on_shortcut_pressed), plugin);
 	gtk_widget_grab_focus (entry);
Index: plugins/file-wizard/file.c
===================================================================
--- plugins/file-wizard/file.c	(revision 4852)
+++ plugins/file-wizard/file.c	(working copy)
@@ -192,7 +192,7 @@
 	for (i=0; i < (sizeof(new_file_type) / sizeof(NewfileType)); i++)
 	{
 		menuitem = gtk_menu_item_new_with_label(new_file_type[i].name);
-		gtk_menu_append(GTK_MENU(menu), menuitem);
+		gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
 		gtk_widget_show(menuitem);
 	}
 	gtk_option_menu_set_menu(GTK_OPTION_MENU(optionmenu), menu);
@@ -202,14 +202,14 @@
 	for (i=0; i < (sizeof(new_license_type) / sizeof(NewlicenseType)); i++)
 	{
 		menuitem = gtk_menu_item_new_with_label(new_license_type[i].name);
-		gtk_menu_append(GTK_MENU(menu), menuitem);
+		gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
 		gtk_widget_show(menuitem);
 	}
 	gtk_option_menu_set_menu(GTK_OPTION_MENU(optionmenu), menu);
 	
 	g_object_set_data (G_OBJECT (nfg->dialog), "IAnjutaDocumentManager", docman);
 	glade_xml_signal_autoconnect(nfg->xml);
-	gtk_signal_emit_by_name(GTK_OBJECT (optionmenu), "changed");
+	g_signal_emit_by_name(G_OBJECT (optionmenu), "changed");
 	
 	return TRUE;
 }
Index: libanjuta/cell-renderer-captioned-image.h
===================================================================
--- libanjuta/cell-renderer-captioned-image.h	(revision 4852)
+++ libanjuta/cell-renderer-captioned-image.h	(working copy)
@@ -27,11 +27,11 @@
 G_BEGIN_DECLS
 
 #define ANJUTA_TYPE_CELL_RENDERER_CAPTIONED_IMAGE		(anjuta_cell_renderer_captioned_image_get_type ())
-#define ANJUTA_CELL_RENDERER_CAPTIONED_IMAGE(obj)		(GTK_CHECK_CAST ((obj), ANJUTA_TYPE_CELL_RENDERER_CAPTIONED_IMAGE, AnjutaCellRendererCaptionedImage))
-#define ANJUTA_CELL_RENDERER_CAPTIONED_IMAGE_CLASS(klass)	(GTK_CHECK_CLASS_CAST ((klass), ANJUTA_TYPE_CELL_RENDERER_CAPTIONED_IMAGE, AnjutaCellRendererCaptionedImageClass))
-#define ANJUTA_IS_CELL_RENDERER_CAPTIONED_IMAGE(obj)		(GTK_CHECK_TYPE ((obj), ANJUTA_TYPE_CELL_RENDERER_CAPTIONED_IMAGE))
-#define ANJUTA_IS_CELL_RENDERER_CAPTIONED_IMAGE_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((klass), ANJUTA_TYPE_CELL_RENDERER_CAPTIONED_IMAGE))
-#define ANJUTA_CELL_RENDERER_CAPTIONED_IMAGE_GET_CLASS(obj)   (GTK_CHECK_GET_CLASS ((obj), ANJUTA_TYPE_CELL_RENDERER_CAPTIONED_IMAGE, AnjutaCellRendererCaptionedImageClass))
+#define ANJUTA_CELL_RENDERER_CAPTIONED_IMAGE(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), ANJUTA_TYPE_CELL_RENDERER_CAPTIONED_IMAGE, AnjutaCellRendererCaptionedImage))
+#define ANJUTA_CELL_RENDERER_CAPTIONED_IMAGE_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), ANJUTA_TYPE_CELL_RENDERER_CAPTIONED_IMAGE, AnjutaCellRendererCaptionedImageClass))
+#define ANJUTA_IS_CELL_RENDERER_CAPTIONED_IMAGE(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), ANJUTA_TYPE_CELL_RENDERER_CAPTIONED_IMAGE))
+#define ANJUTA_IS_CELL_RENDERER_CAPTIONED_IMAGE_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), ANJUTA_TYPE_CELL_RENDERER_CAPTIONED_IMAGE))
+#define ANJUTA_CELL_RENDERER_CAPTIONED_IMAGE_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), ANJUTA_TYPE_CELL_RENDERER_CAPTIONED_IMAGE, AnjutaCellRendererCaptionedImageClass))
 
 typedef struct _AnjutaCellRendererCaptionedImage        AnjutaCellRendererCaptionedImage;
 typedef struct _AnjutaCellRendererCaptionedImageClass   AnjutaCellRendererCaptionedImageClass;
Index: libanjuta/anjuta-preferences.c
===================================================================
--- libanjuta/anjuta-preferences.c	(revision 4852)
+++ libanjuta/anjuta-preferences.c	(working copy)
@@ -845,7 +845,7 @@
 {
 	AnjutaProperty *p = (AnjutaProperty *) user_data;
 
-	gtk_signal_handler_block_by_func (GTK_OBJECT(p->object), G_CALLBACK (update_property_on_change_str), p);
+	g_signal_handlers_block_by_func (G_OBJECT(p->object), G_CALLBACK (update_property_on_change_str), p);
 	return FALSE;
 }
 
@@ -855,7 +855,7 @@
 {
 	AnjutaProperty *p = (AnjutaProperty *) user_data;
 
-	gtk_signal_handler_unblock_by_func (GTK_OBJECT(p->object), G_CALLBACK (update_property_on_change_str), p);
+	g_signal_handlers_unblock_by_func (G_OBJECT(p->object), G_CALLBACK (update_property_on_change_str), p);
 	return FALSE;
 }
 
Index: libanjuta/e-splash.h
===================================================================
--- libanjuta/e-splash.h	(revision 4852)
+++ libanjuta/e-splash.h	(working copy)
@@ -30,10 +30,10 @@
 G_BEGIN_DECLS
 
 #define E_TYPE_SPLASH			(e_splash_get_type ())
-#define E_SPLASH(obj)			(GTK_CHECK_CAST ((obj), E_TYPE_SPLASH, ESplash))
-#define E_SPLASH_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_SPLASH, ESplashClass))
-#define E_IS_SPLASH(obj)			(GTK_CHECK_TYPE ((obj), E_TYPE_SPLASH))
-#define E_IS_SPLASH_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_SPLASH))
+#define E_SPLASH(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_SPLASH, ESplash))
+#define E_SPLASH_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_SPLASH, ESplashClass))
+#define E_IS_SPLASH(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_SPLASH))
+#define E_IS_SPLASH_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_SPLASH))
 
 typedef struct _ESplash        ESplash;
 typedef struct _ESplashPrivate ESplashPrivate;
@@ -49,7 +49,7 @@
 	GtkWindowClass parent_class;
 };
 
-GtkType    e_splash_get_type            (void);
+GType    e_splash_get_type            (void);
 void       e_splash_construct           (ESplash   *splash,
 										 GdkPixbuf *splash_image_pixbuf,
 										 gint progressbar_position);
Index: libanjuta/anjuta-launcher.c
===================================================================
--- libanjuta/anjuta-launcher.c	(revision 4852)
+++ libanjuta/anjuta-launcher.c	(working copy)
@@ -561,7 +561,7 @@
 	
 	icon = anjuta_res_get_image (ANJUTA_PIXMAP_PASSWORD);
 	gtk_widget_show (icon);
-	gtk_box_pack_start_defaults (GTK_BOX(hbox), icon);
+	gtk_box_pack_start (GTK_BOX(hbox), icon, TRUE, TRUE, 0);
 	
 	if (strlen (prompt) < 20) {
 		box = gtk_hbox_new (FALSE, 5);
@@ -569,7 +569,7 @@
 		box = gtk_vbox_new (FALSE, 5);
 	}
 	gtk_widget_show (box);
-	gtk_box_pack_start_defaults (GTK_BOX (hbox), box);
+	gtk_box_pack_start (GTK_BOX (hbox), box, TRUE, TRUE, 0);
 	
 	label = gtk_label_new (_(prompt));
 	gtk_widget_show (label);
