Tons of files. More GtkObject -> GObject stuff.

* Tons of files. More GtkObject -> GObject stuff.
author: Darin Adler <darin@src.gnome.org> 2001-11-04 21:41:24 +0000
committer: Darin Adler <darin@src.gnome.org> 2001-11-04 21:41:24 +0000
commit: bdcd47873fc00c8f0013a2ecc85731622b961326 (patch)
tree: 55a16398d6ad6c5ec459a2be9ce8d812338295c8
parent: 137cfdb8850ee9cdb2f5b340238de5eec0f60fb0 (diff)
download: nautilus-bdcd47873fc00c8f0013a2ecc85731622b961326.tar.gz
92 files changed, 735 insertions, 833 deletions
diff --git a/components/notes/nautilus-notes.c b/components/notes/nautilus-notes.c
index 8b6684484..d1a2e4943 100644
--- a/components/notes/nautilus-notes.c
+++ b/components/notes/nautilus-notes.c
@@ -223,7 +223,7 @@ notes_load_metainfo (Notes *notes)
 	
         g_list_free (attributes);
         
-	gtk_signal_connect (GTK_OBJECT (notes->file),
+	g_signal_connect (G_OBJECT (notes->file),
 			    "changed",
 			    GTK_SIGNAL_FUNC (load_note_text_from_metadata),
 			    notes);
@@ -376,10 +376,10 @@ make_notes_view (const char *iid, gpointer callback_data)
         background = eel_get_widget_background (notes->note_text_field);
         eel_background_set_color (background, NOTES_DEFAULT_BACKGROUND_COLOR);
 
-	gtk_signal_connect (GTK_OBJECT (notes->note_text_field), "focus_out_event",
+	g_signal_connect (G_OBJECT (notes->note_text_field), "focus_out_event",
       	              	    GTK_SIGNAL_FUNC (on_text_field_focus_out_event),
                             notes);
-	gtk_signal_connect (GTK_OBJECT (notes->note_text_field), "changed",
+	g_signal_connect (G_OBJECT (notes->note_text_field), "changed",
       	              	    GTK_SIGNAL_FUNC (on_changed),
                             notes);
      
@@ -387,7 +387,7 @@ make_notes_view (const char *iid, gpointer callback_data)
         
 	/* Create CORBA object. */
         notes->view = nautilus_view_new (vbox);
-        gtk_signal_connect (GTK_OBJECT (notes->view), "destroy", do_destroy, notes);
+        g_signal_connect (G_OBJECT (notes->view), "destroy", do_destroy, notes);
 
 	/* allocate a property bag to reflect the TAB_IMAGE property */
 	notes->property_bag = bonobo_property_bag_new (get_bonobo_properties,  set_bonobo_properties, notes);
@@ -397,7 +397,7 @@ make_notes_view (const char *iid, gpointer callback_data)
 				 "image indicating that a note is present", 0);
         
         /* handle events */
-        gtk_signal_connect (GTK_OBJECT (notes->view), "load_location",
+        g_signal_connect (G_OBJECT (notes->view), "load_location",
                             notes_load_location, notes);
         
         /* handle selections */
diff --git a/components/sample/Makefile.am b/components/sample/Makefile.am
index f65a5c3ea..79ab5fb90 100644
--- a/components/sample/Makefile.am
+++ b/components/sample/Makefile.am
@@ -24,7 +24,7 @@ nautilus_sample_content_view_LDADD =			\
 	$(top_builddir)/libnautilus/libnautilus.la	\
 	$(MODULE_LIBS)
 
-uidir = $(datadir)/gnome/ui
+uidir = $(datadir)/gnome-2.0/ui
 ui_DATA = nautilus-sample-content-view-ui.xml
 
 serverdir = $(datadir)/server
diff --git a/components/sample/nautilus-sample-content-view.c b/components/sample/nautilus-sample-content-view.c
index 4b5c133e3..73ca35471 100644
--- a/components/sample/nautilus-sample-content-view.c
+++ b/components/sample/nautilus-sample-content-view.c
@@ -139,7 +139,7 @@ nautilus_sample_content_view_init (NautilusSampleContentView *view)
 	nautilus_view_construct (NAUTILUS_VIEW (view), 
 				 view->details->label);
 	
-	gtk_signal_connect (GTK_OBJECT (view), 
+	g_signal_connect (G_OBJECT (view), 
 			    "load_location",
 			    sample_load_location_callback, 
 			    NULL);
@@ -147,7 +147,7 @@ nautilus_sample_content_view_init (NautilusSampleContentView *view)
 	/* Get notified when our bonobo control is activated so we can
 	 * merge menu & toolbar items into the shell's UI.
 	 */
-        gtk_signal_connect (GTK_OBJECT (nautilus_view_get_bonobo_control (NAUTILUS_VIEW (view))),
+        g_signal_connect (G_OBJECT (nautilus_view_get_bonobo_control (NAUTILUS_VIEW (view))),
                             "activate",
                             sample_merge_bonobo_items_callback,
                             view);
diff --git a/components/text/Makefile.am b/components/text/Makefile.am
index ffa7f6043..bc167d8e7 100644
--- a/components/text/Makefile.am
+++ b/components/text/Makefile.am
@@ -24,7 +24,7 @@ nautilus_text_view_LDADD =			\
 	$(NAUTILUS_PRIVATE_LIBS) \
 	$(NULL)
 
-uidir = $(datadir)/gnome/ui
+uidir = $(datadir)/gnome-2.0/ui
 ui_DATA = nautilus-text-view-ui.xml
 
 serverdir = $(datadir)/server
diff --git a/components/text/nautilus-text-view.c b/components/text/nautilus-text-view.c
index f9122f84c..d9cc37564 100644
--- a/components/text/nautilus-text-view.c
+++ b/components/text/nautilus-text-view.c
@@ -159,13 +159,13 @@ nautilus_text_view_init (NautilusTextView *text_view)
 	text_view->details->zoomable = bonobo_zoomable_new ();
 	text_view->details->zoom_index = 3;
 	
-	gtk_signal_connect (GTK_OBJECT (text_view->details->zoomable), "set_zoom_level",
+	g_signal_connect (G_OBJECT (text_view->details->zoomable), "set_zoom_level",
 			    GTK_SIGNAL_FUNC (zoomable_set_zoom_level_callback), text_view);
-	gtk_signal_connect (GTK_OBJECT (text_view->details->zoomable), "zoom_in",
+	g_signal_connect (G_OBJECT (text_view->details->zoomable), "zoom_in",
 			    GTK_SIGNAL_FUNC (zoomable_zoom_in_callback), text_view);
-	gtk_signal_connect (GTK_OBJECT (text_view->details->zoomable), "zoom_out",
+	g_signal_connect (G_OBJECT (text_view->details->zoomable), "zoom_out",
 			    GTK_SIGNAL_FUNC (zoomable_zoom_out_callback), text_view);
-	gtk_signal_connect (GTK_OBJECT (text_view->details->zoomable), "zoom_to_fit",
+	g_signal_connect (G_OBJECT (text_view->details->zoomable), "zoom_to_fit",
 			    GTK_SIGNAL_FUNC (zoomable_zoom_to_fit_callback), text_view);
 	
 	bonobo_zoomable_set_parameters_full (text_view->details->zoomable,
@@ -177,7 +177,7 @@ nautilus_text_view_init (NautilusTextView *text_view)
 				     BONOBO_OBJECT (text_view->details->zoomable));
  
     	
-	gtk_signal_connect (GTK_OBJECT (text_view), 
+	g_signal_connect (G_OBJECT (text_view), 
 			    "load_location",
 			    text_view_load_location_callback, 
 			    text_view);
@@ -223,7 +223,7 @@ nautilus_text_view_init (NautilusTextView *text_view)
 	gtk_container_add (GTK_CONTAINER (text_view->details->container), scrolled_window);
 
 	/* get notified when we are activated so we can merge in our menu items */
-        gtk_signal_connect (GTK_OBJECT (nautilus_view_get_bonobo_control
+        g_signal_connect (G_OBJECT (nautilus_view_get_bonobo_control
 					(NAUTILUS_VIEW (text_view))),
                             "activate",
                             merge_bonobo_menu_items,
@@ -779,7 +779,7 @@ merge_bonobo_menu_items (BonoboControl *control, gboolean state, gpointer user_d
 
 		nautilus_text_view_build_service_menu (text_view, control);
 
-                gtk_signal_connect (GTK_OBJECT (bonobo_control_get_ui_component (control)),
+                g_signal_connect (G_OBJECT (bonobo_control_get_ui_component (control)),
                                     "ui_event", handle_ui_event, text_view);
                 
 		nautilus_clipboard_set_up_editable_in_control (GTK_EDITABLE (text_view->details->text_display),
diff --git a/components/throbber/main.c b/components/throbber/main.c
index 454a39d12..ecaf94156 100644
--- a/components/throbber/main.c
+++ b/components/throbber/main.c
@@ -52,13 +52,13 @@ throbber_make_object (BonoboGenericFactory *factory,
 		return NULL;
 	}
 	
-	throbber = NAUTILUS_THROBBER (gtk_object_new (NAUTILUS_TYPE_THROBBER, NULL));
+	throbber = NAUTILUS_THROBBER (g_object_new (NAUTILUS_TYPE_THROBBER, NULL));
 	
 	object_count++;
 	
 	bonobo_control = nautilus_throbber_get_control (throbber);
 	
-	gtk_signal_connect (GTK_OBJECT (bonobo_control), "destroy", throbber_object_destroyed, NULL);
+	g_signal_connect (G_OBJECT (bonobo_control), "destroy", throbber_object_destroyed, NULL);
 
 	return bonobo_control;
 }
diff --git a/components/tree/libmain.c b/components/tree/libmain.c
index 33add833d..4f750d87f 100644
--- a/components/tree/libmain.c
+++ b/components/tree/libmain.c
@@ -52,10 +52,10 @@ tree_shlib_make_object (PortableServer_POA poa,
 		return CORBA_OBJECT_NIL;
 	}
 
-	view = NAUTILUS_TREE_VIEW (gtk_object_new (NAUTILUS_TYPE_TREE_VIEW, NULL));
+	view = NAUTILUS_TREE_VIEW (g_object_new (NAUTILUS_TYPE_TREE_VIEW, NULL));
 
 #if 0
-	gtk_signal_connect (GTK_OBJECT (view), "destroy", tree_shlib_object_destroyed, NULL);
+	g_signal_connect (G_OBJECT (view), "destroy", tree_shlib_object_destroyed, NULL);
 #endif
 
 	bonobo_activation_plugin_use (poa, impl_ptr);
diff --git a/components/tree/nautilus-tree-change-queue.c b/components/tree/nautilus-tree-change-queue.c
index d31ff05dd..3ca206fe9 100644
--- a/components/tree/nautilus-tree-change-queue.c
+++ b/components/tree/nautilus-tree-change-queue.c
@@ -92,7 +92,7 @@ nautilus_tree_change_queue_new (void)
 {
 	NautilusTreeChangeQueue *change_queue;
 
-	change_queue = NAUTILUS_TREE_CHANGE_QUEUE (gtk_object_new (NAUTILUS_TYPE_TREE_CHANGE_QUEUE, NULL));
+	change_queue = NAUTILUS_TREE_CHANGE_QUEUE (g_object_new (NAUTILUS_TYPE_TREE_CHANGE_QUEUE, NULL));
 	gtk_object_ref (GTK_OBJECT (change_queue));
 	gtk_object_sink (GTK_OBJECT (change_queue));
 	return change_queue;
diff --git a/components/tree/nautilus-tree-expansion-state.c b/components/tree/nautilus-tree-expansion-state.c
index 64220208c..3707032df 100644
--- a/components/tree/nautilus-tree-expansion-state.c
+++ b/components/tree/nautilus-tree-expansion-state.c
@@ -173,7 +173,7 @@ nautilus_tree_expansion_state_new (void)
 {
 	NautilusTreeExpansionState *state;
 
-	state = NAUTILUS_TREE_EXPANSION_STATE (gtk_object_new (NAUTILUS_TYPE_TREE_EXPANSION_STATE, NULL));
+	state = NAUTILUS_TREE_EXPANSION_STATE (g_object_new (NAUTILUS_TYPE_TREE_EXPANSION_STATE, NULL));
 	gtk_object_ref (GTK_OBJECT (state));
 	gtk_object_sink (GTK_OBJECT (state));
 	return state;
diff --git a/components/tree/nautilus-tree-model.c b/components/tree/nautilus-tree-model.c
index 2065ca38d..22b44f01f 100644
--- a/components/tree/nautilus-tree-model.c
+++ b/components/tree/nautilus-tree-model.c
@@ -112,7 +112,7 @@ nautilus_tree_model_class_init (gpointer klass)
 		              G_SIGNAL_RUN_LAST,
 		              G_STRUCT_OFFSET (NautilusTreeModelClass, node_changed),
 		              NULL, NULL,
-		              gtk_marshal_NONE__POINTER,
+		              gtk_marshal_VOID__POINTER,
 		              G_TYPE_NONE, 1, GTK_TYPE_POINTER);
 
 	signals[NODE_REMOVED] =
@@ -121,7 +121,7 @@ nautilus_tree_model_class_init (gpointer klass)
 		              G_SIGNAL_RUN_LAST,
 		              G_STRUCT_OFFSET (NautilusTreeModelClass, node_removed),
 		              NULL, NULL,
-		              gtk_marshal_NONE__POINTER,
+		              gtk_marshal_VOID__POINTER,
 		              G_TYPE_NONE, 1, GTK_TYPE_POINTER);
 
 	signals[NODE_BEING_RENAMED] =
@@ -130,7 +130,7 @@ nautilus_tree_model_class_init (gpointer klass)
 		              G_SIGNAL_RUN_LAST,
 		              G_STRUCT_OFFSET (NautilusTreeModelClass, node_removed),
 		              NULL, NULL,
-		              gtk_marshal_NONE__POINTER_POINTER,
+		              gtk_marshal_VOID__POINTER_POINTER,
 		              G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING);
 
 	signals[DONE_LOADING_CHILDREN] =
@@ -139,7 +139,7 @@ nautilus_tree_model_class_init (gpointer klass)
 		              G_SIGNAL_RUN_LAST,
 		              G_STRUCT_OFFSET (NautilusTreeModelClass, done_loading_children),
 		              NULL, NULL,
-		              gtk_marshal_NONE__POINTER,
+		              gtk_marshal_VOID__POINTER,
 		              G_TYPE_NONE, 1, GTK_TYPE_POINTER);
 }
 
@@ -202,7 +202,7 @@ nautilus_tree_model_new (const char *root_uri)
 {
 	NautilusTreeModel *model;
 
-	model = NAUTILUS_TREE_MODEL (gtk_object_new (NAUTILUS_TYPE_TREE_MODEL, NULL));
+	model = NAUTILUS_TREE_MODEL (g_object_new (NAUTILUS_TYPE_TREE_MODEL, NULL));
 	gtk_object_ref (GTK_OBJECT (model));
 	gtk_object_sink (GTK_OBJECT (model));
 
@@ -773,8 +773,8 @@ report_node_changed (NautilusTreeModel *model,
 				     nautilus_tree_node_get_file (node),
 				     node);
 
-		gtk_signal_emit (GTK_OBJECT (model),
-				 signals[NODE_CHANGED],
+		g_signal_emit (G_OBJECT (model),
+				 signals[NODE_CHANGED], 0,
 				 node);
 
 		connect_unparented_nodes (model, node);
@@ -786,8 +786,8 @@ report_node_changed (NautilusTreeModel *model,
 
 		if (strcmp (file_uri, node_uri) == 0) {
 			/* A normal change */
-			gtk_signal_emit (GTK_OBJECT (model),
-					 signals[NODE_CHANGED],
+			g_signal_emit (G_OBJECT (model),
+					 signals[NODE_CHANGED], 0,
 					 node);
 		} else {
 			/* A move or rename - model it as a remove followed by an add */
@@ -799,8 +799,8 @@ report_node_changed (NautilusTreeModel *model,
 			 * it to propagate the expansion state from the old name to the
 			 * new name
 			 */
-			gtk_signal_emit (GTK_OBJECT (model),
-					 signals[NODE_BEING_RENAMED],
+			g_signal_emit (G_OBJECT (model),
+					 signals[NODE_BEING_RENAMED], 0,
 					 node->details->uri, file_uri);
 
 			report_node_removed (model, node);
@@ -861,8 +861,8 @@ report_node_removed_internal (NautilusTreeModel *model,
 		forget_unparented_node (model, node);
 
 		if (signal) {
-			gtk_signal_emit (GTK_OBJECT (model),
-					 signals[NODE_REMOVED],
+			g_signal_emit (G_OBJECT (model),
+					 signals[NODE_REMOVED], 0,
 					 node);
 		}
 
@@ -883,8 +883,8 @@ static void
 report_done_loading (NautilusTreeModel *model,
 		     NautilusTreeNode  *node)
 {
-	gtk_signal_emit (GTK_OBJECT (model),
-			 signals[DONE_LOADING_CHILDREN],
+	g_signal_emit (G_OBJECT (model),
+			 signals[DONE_LOADING_CHILDREN], 0,
 			 node);
 }
 
diff --git a/components/tree/nautilus-tree-node.c b/components/tree/nautilus-tree-node.c
index a0d03e9c5..5d2457e0e 100644
--- a/components/tree/nautilus-tree-node.c
+++ b/components/tree/nautilus-tree-node.c
@@ -88,7 +88,7 @@ nautilus_tree_node_new (NautilusFile *file)
 {
 	NautilusTreeNode *node;
 
-	node = NAUTILUS_TREE_NODE (gtk_object_new (NAUTILUS_TYPE_TREE_NODE, NULL));
+	node = NAUTILUS_TREE_NODE (g_object_new (NAUTILUS_TYPE_TREE_NODE, NULL));
 	gtk_object_ref (GTK_OBJECT (node));
 	gtk_object_sink (GTK_OBJECT (node));
 
diff --git a/components/tree/nautilus-tree-view-dnd.c b/components/tree/nautilus-tree-view-dnd.c
index 5e415da02..7e7405b79 100644
--- a/components/tree/nautilus-tree-view-dnd.c
+++ b/components/tree/nautilus-tree-view-dnd.c
@@ -210,55 +210,55 @@ nautilus_tree_view_init_dnd (NautilusTreeView *view)
 			   | GDK_ACTION_ASK);
 
 
-	gtk_signal_connect (GTK_OBJECT (view->details->tree), 
+	g_signal_connect (G_OBJECT (view->details->tree), 
 			    "drag_begin", 
 			    GTK_SIGNAL_FUNC(nautilus_tree_view_drag_begin), 
 			    view);
 	
-	gtk_signal_connect (GTK_OBJECT (view->details->tree), 
+	g_signal_connect (G_OBJECT (view->details->tree), 
 			    "drag_end", 
 			    GTK_SIGNAL_FUNC(nautilus_tree_view_drag_end), 
 			    view);
 	
-	gtk_signal_connect (GTK_OBJECT (view->details->tree), 
+	g_signal_connect (G_OBJECT (view->details->tree), 
 			    "drag_leave", 
 			    GTK_SIGNAL_FUNC(nautilus_tree_view_drag_leave), 
 			    view);
 
-	gtk_signal_connect (GTK_OBJECT (view->details->tree), 
+	g_signal_connect (G_OBJECT (view->details->tree), 
 			    "drag_motion", 
 			    GTK_SIGNAL_FUNC(nautilus_tree_view_drag_motion), 
 			    view);
 
-	gtk_signal_connect (GTK_OBJECT (view->details->tree), 
+	g_signal_connect (G_OBJECT (view->details->tree), 
 			    "drag_drop", 
 			    GTK_SIGNAL_FUNC(nautilus_tree_view_drag_drop), 
 			    view);
 
-	gtk_signal_connect (GTK_OBJECT (view->details->tree), 
+	g_signal_connect (G_OBJECT (view->details->tree), 
 			    "drag_data_received", 
 			    GTK_SIGNAL_FUNC(nautilus_tree_view_drag_data_received), 
 			    view);
 
-	gtk_signal_connect (GTK_OBJECT (view->details->tree), 
+	g_signal_connect (G_OBJECT (view->details->tree), 
 			    "drag_data_get", 
 			    GTK_SIGNAL_FUNC(nautilus_tree_view_drag_data_get), 
 			    view);
 
 	/* override the default handlers */
-	gtk_signal_connect (GTK_OBJECT (view->details->tree),
+	g_signal_connect (G_OBJECT (view->details->tree),
 			    "button-press-event", 
 			    GTK_SIGNAL_FUNC (nautilus_tree_view_button_press), 
 			    NULL);
-	gtk_signal_connect (GTK_OBJECT (view->details->tree),
+	g_signal_connect (G_OBJECT (view->details->tree),
 			    "button-release-event", 
 			    GTK_SIGNAL_FUNC (nautilus_tree_view_button_release), 
 			    NULL);
-	gtk_signal_connect (GTK_OBJECT (view->details->tree),
+	g_signal_connect (G_OBJECT (view->details->tree),
 			    "motion-notify-event", 
 			    GTK_SIGNAL_FUNC (nautilus_tree_view_motion_notify), 
 			    NULL);
-	gtk_signal_connect (GTK_OBJECT (view->details->tree), "realize", 
+	g_signal_connect (G_OBJECT (view->details->tree), "realize", 
 			    tree_view_realize_callback, view);
 }
 
diff --git a/components/tree/nautilus-tree-view.c b/components/tree/nautilus-tree-view.c
index 3860fffbf..7db741302 100644
--- a/components/tree/nautilus-tree-view.c
+++ b/components/tree/nautilus-tree-view.c
@@ -783,19 +783,19 @@ nautilus_tree_view_load_from_filesystem (NautilusTreeView *view)
 					 nautilus_tree_view_model_node_changed_callback,
 					 view);
 
-	gtk_signal_connect (GTK_OBJECT (view->details->model),
+	g_signal_connect (G_OBJECT (view->details->model),
 			    "node_changed",
 			    nautilus_tree_view_model_node_changed_callback,
 			    view);
-	gtk_signal_connect (GTK_OBJECT (view->details->model),
+	g_signal_connect (G_OBJECT (view->details->model),
 			    "node_removed",
 			    nautilus_tree_view_model_node_removed_callback,
 			    view);
-	gtk_signal_connect (GTK_OBJECT (view->details->model),
+	g_signal_connect (G_OBJECT (view->details->model),
 			    "node_being_renamed",
 			    nautilus_tree_view_model_node_renamed_callback,
 			    view);
-	gtk_signal_connect (GTK_OBJECT (view->details->model),
+	g_signal_connect (G_OBJECT (view->details->model),
 			    "done_loading_children",
 			    nautilus_tree_view_model_done_loading_callback,
 			    view);
@@ -946,17 +946,17 @@ create_tree (NautilusTreeView *view)
 				       + view->details->tree->style->font->descent));
         eel_ctree_set_indent (EEL_CTREE (view->details->tree), 12);
 
-	gtk_signal_connect (GTK_OBJECT (view->details->tree),
+	g_signal_connect (G_OBJECT (view->details->tree),
 			    "tree_expand",
 			    GTK_SIGNAL_FUNC (tree_expand_callback), 
 			    view);
 	
-	gtk_signal_connect (GTK_OBJECT (view->details->tree),
+	g_signal_connect (G_OBJECT (view->details->tree),
 			    "tree_collapse",
 			    GTK_SIGNAL_FUNC (tree_collapse_callback), 
 			    view);
 	
-	gtk_signal_connect (GTK_OBJECT (view->details->tree),
+	g_signal_connect (G_OBJECT (view->details->tree),
 			    "tree_select_row",
 			    GTK_SIGNAL_FUNC (tree_select_row_callback), 
 			    view);
@@ -1045,7 +1045,7 @@ nautilus_tree_view_init (NautilusTreeView *view)
 	view->details->show_non_directories = 
 		! eel_preferences_get_boolean (NAUTILUS_PREFERENCES_TREE_SHOW_ONLY_DIRECTORIES);
 
-	gtk_signal_connect (GTK_OBJECT (view),
+	g_signal_connect (G_OBJECT (view),
 			    "load_location",
 			    GTK_SIGNAL_FUNC (tree_load_location_callback),
 			    view);
@@ -1061,11 +1061,11 @@ nautilus_tree_view_init (NautilusTreeView *view)
 	nautilus_view_construct (NAUTILUS_VIEW (view),
 				 view->details->scrolled_window);
 
-	gtk_signal_connect (GTK_OBJECT (view->details->scrolled_window),
+	g_signal_connect (G_OBJECT (view->details->scrolled_window),
 			    "map",
 			    tree_map_callback,
 			    view);
-	gtk_signal_connect (GTK_OBJECT (view->details->scrolled_window),
+	g_signal_connect (G_OBJECT (view->details->scrolled_window),
 			    "unmap",
 			    tree_unmap_callback,
 			    view);
diff --git a/cut-n-paste-code/widgets/gimphwrapbox/gtkhwrapbox.c b/cut-n-paste-code/widgets/gimphwrapbox/gtkhwrapbox.c
index b904efc23..d36675975 100644
--- a/cut-n-paste-code/widgets/gimphwrapbox/gtkhwrapbox.c
+++ b/cut-n-paste-code/widgets/gimphwrapbox/gtkhwrapbox.c
@@ -540,12 +540,12 @@ layout_rows (GtkWrapBox    *wbox,
     }
   GTK_HWRAP_BOX (wbox)->request_this_height_next_time = total_height;
   if (!(GTK_HWRAP_BOX (wbox)->request_stored_height )) {
-    gtk_signal_emit_by_name (GTK_OBJECT (wbox), "need_reallocation", NULL);
+    g_signal_emit_by_name (GTK_OBJECT (wbox), "need_reallocation", NULL);
     GTK_HWRAP_BOX (wbox)->request_stored_height = TRUE;
   }
   if (total_height > area->height) {
     shrink_height = total_height - area->height; 
-    gtk_signal_emit_by_name (GTK_OBJECT (wbox), "need_reallocation", NULL);
+    g_signal_emit_by_name (GTK_OBJECT (wbox), "need_reallocation", NULL);
   }
   else
     shrink_height = 0;
diff --git a/libnautilus-private/nautilus-authn-manager.c b/libnautilus-private/nautilus-authn-manager.c
index e40b3011d..f3c5e973e 100644
--- a/libnautilus-private/nautilus-authn-manager.c
+++ b/libnautilus-private/nautilus-authn-manager.c
@@ -163,17 +163,17 @@ present_authentication_dialog_nonblocking (CallbackInfo *info)
 
 	gtk_window_set_modal (GTK_WINDOW (dialog), FALSE);
 
-	gtk_signal_connect (GTK_OBJECT (dialog), 
+	g_signal_connect (G_OBJECT (dialog), 
 			     "clicked", 
 			     GTK_SIGNAL_FUNC (authentication_dialog_button_clicked),
 			     info);
 
-	gtk_signal_connect (GTK_OBJECT (dialog), 
+	g_signal_connect (G_OBJECT (dialog), 
 			     "close", 
 			     GTK_SIGNAL_FUNC (authentication_dialog_closed),
 			     info);
 
-	gtk_signal_connect (GTK_OBJECT (dialog), 
+	g_signal_connect (G_OBJECT (dialog), 
 			     "destroy", 
 			     GTK_SIGNAL_FUNC (authentication_dialog_destroyed),
 			     info);
diff --git a/libnautilus-private/nautilus-bookmark.c b/libnautilus-private/nautilus-bookmark.c
index 6e92a09f1..81c185787 100644
--- a/libnautilus-private/nautilus-bookmark.c
+++ b/libnautilus-private/nautilus-bookmark.c
@@ -103,7 +103,7 @@ nautilus_bookmark_class_init (NautilusBookmarkClass *class)
 		              G_SIGNAL_RUN_LAST,
 		              G_STRUCT_OFFSET (NautilusBookmarkClass, appearance_changed),
 		              NULL, NULL,
-		              gtk_marshal_NONE__NONE,
+		              gtk_marshal_VOID__VOID,
 		              G_TYPE_NONE, 0);
 
 	signals[CONTENTS_CHANGED] =
@@ -112,7 +112,7 @@ nautilus_bookmark_class_init (NautilusBookmarkClass *class)
 		              G_SIGNAL_RUN_LAST,
 		              G_STRUCT_OFFSET (NautilusBookmarkClass, contents_changed),
 		              NULL, NULL,
-		              gtk_marshal_NONE__NONE,
+		              gtk_marshal_VOID__VOID,
 		              G_TYPE_NONE, 0);
 				
 }
@@ -298,7 +298,7 @@ nautilus_bookmark_set_name (NautilusBookmark *bookmark, const char *new_name)
 	g_free (bookmark->details->name);
 	bookmark->details->name = g_strdup (new_name);
 
-	gtk_signal_emit (GTK_OBJECT (bookmark), signals[APPEARANCE_CHANGED]);
+	g_signal_emit (G_OBJECT (bookmark), signals[APPEARANCE_CHANGED], 0);
 }
 
 static gboolean
@@ -411,11 +411,11 @@ bookmark_file_changed_callback (NautilusFile *file, NautilusBookmark *bookmark)
 	}
 
 	if (should_emit_appearance_changed_signal) {
-		gtk_signal_emit (GTK_OBJECT (bookmark), signals[APPEARANCE_CHANGED]);
+		g_signal_emit (G_OBJECT (bookmark), signals[APPEARANCE_CHANGED], 0);
 	}
 
 	if (should_emit_contents_changed_signal) {
-		gtk_signal_emit (GTK_OBJECT (bookmark), signals[CONTENTS_CHANGED]);
+		g_signal_emit (G_OBJECT (bookmark), signals[CONTENTS_CHANGED], 0);
 	}
 }
 
@@ -495,7 +495,7 @@ nautilus_bookmark_connect_file (NautilusBookmark *bookmark)
 		bookmark->details->file = nautilus_file_get (bookmark->details->uri);
 		g_assert (!nautilus_file_is_gone (bookmark->details->file));
 
-		gtk_signal_connect (GTK_OBJECT (bookmark->details->file),
+		g_signal_connect (G_OBJECT (bookmark->details->file),
 				    "changed",
 				    G_CALLBACK (bookmark_file_changed_callback),
 				    bookmark);
@@ -517,7 +517,7 @@ nautilus_bookmark_new_with_icon (const char *uri, const char *name,
 {
 	NautilusBookmark *new_bookmark;
 
-	new_bookmark = NAUTILUS_BOOKMARK (gtk_object_new (NAUTILUS_TYPE_BOOKMARK, NULL));
+	new_bookmark = NAUTILUS_BOOKMARK (g_object_new (NAUTILUS_TYPE_BOOKMARK, NULL));
 	gtk_object_ref (GTK_OBJECT (new_bookmark));
 	gtk_object_sink (GTK_OBJECT (new_bookmark));
 
diff --git a/libnautilus-private/nautilus-directory-background.c b/libnautilus-private/nautilus-directory-background.c
index 2cf4b71f7..ae28781ef 100644
--- a/libnautilus-private/nautilus-directory-background.c
+++ b/libnautilus-private/nautilus-directory-background.c
@@ -110,7 +110,7 @@ nautilus_connect_desktop_background_to_file_metadata (NautilusIconContainer *ico
 	if (GTK_WIDGET_REALIZED (icon_container)) {
 		desktop_background_realized (icon_container, GINT_TO_POINTER (FALSE));
 	} else {
-		gtk_signal_connect (GTK_OBJECT (icon_container), "realize", GTK_SIGNAL_FUNC (desktop_background_realized), GINT_TO_POINTER (TRUE));
+		g_signal_connect (G_OBJECT (icon_container), "realize", GTK_SIGNAL_FUNC (desktop_background_realized), GINT_TO_POINTER (TRUE));
 	}
 
 	nautilus_file_background_receive_root_window_changes (background); 
@@ -542,7 +542,7 @@ nautilus_file_background_receive_root_window_changes (EelBackground *background)
 	gdk_flush ();
 	gdk_error_trap_pop ();
 
-	gtk_signal_connect (GTK_OBJECT (background),
+	g_signal_connect (G_OBJECT (background),
  			    "destroy",
 			    GTK_SIGNAL_FUNC (desktop_background_destroyed_callback),
 			    NULL);
@@ -672,7 +672,7 @@ nautilus_file_update_desktop_pixmaps (EelBackground *background)
 	if (eel_background_is_loaded (background)) {
 		image_loading_done_callback (background, TRUE, GINT_TO_POINTER (FALSE));
 	} else {
-		gtk_signal_connect (GTK_OBJECT (background),
+		g_signal_connect (G_OBJECT (background),
 				    "image_loading_done",
 				    GTK_SIGNAL_FUNC (image_loading_done_callback),
 				    GINT_TO_POINTER (TRUE));
@@ -957,19 +957,19 @@ nautilus_connect_background_to_file_metadata (GtkWidget    *widget,
 
         /* Connect new signal handlers. */
         if (file != NULL) {
-                gtk_signal_connect (GTK_OBJECT (background),
+                g_signal_connect (G_OBJECT (background),
                                     "settings_changed",
                                     GTK_SIGNAL_FUNC (background_changed_callback),
                                     file);
-                gtk_signal_connect (GTK_OBJECT (background),
+                g_signal_connect (G_OBJECT (background),
                                     "destroy",
                                     GTK_SIGNAL_FUNC (background_destroyed_callback),
                                     file);
-                gtk_signal_connect (GTK_OBJECT (background),
+                g_signal_connect (G_OBJECT (background),
 				    "reset",
 				    GTK_SIGNAL_FUNC (background_reset_callback),
 				    file);
-		gtk_signal_connect (GTK_OBJECT (file),
+		g_signal_connect (G_OBJECT (file),
                                     "changed",
                                     GTK_SIGNAL_FUNC (saved_settings_changed_callback),
                                     background);
diff --git a/libnautilus-private/nautilus-directory-metafile-monitor.c b/libnautilus-private/nautilus-directory-metafile-monitor.c
index 367bb270d..2483ab440 100644
--- a/libnautilus-private/nautilus-directory-metafile-monitor.c
+++ b/libnautilus-private/nautilus-directory-metafile-monitor.c
@@ -37,28 +37,10 @@ struct NautilusMetafileMonitorDetails {
 static void nautilus_metafile_monitor_init       (NautilusMetafileMonitor      *monitor);
 static void nautilus_metafile_monitor_class_init (NautilusMetafileMonitorClass *klass);
 
-static void destroy (GtkObject *monitor);
-
-static void corba_metafile_changed (PortableServer_Servant       servant,
-				    const Nautilus_FileNameList *file_names,
-				    CORBA_Environment           *ev);
-
-static void corba_metafile_ready   (PortableServer_Servant       servant,
-				    CORBA_Environment           *ev);
-
 EEL_BONOBO_BOILERPLATE_FULL (NautilusMetafileMonitor,
-			       Nautilus_MetafileMonitor,
-			       nautilus_metafile_monitor,
-			       BONOBO_OBJECT_TYPE)
-
-static void
-nautilus_metafile_monitor_class_init (NautilusMetafileMonitorClass *klass)
-{
-	GTK_OBJECT_CLASS (klass)->destroy = destroy;
-
-	klass->epv.metafile_changed = corba_metafile_changed;
-	klass->epv.metafile_ready   = corba_metafile_ready;
-}
+			     Nautilus_MetafileMonitor,
+			     nautilus_metafile_monitor,
+			     BONOBO_OBJECT_TYPE)
 
 static void
 nautilus_metafile_monitor_init (NautilusMetafileMonitor *monitor)
@@ -67,21 +49,21 @@ nautilus_metafile_monitor_init (NautilusMetafileMonitor *monitor)
 }
 
 static void
-destroy (GtkObject *object)
+finalize (GObject *object)
 {
 	NautilusMetafileMonitor *monitor;
 
 	monitor = NAUTILUS_METAFILE_MONITOR (object);
 	g_free (monitor->details);
 
-	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (G_OBJECT_CLASS, finalize, (object));
 }
 
 NautilusMetafileMonitor *
 nautilus_metafile_monitor_new (NautilusDirectory *directory)
 {
 	NautilusMetafileMonitor *monitor;
-	monitor = NAUTILUS_METAFILE_MONITOR (gtk_object_new (NAUTILUS_TYPE_METAFILE_MONITOR, NULL));
+	monitor = NAUTILUS_METAFILE_MONITOR (g_object_new (NAUTILUS_TYPE_METAFILE_MONITOR, NULL));
 	monitor->details->directory = directory;
 	/* The monitor is owned by the directory, so we don't ref the directory. */
 	return monitor;
@@ -135,3 +117,12 @@ corba_metafile_ready (PortableServer_Servant       servant,
 				 NULL,
 				 NULL);
 }
+
+static void
+nautilus_metafile_monitor_class_init (NautilusMetafileMonitorClass *klass)
+{
+	G_OBJECT_CLASS (klass)->finalize = finalize;
+
+	klass->epv.metafile_changed = corba_metafile_changed;
+	klass->epv.metafile_ready   = corba_metafile_ready;
+}
diff --git a/libnautilus-private/nautilus-directory.c b/libnautilus-private/nautilus-directory.c
index 2a0cdd71f..9b0343efe 100644
--- a/libnautilus-private/nautilus-directory.c
+++ b/libnautilus-private/nautilus-directory.c
@@ -91,7 +91,7 @@ nautilus_directory_class_init (NautilusDirectoryClass *klass)
 		              G_SIGNAL_RUN_LAST,
 		              G_STRUCT_OFFSET (NautilusDirectoryClass, files_added),
 		              NULL, NULL,
-		              gtk_marshal_NONE__POINTER,
+		              gtk_marshal_VOID__POINTER,
 		              G_TYPE_NONE, 1, GTK_TYPE_POINTER);
 	signals[FILES_CHANGED] =
 		g_signal_new ("files_changed",
@@ -99,7 +99,7 @@ nautilus_directory_class_init (NautilusDirectoryClass *klass)
 		              G_SIGNAL_RUN_LAST,
 		              G_STRUCT_OFFSET (NautilusDirectoryClass, files_changed),
 		              NULL, NULL,
-		              gtk_marshal_NONE__POINTER,
+		              gtk_marshal_VOID__POINTER,
 		              G_TYPE_NONE, 1, GTK_TYPE_POINTER);
 	signals[DONE_LOADING] =
 		g_signal_new ("done_loading",
@@ -107,7 +107,7 @@ nautilus_directory_class_init (NautilusDirectoryClass *klass)
 		              G_SIGNAL_RUN_LAST,
 		              G_STRUCT_OFFSET (NautilusDirectoryClass, done_loading),
 		              NULL, NULL,
-		              gtk_marshal_NONE__NONE,
+		              gtk_marshal_VOID__VOID,
 		              G_TYPE_NONE, 0);
 	signals[LOAD_ERROR] =
 		g_signal_new ("load_error",
@@ -115,7 +115,7 @@ nautilus_directory_class_init (NautilusDirectoryClass *klass)
 		              G_SIGNAL_RUN_LAST,
 		              G_STRUCT_OFFSET (NautilusDirectoryClass, load_error),
 		              NULL, NULL,
-		              gtk_marshal_NONE__INT,
+		              gtk_marshal_VOID__INT,
 		              G_TYPE_NONE, 1, GTK_TYPE_INT);
 
 	klass->get_name_for_self_as_new_file = real_get_name_for_self_as_new_file;
@@ -486,9 +486,9 @@ nautilus_directory_new (const char *uri)
 	g_assert (uri != NULL);
 
 	if (eel_uri_is_trash (uri)) {
-		directory = NAUTILUS_DIRECTORY (gtk_object_new (NAUTILUS_TYPE_TRASH_DIRECTORY, NULL));
+		directory = NAUTILUS_DIRECTORY (g_object_new (NAUTILUS_TYPE_TRASH_DIRECTORY, NULL));
 	} else {
-		directory = NAUTILUS_DIRECTORY (gtk_object_new (NAUTILUS_TYPE_VFS_DIRECTORY, NULL));
+		directory = NAUTILUS_DIRECTORY (g_object_new (NAUTILUS_TYPE_VFS_DIRECTORY, NULL));
 	}
 	gtk_object_ref (GTK_OBJECT (directory));
 	gtk_object_sink (GTK_OBJECT (directory));
@@ -683,8 +683,8 @@ nautilus_directory_emit_files_added (NautilusDirectory *directory,
 				     GList *added_files)
 {
 	if (added_files != NULL) {
-		gtk_signal_emit (GTK_OBJECT (directory),
-				 signals[FILES_ADDED],
+		g_signal_emit (G_OBJECT (directory),
+				 signals[FILES_ADDED], 0,
 				 added_files);
 	}
 }
@@ -694,8 +694,8 @@ nautilus_directory_emit_files_changed (NautilusDirectory *directory,
 				       GList *changed_files)
 {
 	if (changed_files != NULL) {
-		gtk_signal_emit (GTK_OBJECT (directory),
-				 signals[FILES_CHANGED],
+		g_signal_emit (G_OBJECT (directory),
+				 signals[FILES_CHANGED], 0,
 				 changed_files);
 	}
 }
@@ -715,16 +715,16 @@ nautilus_directory_emit_change_signals (NautilusDirectory *directory,
 void
 nautilus_directory_emit_done_loading (NautilusDirectory *directory)
 {
-	gtk_signal_emit (GTK_OBJECT (directory),
-			 signals[DONE_LOADING]);
+	g_signal_emit (G_OBJECT (directory),
+			 signals[DONE_LOADING], 0);
 }
 
 void
 nautilus_directory_emit_load_error (NautilusDirectory *directory,
 				    GnomeVFSResult error_result)
 {
-	gtk_signal_emit (GTK_OBJECT (directory),
-			 signals[LOAD_ERROR],
+	g_signal_emit (G_OBJECT (directory),
+			 signals[LOAD_ERROR], 0,
 			 error_result);
 }
 
@@ -802,8 +802,8 @@ call_files_added_free_list (gpointer key, gpointer value, gpointer user_data)
 	g_assert (value != NULL);
 	g_assert (user_data == NULL);
 
-	gtk_signal_emit (GTK_OBJECT (key),
-			 signals[FILES_ADDED],
+	g_signal_emit (G_OBJECT (key),
+			 signals[FILES_ADDED], 0,
 			 value);
 	g_list_free (value);
 }
diff --git a/libnautilus-private/nautilus-drag-window.c b/libnautilus-private/nautilus-drag-window.c
index fb83d7478..ebe3f860f 100644
--- a/libnautilus-private/nautilus-drag-window.c
+++ b/libnautilus-private/nautilus-drag-window.c
@@ -408,8 +408,8 @@ nautilus_drag_window_register (GtkWindow *window)
 				  NAUTILUS_DRAG_WINDOW_DETAILS_KEY,
 				  details, g_free);
 
-	gtk_signal_connect (GTK_OBJECT (window), "realize",
+	g_signal_connect (G_OBJECT (window), "realize",
 			    G_CALLBACK (nautilus_drag_window_realize), NULL);
-	gtk_signal_connect (GTK_OBJECT (window), "destroy",
+	g_signal_connect (G_OBJECT (window), "destroy",
 			    G_CALLBACK (nautilus_drag_window_destroy), NULL);
 }
diff --git a/libnautilus-private/nautilus-entry.c b/libnautilus-private/nautilus-entry.c
index 185f751ce..b2437efec 100644
--- a/libnautilus-private/nautilus-entry.c
+++ b/libnautilus-private/nautilus-entry.c
@@ -55,8 +55,8 @@ static void nautilus_entry_init       (NautilusEntry      *entry);
 static void nautilus_entry_class_init (NautilusEntryClass *class);
 
 EEL_CLASS_BOILERPLATE (NautilusEntry,
-				   nautilus_entry,
-				   GTK_TYPE_ENTRY)
+		       nautilus_entry,
+		       GTK_TYPE_ENTRY)
 
 static void
 emacs_shortcuts_preference_changed_callback (gpointer callback_data)
@@ -200,7 +200,7 @@ nautilus_entry_key_press (GtkWidget *widget, GdkEventKey *event)
 	if (result) {
 		new_has = gtk_editable_get_selection_bounds (editable, NULL, NULL);
 		if (old_has || new_has) {
-			gtk_signal_emit (GTK_OBJECT (widget), signals[SELECTION_CHANGED]);
+			g_signal_emit (G_OBJECT (widget), signals[SELECTION_CHANGED], 0);
 		}
 	}
 
@@ -238,7 +238,7 @@ nautilus_entry_motion_notify (GtkWidget *widget, GdkEventMotion *event)
 	if (result) {
 		new_had = gtk_editable_get_selection_bounds (editable, &new_start, &new_end);
 		if (old_had != new_had || (old_had && (old_start != new_start || old_end != new_end))) {
-			gtk_signal_emit (GTK_OBJECT (widget), signals[SELECTION_CHANGED]);
+			g_signal_emit (G_OBJECT (widget), signals[SELECTION_CHANGED], 0);
 		}
 	}
 	
@@ -318,9 +318,11 @@ nautilus_entry_set_text (NautilusEntry *entry, const gchar *text)
 	gtk_entry_set_text (GTK_ENTRY (entry), text);
 	entry->details->user_edit = TRUE;
 	
-	gtk_signal_emit (GTK_OBJECT (entry), signals[SELECTION_CHANGED]);
+	g_signal_emit (G_OBJECT (entry), signals[SELECTION_CHANGED], 0);
 }
 
+#if GNOME2_CONVERSION_COMPLETE
+
 static void
 nautilus_entry_set_selection_bounds (GtkEditable *editable,
 				     int start_pos,
@@ -329,9 +331,11 @@ nautilus_entry_set_selection_bounds (GtkEditable *editable,
 	EEL_CALL_PARENT (GTK_EDITABLE_CLASS, set_selection_bounds,
 			 (editable, start_pos, end_pos));
 
-	gtk_signal_emit (GTK_OBJECT (editable), signals[SELECTION_CHANGED]);
+	g_signal_emit (G_OBJECT (editable), signals[SELECTION_CHANGED], 0);
 }
 
+#endif
+
 static gboolean
 nautilus_entry_button_press (GtkWidget *widget,
 			     GdkEventButton *event)
@@ -342,7 +346,7 @@ nautilus_entry_button_press (GtkWidget *widget,
 		(GTK_WIDGET_CLASS, button_press_event, (widget, event));
 
 	if (result) {
-		gtk_signal_emit (GTK_OBJECT (widget), signals[SELECTION_CHANGED]);
+		g_signal_emit (G_OBJECT (widget), signals[SELECTION_CHANGED], 0);
 	}
 
 	return result;
@@ -358,13 +362,15 @@ nautilus_entry_button_release (GtkWidget *widget,
 		(GTK_WIDGET_CLASS, button_release_event, (widget, event));
 
 	if (result) {
-		gtk_signal_emit (GTK_OBJECT (widget), signals[SELECTION_CHANGED]);
+		g_signal_emit (G_OBJECT (widget), signals[SELECTION_CHANGED], 0);
 	}
 
 	return result;
 }
 
-static void 
+#if GNOME2_CONVERSION_COMPLETE
+
+static void
 nautilus_entry_insert_text (GtkEditable *editable, const gchar *text,
 			    int length, int *position)
 {
@@ -374,13 +380,13 @@ nautilus_entry_insert_text (GtkEditable *editable, const gchar *text,
 
 	/* Fire off user changed signals */
 	if (entry->details->user_edit) {
-		gtk_signal_emit (GTK_OBJECT (editable), signals[USER_CHANGED]);
+		g_signal_emit (G_OBJECT (editable), signals[USER_CHANGED], 0);
 	}
 
 	EEL_CALL_PARENT (GTK_EDITABLE_CLASS, insert_text, 
 			      (editable, text, length, position));
 
-	gtk_signal_emit (GTK_OBJECT (editable), signals[SELECTION_CHANGED]);
+	g_signal_emit (G_OBJECT (editable), signals[SELECTION_CHANGED], 0);
 }
 			 		     
 static void 
@@ -392,15 +398,17 @@ nautilus_entry_delete_text (GtkEditable *editable, int start_pos, int end_pos)
 
 	/* Fire off user changed signals */
 	if (entry->details->user_edit) {
-		gtk_signal_emit (GTK_OBJECT (editable), signals[USER_CHANGED]);
+		g_signal_emit (G_OBJECT (editable), signals[USER_CHANGED], 0);
 	}
 	
 	EEL_CALL_PARENT (GTK_EDITABLE_CLASS, delete_text, 
 			      (editable, start_pos, end_pos));
 
-	gtk_signal_emit (GTK_OBJECT (editable), signals[SELECTION_CHANGED]);
+	g_signal_emit (G_OBJECT (editable), signals[SELECTION_CHANGED], 0);
 }
 
+#endif
+
 /* Overridden to work around GTK bug. The selection_clear_event is queued
  * when the selection changes. Changing the selection to NULL and then
  * back to the original selection owner still sends the event, so the
@@ -428,11 +436,15 @@ nautilus_entry_class_init (NautilusEntryClass *class)
 {
 	GtkWidgetClass *widget_class;
 	GtkObjectClass *object_class;
+#if GNOME2_CONVERSION_COMPLETE
 	GtkEditableClass *editable_class;
+#endif
 		
 	widget_class = GTK_WIDGET_CLASS (class);
 	object_class = GTK_OBJECT_CLASS (class);
+#if GNOME2_CONVERSION_COMPLETE
 	editable_class = GTK_EDITABLE_CLASS (class);
+#endif
 		
 	widget_class->button_press_event = nautilus_entry_button_press;
 	widget_class->button_release_event = nautilus_entry_button_release;
@@ -442,9 +454,11 @@ nautilus_entry_class_init (NautilusEntryClass *class)
 	
 	object_class->destroy = nautilus_entry_destroy;
 	
+#if GNOME2_CONVERSION_COMPLETE
 	editable_class->insert_text = nautilus_entry_insert_text;
 	editable_class->delete_text = nautilus_entry_delete_text;
 	editable_class->set_selection_bounds = nautilus_entry_set_selection_bounds;
+#endif
 
 	/* Set up signals */
 	signals[USER_CHANGED] = g_signal_new
@@ -454,7 +468,7 @@ nautilus_entry_class_init (NautilusEntryClass *class)
 		 G_STRUCT_OFFSET (NautilusEntryClass,
 				    user_changed),
 		 NULL, NULL,
-		 gtk_marshal_NONE__NONE,
+		 gtk_marshal_VOID__VOID,
 		 G_TYPE_NONE, 0);
 	signals[SELECTION_CHANGED] = g_signal_new
 		("selection_changed",
@@ -463,7 +477,7 @@ nautilus_entry_class_init (NautilusEntryClass *class)
 		 G_STRUCT_OFFSET (NautilusEntryClass,
 				    selection_changed),
 		 NULL, NULL,
-		 gtk_marshal_NONE__NONE,
+		 gtk_marshal_VOID__VOID,
 		 G_TYPE_NONE, 0);
 }
 
diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c
index 511a6ebd6..a4bb1f40e 100644
--- a/libnautilus-private/nautilus-file-operations.c
+++ b/libnautilus-private/nautilus-file-operations.c
@@ -355,11 +355,11 @@ create_transfer_dialog (const GnomeVFSXferProgressInfo *progress_info,
 	/* Treat clicking on the close box or use of the escape key
 	 * the same as clicking cancel.
 	 */
-	gtk_signal_connect (GTK_OBJECT (transfer_info->progress_dialog),
+	g_signal_connect (G_OBJECT (transfer_info->progress_dialog),
 			    "clicked",
 			    GTK_SIGNAL_FUNC (gnome_dialog_close),
 			    NULL);
-	gtk_signal_connect (GTK_OBJECT (transfer_info->progress_dialog),
+	g_signal_connect (G_OBJECT (transfer_info->progress_dialog),
 			    "close",
 			    GTK_SIGNAL_FUNC (handle_close_callback),
 			    transfer_info);
diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c
index 0bf864cc7..f4cdeef8f 100644
--- a/libnautilus-private/nautilus-file.c
+++ b/libnautilus-private/nautilus-file.c
@@ -127,7 +127,7 @@ nautilus_file_class_init (NautilusFileClass *klass)
 		              G_SIGNAL_RUN_LAST,
 		              G_STRUCT_OFFSET (NautilusFileClass, changed),
 		              NULL, NULL,
-		              gtk_marshal_NONE__NONE,
+		              gtk_marshal_VOID__VOID,
 		              G_TYPE_NONE, 0);
 
 	signals[UPDATED_DEEP_COUNT_IN_PROGRESS] =
@@ -136,7 +136,7 @@ nautilus_file_class_init (NautilusFileClass *klass)
 		              G_SIGNAL_RUN_LAST,
 		              G_STRUCT_OFFSET (NautilusFileClass, updated_deep_count_in_progress),
 		              NULL, NULL,
-		              gtk_marshal_NONE__NONE,
+		              gtk_marshal_VOID__VOID,
 		              G_TYPE_NONE, 0);
 }
 
@@ -158,9 +158,9 @@ nautilus_file_new_from_relative_uri (NautilusDirectory *directory,
 	g_return_val_if_fail (relative_uri[0] != '\0', NULL);
 
 	if (self_owned && NAUTILUS_IS_TRASH_DIRECTORY (directory)) {
-		file = NAUTILUS_FILE (gtk_object_new (NAUTILUS_TYPE_TRASH_FILE, NULL));
+		file = NAUTILUS_FILE (g_object_new (NAUTILUS_TYPE_TRASH_FILE, NULL));
 	} else {
-		file = NAUTILUS_FILE (gtk_object_new (NAUTILUS_TYPE_VFS_FILE, NULL));
+		file = NAUTILUS_FILE (g_object_new (NAUTILUS_TYPE_VFS_FILE, NULL));
 	}
 	gtk_object_ref (GTK_OBJECT (file));
 	gtk_object_sink (GTK_OBJECT (file));
@@ -271,7 +271,7 @@ nautilus_file_new_from_info (NautilusDirectory *directory,
 	g_return_val_if_fail (NAUTILUS_IS_DIRECTORY (directory), NULL);
 	g_return_val_if_fail (info != NULL, NULL);
 
-	file = NAUTILUS_FILE (gtk_object_new (NAUTILUS_TYPE_VFS_FILE, NULL));
+	file = NAUTILUS_FILE (g_object_new (NAUTILUS_TYPE_VFS_FILE, NULL));
 
 #ifdef NAUTILUS_FILE_DEBUG_REF
 	printf("%10p ref'd\n", file);
@@ -4676,7 +4676,7 @@ nautilus_file_updated_deep_count_in_progress (NautilusFile *file) {
 	g_assert (nautilus_file_is_directory (file));
 
 	/* Send out a signal. */
-	gtk_signal_emit (GTK_OBJECT (file), signals[UPDATED_DEEP_COUNT_IN_PROGRESS], file);
+	g_signal_emit (G_OBJECT (file), signals[UPDATED_DEEP_COUNT_IN_PROGRESS], 0, file);
 
 	/* Tell link files pointing to this object about the change. */
 	link_files = get_link_files (file);
@@ -4711,7 +4711,7 @@ nautilus_file_emit_changed (NautilusFile *file)
 	file->details->compare_by_emblem_cache = NULL;
 
 	/* Send out a signal. */
-	gtk_signal_emit (GTK_OBJECT (file), signals[CHANGED], file);
+	g_signal_emit (G_OBJECT (file), signals[CHANGED], 0, file);
 
 	/* Tell link files pointing to this object about the change. */
 	link_files = get_link_files (file);
diff --git a/libnautilus-private/nautilus-font-factory.c b/libnautilus-private/nautilus-font-factory.c
index 89b37241b..e3f692d16 100644
--- a/libnautilus-private/nautilus-font-factory.c
+++ b/libnautilus-private/nautilus-font-factory.c
@@ -85,7 +85,7 @@ static NautilusFontFactory *
 nautilus_get_current_font_factory (void)
 {
         if (global_font_factory == NULL) {
-		global_font_factory = NAUTILUS_FONT_FACTORY (gtk_object_new (nautilus_font_factory_get_type (), NULL));
+		global_font_factory = NAUTILUS_FONT_FACTORY (g_object_new (nautilus_font_factory_get_type (), NULL));
 		gtk_object_ref (GTK_OBJECT (global_font_factory));
 		gtk_object_sink (GTK_OBJECT (global_font_factory));
 		g_atexit (unref_global_font_factory);
diff --git a/libnautilus-private/nautilus-icon-canvas-item.c b/libnautilus-private/nautilus-icon-canvas-item.c
index 3b3928d23..2b248a846 100644
--- a/libnautilus-private/nautilus-icon-canvas-item.c
+++ b/libnautilus-private/nautilus-icon-canvas-item.c
@@ -275,7 +275,7 @@ nautilus_icon_canvas_item_class_init (NautilusIconCanvasItemClass *class)
 		                G_STRUCT_OFFSET (NautilusIconCanvasItemClass,
 						     bounds_changed),
 		                NULL, NULL,
-		                gtk_marshal_NONE__NONE,
+		                gtk_marshal_VOID__VOID,
 		                G_TYPE_NONE, 0);
 
 	item_class->update = nautilus_icon_canvas_item_update;
@@ -681,8 +681,8 @@ nautilus_icon_canvas_item_update_bounds (NautilusIconCanvasItem *item)
 	/* Send out the bounds_changed signal and queue a redraw. */
 	eel_gnome_canvas_request_redraw_rectangle
 		(GNOME_CANVAS_ITEM (item)->canvas, before);
-	gtk_signal_emit (GTK_OBJECT (item),
-			 signals[BOUNDS_CHANGED]);
+	g_signal_emit (G_OBJECT (item),
+			 signals[BOUNDS_CHANGED], 0);
 	eel_gnome_canvas_item_request_redraw
 		(GNOME_CANVAS_ITEM (item));
 }
diff --git a/libnautilus-private/nautilus-icon-container.c b/libnautilus-private/nautilus-icon-container.c
index c5050d4a7..c74a1cdad 100644
--- a/libnautilus-private/nautilus-icon-container.c
+++ b/libnautilus-private/nautilus-icon-container.c
@@ -313,16 +313,16 @@ icon_raise (NautilusIcon *icon)
 static void
 emit_stretch_started (NautilusIconContainer *container, NautilusIcon *icon)
 {
-	gtk_signal_emit (GTK_OBJECT (container),
-			 signals[ICON_STRETCH_STARTED],
+	g_signal_emit (G_OBJECT (container),
+			 signals[ICON_STRETCH_STARTED], 0,
 			 icon->data);
 }
 
 static void
 emit_stretch_ended (NautilusIconContainer *container, NautilusIcon *icon)
 {
-	gtk_signal_emit (GTK_OBJECT (container),
-			 signals[ICON_STRETCH_ENDED],
+	g_signal_emit (G_OBJECT (container),
+			 signals[ICON_STRETCH_ENDED], 0,
 			 icon->data);
 }
 
@@ -449,7 +449,7 @@ set_pending_icon_to_reveal (NautilusIconContainer *container, NautilusIcon *icon
 	}
 	
 	if (icon != NULL) {
-		gtk_signal_connect (GTK_OBJECT (icon->item), "destroy",
+		g_signal_connect (G_OBJECT (icon->item), "destroy",
 				    G_CALLBACK (pending_icon_to_reveal_destroy_callback), container);
 	}
 	
@@ -707,8 +707,8 @@ compare_icons (gconstpointer a, gconstpointer b)
 	icon_b = b;
 
 	result = 0;
-	gtk_signal_emit (GTK_OBJECT (sort_hack_container),
-			 signals[COMPARE_ICONS],
+	g_signal_emit (G_OBJECT (sort_hack_container),
+			 signals[COMPARE_ICONS], 0,
 			 icon_a->data,
 			 icon_b->data,
 			 &result);
@@ -733,8 +733,8 @@ compare_icons_by_name (gconstpointer a, gconstpointer b)
 	icon_b = b;
 
 	result = 0;
-	gtk_signal_emit (GTK_OBJECT (sort_hack_container),
-			 signals[COMPARE_ICONS_BY_NAME],
+	g_signal_emit (G_OBJECT (sort_hack_container),
+			 signals[COMPARE_ICONS_BY_NAME], 0,
 			 icon_a->data,
 			 icon_b->data,
 			 &result);
@@ -1246,8 +1246,8 @@ reload_icon_positions (NautilusIconContainer *container)
 		icon = p->data;
 
 		have_stored_position = FALSE;
-		gtk_signal_emit (GTK_OBJECT (container),
-				 signals[GET_STORED_ICON_POSITION],
+		g_signal_emit (G_OBJECT (container),
+				 signals[GET_STORED_ICON_POSITION], 0,
 				 icon->data,
 				 &position,
 				 &have_stored_position);
@@ -1360,8 +1360,8 @@ nautilus_icon_container_move_icon (NautilusIconContainer *container,
 		position.y = icon->y;
 		position.scale_x = scale_x;
 		position.scale_y = scale_y;
-		gtk_signal_emit (GTK_OBJECT (container),
-				 signals[ICON_POSITION_CHANGED],
+		g_signal_emit (G_OBJECT (container),
+				 signals[ICON_POSITION_CHANGED], 0,
 				 icon->data, &position);
 	}
 	
@@ -1414,8 +1414,8 @@ rubberband_select (NautilusIconContainer *container,
 	}
 
 	if (selection_changed) {
-		gtk_signal_emit (GTK_OBJECT (container),
-				 signals[SELECTION_CHANGED]);
+		g_signal_emit (G_OBJECT (container),
+				 signals[SELECTION_CHANGED], 0);
 	}
 }
 
@@ -1533,8 +1533,8 @@ start_rubberbanding (NautilusIconContainer *container,
 	details = container->details;
 	band_info = &details->rubberband_info;
 
-	gtk_signal_emit (GTK_OBJECT (container),
-			 signals[BAND_SELECT_STARTED]);
+	g_signal_emit (G_OBJECT (container),
+			 signals[BAND_SELECT_STARTED], 0);
 
 	for (p = details->icons; p != NULL; p = p->next) {
 		NautilusIcon *icon;
@@ -1637,8 +1637,8 @@ stop_rubberbanding (NautilusIconContainer *container,
 	band_info->selection_rectangle = NULL;
 
 
-	gtk_signal_emit (GTK_OBJECT (container),
-			 signals[BAND_SELECT_ENDED]);
+	g_signal_emit (G_OBJECT (container),
+			 signals[BAND_SELECT_ENDED], 0);
 }
 
 /* Keyboard navigation.  */
@@ -1956,8 +1956,8 @@ keyboard_move_to (NautilusIconContainer *container,
 		/* Select icons and get rid of the special keyboard focus. */
 		clear_keyboard_focus (container);
 		if (select_one_unselect_others (container, icon)) {
-			gtk_signal_emit (GTK_OBJECT (container),
-					 signals[SELECTION_CHANGED]);
+			g_signal_emit (G_OBJECT (container),
+					 signals[SELECTION_CHANGED], 0);
 		}
 	}
 	schedule_keyboard_icon_reveal (container, icon);
@@ -2130,7 +2130,7 @@ keyboard_space (NautilusIconContainer *container,
 	if (container->details->keyboard_focus != NULL &&
 	    (event->state & GDK_CONTROL_MASK) != 0) {
 		icon_toggle_selected (container, container->details->keyboard_focus);
-		gtk_signal_emit (GTK_OBJECT (container), signals[SELECTION_CHANGED]);
+		g_signal_emit (G_OBJECT (container), signals[SELECTION_CHANGED], 0);
 	}
 }
 
@@ -2222,8 +2222,8 @@ select_matching_name (NautilusIconContainer *container,
 	/* Select icons and get rid of the special keyboard focus. */
 	clear_keyboard_focus (container);
 	if (select_one_unselect_others (container, icon)) {
-		gtk_signal_emit (GTK_OBJECT (container),
-				 signals[SELECTION_CHANGED]);
+		g_signal_emit (G_OBJECT (container),
+				 signals[SELECTION_CHANGED], 0);
 	}
 	schedule_keyboard_icon_reveal (container, icon);
 
@@ -2498,8 +2498,8 @@ button_press_event (GtkWidget *widget,
 		if (! button_event_modifies_selection (event)) {
 			selection_changed = unselect_all (container);
 			if (selection_changed) {
-				gtk_signal_emit (GTK_OBJECT (container),
-						 signals[SELECTION_CHANGED]);
+				g_signal_emit (G_OBJECT (container),
+						 signals[SELECTION_CHANGED], 0);
 			}
 		}
 
@@ -2514,20 +2514,20 @@ button_press_event (GtkWidget *widget,
 	
 	/* Button 2 may be passed to the window manager. */
 	if (event->button == MIDDLE_BUTTON) {
-		gtk_signal_emit (GTK_OBJECT (widget), signals[MIDDLE_CLICK], event);
+		g_signal_emit (G_OBJECT (widget), signals[MIDDLE_CLICK], 0, event);
 		return TRUE;
 	}
 
 	/* Button 3 does a contextual menu. */
 	if (event->button == CONTEXTUAL_MENU_BUTTON) {
 		end_renaming_mode (container, TRUE);
-		gtk_signal_emit (GTK_OBJECT (widget), signals[CONTEXT_CLICK_BACKGROUND], event);
+		g_signal_emit (G_OBJECT (widget), signals[CONTEXT_CLICK_BACKGROUND], 0, event);
 		return TRUE;
 	}
 	
 	/* Otherwise, we emit a button_press message. */
-	gtk_signal_emit (GTK_OBJECT (widget),
-			 signals[BUTTON_PRESS], event,
+	g_signal_emit (G_OBJECT (widget),
+			 signals[BUTTON_PRESS], 0, event,
 			 &return_value);
 	return return_value;
 }
@@ -2546,8 +2546,8 @@ nautilus_icon_container_did_not_drag (NautilusIconContainer *container,
 			(container, details->drag_icon);
 		
 		if (selection_changed) {
-			gtk_signal_emit (GTK_OBJECT (container),
-					 signals[SELECTION_CHANGED]);
+			g_signal_emit (G_OBJECT (container),
+					 signals[SELECTION_CHANGED], 0);
 		}
 	}
 	
@@ -2707,8 +2707,8 @@ end_stretching (NautilusIconContainer *container,
 	position.y = icon->y;
 	position.scale_x = icon->scale_x;
 	position.scale_y = icon->scale_y;
-	gtk_signal_emit (GTK_OBJECT (container),
-			 signals[ICON_POSITION_CHANGED],
+	g_signal_emit (G_OBJECT (container),
+			 signals[ICON_POSITION_CHANGED], 0,
 			 icon->data, &position);
 	
 	clear_drag_state (container);
@@ -2771,8 +2771,8 @@ button_release_event (GtkWidget *widget,
 				 * show context menu.
 				 */
 				clear_drag_state (container);
-				gtk_signal_emit (GTK_OBJECT (container),
-						 signals[CONTEXT_CLICK_SELECTION],
+				g_signal_emit (G_OBJECT (container),
+						 signals[CONTEXT_CLICK_SELECTION], 0,
 						 event);
 				break;
 			}
@@ -3413,7 +3413,7 @@ nautilus_icon_container_init (NautilusIconContainer *container)
 		 GTK_OBJECT (container));	
 
 
-	gtk_signal_connect (GTK_OBJECT (container), "focus-out-event",
+	g_signal_connect (G_OBJECT (container), "focus-out-event",
 			    G_CALLBACK (handle_focus_out_event), NULL);	
 
 	/* FIXME: The code to extract colors from the theme should be in FMDirectoryView, not here.
@@ -3465,8 +3465,8 @@ show_context_menu_callback (void *cast_to_parameters)
 		 * odd case is if this click deselected the icon under
 		 * the mouse, but at least the behavior is consistent.
 		 */
-		gtk_signal_emit (GTK_OBJECT (parameters->container),
-				 signals[CONTEXT_CLICK_SELECTION],
+		g_signal_emit (G_OBJECT (parameters->container),
+				 signals[CONTEXT_CLICK_SELECTION], 0,
 				 parameters->event);
 	}
 
@@ -3537,13 +3537,13 @@ handle_icon_button_press (NautilusIconContainer *container,
 	 */
 	if (button_event_modifies_selection (event)) {
 		icon_toggle_selected (container, icon);
-		gtk_signal_emit (GTK_OBJECT (container),
-				 signals[SELECTION_CHANGED]);
+		g_signal_emit (G_OBJECT (container),
+				 signals[SELECTION_CHANGED], 0);
 	} else if (!icon->is_selected) {
 		unselect_all (container);
 		icon_set_selected (container, icon, TRUE);
-		gtk_signal_emit (GTK_OBJECT (container),
-				 signals[SELECTION_CHANGED]);
+		g_signal_emit (G_OBJECT (container),
+				 signals[SELECTION_CHANGED], 0);
 	}
 
 	if (event->type == GDK_2BUTTON_PRESS && event->button == DRAG_BUTTON) {
@@ -3709,8 +3709,8 @@ icon_destroy (NautilusIconContainer *container,
 	icon_free (icon);
 
 	if (was_selected) {
-		gtk_signal_emit (GTK_OBJECT (container),
-				 signals[SELECTION_CHANGED]);
+		g_signal_emit (G_OBJECT (container),
+				 signals[SELECTION_CHANGED], 0);
 	}
 }
 
@@ -3724,8 +3724,8 @@ activate_selected_items (NautilusIconContainer *container)
 
 	selection = nautilus_icon_container_get_selection (container);
 	if (selection != NULL) {
-	  	gtk_signal_emit (GTK_OBJECT (container),
-				 signals[ACTIVATE],
+	  	g_signal_emit (G_OBJECT (container),
+				 signals[ACTIVATE], 0,
 				 selection);
 	}
 	g_list_free (selection);
@@ -3772,8 +3772,8 @@ nautilus_icon_container_update_icon (NautilusIconContainer *container,
 	details = container->details;
 
 	/* Get the icons. */
-	gtk_signal_emit (GTK_OBJECT (container),
-			 signals[GET_ICON_IMAGES],
+	g_signal_emit (G_OBJECT (container),
+			 signals[GET_ICON_IMAGES], 0,
 			 icon->data,
 			 (icon == details->drop_target) ? "accept" : "",
 			 &emblem_scalable_icons,
@@ -3839,8 +3839,8 @@ nautilus_icon_container_update_icon (NautilusIconContainer *container,
 	nautilus_scalable_icon_list_free (emblem_scalable_icons);
 
 	/* Get both editable and non-editable icon text */
-	gtk_signal_emit (GTK_OBJECT (container),
-			 signals[GET_ICON_TEXT],
+	g_signal_emit (G_OBJECT (container),
+			 signals[GET_ICON_TEXT], 0,
 			 icon->data,
 			 &editable_text,
 			 &additional_text);
@@ -3892,8 +3892,8 @@ assign_icon_position (NautilusIconContainer *container,
 	have_stored_position = FALSE;
 	position.scale_x = 1.0;
 	position.scale_y = 1.0;
-	gtk_signal_emit (GTK_OBJECT (container),
-			 signals[GET_STORED_ICON_POSITION],
+	g_signal_emit (G_OBJECT (container),
+			 signals[GET_STORED_ICON_POSITION], 0,
 			 icon->data,
 			 &position,
 			 &have_stored_position);
@@ -3916,7 +3916,7 @@ finish_adding_icon (NautilusIconContainer *container,
 	nautilus_icon_container_update_icon (container, icon);
 	gnome_canvas_item_show (GNOME_CANVAS_ITEM (icon->item));
 
-	gtk_signal_connect (GTK_OBJECT (icon->item), "event",
+	g_signal_connect (G_OBJECT (icon->item), "event",
 			    GTK_SIGNAL_FUNC (item_event_callback), container);
 }
 
@@ -4276,8 +4276,8 @@ nautilus_icon_container_select_all (NautilusIconContainer *container)
 	}
 
 	if (selection_changed) {
-		gtk_signal_emit (GTK_OBJECT (container),
-				 signals[SELECTION_CHANGED]);
+		g_signal_emit (G_OBJECT (container),
+				 signals[SELECTION_CHANGED], 0);
 	}
 }
 
@@ -4316,8 +4316,8 @@ nautilus_icon_container_set_selection (NautilusIconContainer *container,
 	g_hash_table_destroy (hash);
 
 	if (selection_changed) {
-		gtk_signal_emit (GTK_OBJECT (container),
-				 signals[SELECTION_CHANGED]);
+		g_signal_emit (G_OBJECT (container),
+				 signals[SELECTION_CHANGED], 0);
 	}
 }
 
@@ -4355,8 +4355,8 @@ nautilus_icon_container_select_list_unselect_others (NautilusIconContainer *cont
 	g_hash_table_destroy (hash);
 
 	if (selection_changed) {
-		gtk_signal_emit (GTK_OBJECT (container),
-				 signals[SELECTION_CHANGED]);
+		g_signal_emit (G_OBJECT (container),
+				 signals[SELECTION_CHANGED], 0);
 	}
 }
 
@@ -4370,8 +4370,8 @@ void
 nautilus_icon_container_unselect_all (NautilusIconContainer *container)
 {
 	if (unselect_all (container)) {
-		gtk_signal_emit (GTK_OBJECT (container),
-				 signals[SELECTION_CHANGED]);
+		g_signal_emit (G_OBJECT (container),
+				 signals[SELECTION_CHANGED], 0);
 	}
 }
 
@@ -4603,8 +4603,8 @@ nautilus_icon_container_get_icon_uri (NautilusIconContainer *container,
 	char *uri;
 
 	uri = NULL;
-	gtk_signal_emit (GTK_OBJECT (container),
-			 signals[GET_ICON_URI],
+	g_signal_emit (G_OBJECT (container),
+			 signals[GET_ICON_URI], 0,
 			 icon->data,
 			 &uri);
 	return uri;
@@ -4617,8 +4617,8 @@ nautilus_icon_container_get_icon_drop_target_uri (NautilusIconContainer *contain
 	char *uri;
 
 	uri = NULL;
-	gtk_signal_emit (GTK_OBJECT (container),
-			 signals[GET_ICON_DROP_TARGET_URI],
+	g_signal_emit (G_OBJECT (container),
+			 signals[GET_ICON_DROP_TARGET_URI], 0,
 			 icon->data,
 			 &uri);
 	return uri;
@@ -4660,7 +4660,7 @@ nautilus_icon_container_set_auto_layout (NautilusIconContainer *container,
 
 	redo_layout (container);
 
-	gtk_signal_emit (GTK_OBJECT (container), signals[LAYOUT_CHANGED]);
+	g_signal_emit (G_OBJECT (container), signals[LAYOUT_CHANGED], 0);
 }
 
 
@@ -4682,7 +4682,7 @@ nautilus_icon_container_set_tighter_layout (NautilusIconContainer *container,
 		invalidate_label_sizes (container);
 		redo_layout (container);
 
-		gtk_signal_emit (GTK_OBJECT (container), signals[LAYOUT_CHANGED]);
+		g_signal_emit (G_OBJECT (container), signals[LAYOUT_CHANGED], 0);
 	} else {
 		/* in manual layout, label sizes still change, even though
 		 * the icons don't move.
@@ -4703,7 +4703,7 @@ nautilus_icon_container_set_layout_mode (NautilusIconContainer *container,
 
 	redo_layout (container);
 
-	gtk_signal_emit (GTK_OBJECT (container), signals[LAYOUT_CHANGED]);
+	g_signal_emit (G_OBJECT (container), signals[LAYOUT_CHANGED], 0);
 }
 
 
@@ -4729,12 +4729,12 @@ nautilus_icon_container_freeze_icon_positions (NautilusIconContainer *container)
 		position.y = icon->y;
 		position.scale_x = icon->scale_x;
 		position.scale_y = icon->scale_y;
-		gtk_signal_emit (GTK_OBJECT (container), signals[ICON_POSITION_CHANGED],
+		g_signal_emit (G_OBJECT (container), signals[ICON_POSITION_CHANGED], 0,
 				 icon->data, &position);
 	}
 
 	if (changed) {
-		gtk_signal_emit (GTK_OBJECT (container), signals[LAYOUT_CHANGED]);
+		g_signal_emit (G_OBJECT (container), signals[LAYOUT_CHANGED], 0);
 	}
 }
 
@@ -4751,7 +4751,7 @@ nautilus_icon_container_sort (NautilusIconContainer *container)
 	redo_layout (container);
 
 	if (changed) {
-		gtk_signal_emit (GTK_OBJECT (container), signals[LAYOUT_CHANGED]);
+		g_signal_emit (G_OBJECT (container), signals[LAYOUT_CHANGED], 0);
 	}
 }
 
@@ -4803,7 +4803,7 @@ set_pending_icon_to_rename (NautilusIconContainer *container, NautilusIcon *icon
 	}
 	
 	if (icon != NULL) {
-		gtk_signal_connect (GTK_OBJECT (icon->item), "destroy",
+		g_signal_connect (G_OBJECT (icon->item), "destroy",
 				    G_CALLBACK (pending_icon_to_rename_destroy_callback), container);
 	}
 	
@@ -4915,8 +4915,8 @@ nautilus_icon_container_start_renaming_selected_item (NautilusIconContainer *con
 
 	nautilus_icon_text_item_start_editing (details->rename_widget);
 	
-	gtk_signal_emit (GTK_OBJECT (container),
-			 signals[RENAMING_ICON],
+	g_signal_emit (G_OBJECT (container),
+			 signals[RENAMING_ICON], 0,
 			 nautilus_icon_text_item_get_renaming_editable (details->rename_widget));
 #endif
 
@@ -4947,8 +4947,8 @@ end_renaming_mode (NautilusIconContainer *container, gboolean commit)
 		/* Verify that text has been modified before signalling change. */			
 		changed_text = nautilus_icon_text_item_get_text (container->details->rename_widget);
 		if (strcmp (container->details->original_text, changed_text) != 0) {			
-			gtk_signal_emit (GTK_OBJECT (container),
-					 signals[ICON_TEXT_CHANGED],
+			g_signal_emit (G_OBJECT (container),
+					 signals[ICON_TEXT_CHANGED], 0,
 					 icon->data,
 					 changed_text);
 		}
@@ -4979,8 +4979,8 @@ nautilus_icon_container_emit_preview_signal (NautilusIconContainer *icon_contain
 	g_return_val_if_fail (start_flag == FALSE || start_flag == TRUE, FALSE);
 	
 	result = FALSE;
-	gtk_signal_emit (GTK_OBJECT (icon_container),
-			 signals[PREVIEW],
+	g_signal_emit (G_OBJECT (icon_container),
+			 signals[PREVIEW], 0,
 			 icon->data,
 			 start_flag,
 			 &result);
@@ -5000,8 +5000,8 @@ nautilus_icon_container_has_stored_icon_positions (NautilusIconContainer *contai
 		icon = p->data;
 
 		have_stored_position = FALSE;
-		gtk_signal_emit (GTK_OBJECT (container),
-				 signals[GET_STORED_ICON_POSITION],
+		g_signal_emit (G_OBJECT (container),
+				 signals[GET_STORED_ICON_POSITION], 0,
 				 icon->data,
 				 &position,
 				 &have_stored_position);
diff --git a/libnautilus-private/nautilus-icon-dnd.c b/libnautilus-private/nautilus-icon-dnd.c
index 7e6ae4165..438e547f6 100644
--- a/libnautilus-private/nautilus-icon-dnd.c
+++ b/libnautilus-private/nautilus-icon-dnd.c
@@ -582,7 +582,7 @@ get_container_uri (const NautilusIconContainer *container)
 
 	/* get the URI associated with the container */
 	uri = NULL;
-	gtk_signal_emit_by_name (GTK_OBJECT (container), "get_container_uri", &uri);
+	g_signal_emit_by_name (GTK_OBJECT (container), "get_container_uri", &uri);
 	return uri;
 }
 
@@ -667,7 +667,7 @@ receive_dropped_uri_list (NautilusIconContainer *container, char *uri_list, GdkD
 		return;
 	}
 	
-	gtk_signal_emit_by_name (GTK_OBJECT (container), "handle_uri_list",
+	g_signal_emit_by_name (GTK_OBJECT (container), "handle_uri_list",
 				 uri_list,
 				 action,
 				 x, y);
@@ -873,7 +873,7 @@ handle_nonlocal_move (NautilusIconContainer *container,
 	}
 		
 	/* start the copy */
-	gtk_signal_emit_by_name (GTK_OBJECT (container), "move_copy_items",
+	g_signal_emit_by_name (GTK_OBJECT (container), "move_copy_items",
 				 source_uris,
 				 source_item_locations,
 				 target_uri,
@@ -1224,19 +1224,19 @@ nautilus_icon_dnd_init (NautilusIconContainer *container,
 			    | GDK_ACTION_ASK);
 
 	/* Messages for outgoing drag. */
-	gtk_signal_connect (GTK_OBJECT (container), "drag_data_get",
+	g_signal_connect (G_OBJECT (container), "drag_data_get",
 			    GTK_SIGNAL_FUNC (drag_data_get_callback), NULL);
-	gtk_signal_connect (GTK_OBJECT (container), "drag_end",
+	g_signal_connect (G_OBJECT (container), "drag_end",
 			    GTK_SIGNAL_FUNC (drag_end_callback), NULL);
 
 	/* Messages for incoming drag. */
-	gtk_signal_connect (GTK_OBJECT (container), "drag_data_received",
+	g_signal_connect (G_OBJECT (container), "drag_data_received",
 			    GTK_SIGNAL_FUNC (drag_data_received_callback), NULL);
-	gtk_signal_connect (GTK_OBJECT (container), "drag_motion",
+	g_signal_connect (G_OBJECT (container), "drag_motion",
 			    GTK_SIGNAL_FUNC (drag_motion_callback), NULL);
-	gtk_signal_connect (GTK_OBJECT (container), "drag_drop",
+	g_signal_connect (G_OBJECT (container), "drag_drop",
 			    GTK_SIGNAL_FUNC (drag_drop_callback), NULL);
-	gtk_signal_connect (GTK_OBJECT (container), "drag_leave",
+	g_signal_connect (G_OBJECT (container), "drag_leave",
 			    GTK_SIGNAL_FUNC (drag_leave_callback), NULL);
 
 }
diff --git a/libnautilus-private/nautilus-icon-factory.c b/libnautilus-private/nautilus-icon-factory.c
index b3974770d..042b36527 100644
--- a/libnautilus-private/nautilus-icon-factory.c
+++ b/libnautilus-private/nautilus-icon-factory.c
@@ -274,7 +274,7 @@ get_icon_factory (void)
 {
         if (global_icon_factory == NULL) {
 		global_icon_factory = NAUTILUS_ICON_FACTORY
-			(gtk_object_new (nautilus_icon_factory_get_type (), NULL));
+			(g_object_new (nautilus_icon_factory_get_type (), NULL));
 		gtk_object_ref (GTK_OBJECT (global_icon_factory));
 		gtk_object_sink (GTK_OBJECT (global_icon_factory));
 
@@ -288,10 +288,10 @@ get_icon_factory (void)
 					      thumbnail_limit_changed_callback,
 					      NULL);
 
-		gtk_signal_connect (GTK_OBJECT (gnome_vfs_mime_monitor_get ()),
-				    "data_changed",
-				    G_CALLBACK (mime_type_data_changed_callback),
-				    NULL);
+		g_signal_connect (G_OBJECT (gnome_vfs_mime_monitor_get ()),
+				  "data_changed",
+				  G_CALLBACK (mime_type_data_changed_callback),
+				  NULL);
 
 		g_atexit (destroy_icon_factory);
         }
@@ -385,7 +385,7 @@ nautilus_icon_factory_class_init (NautilusIconFactoryClass *class)
 		                G_SIGNAL_RUN_LAST,
 		                0,
 		                NULL, NULL,
-		                gtk_marshal_NONE__NONE,
+		                gtk_marshal_VOID__VOID,
 		                G_TYPE_NONE, 0);
 
 	object_class->destroy = nautilus_icon_factory_destroy;
@@ -859,8 +859,8 @@ icon_theme_changed_callback (gpointer user_data)
 		
 		nautilus_icon_factory_clear ();
 		load_thumbnail_frames (factory);
-		gtk_signal_emit (GTK_OBJECT (factory),
-				 signals[ICONS_CHANGED]);
+		g_signal_emit (G_OBJECT (factory),
+				 signals[ICONS_CHANGED], 0);
 	}
 
 	g_free (icon_theme);
@@ -876,8 +876,8 @@ thumbnail_limit_changed_callback (gpointer user_data)
 	 * signal to mean only "thumbnails might have changed" if this ends up being slow
 	 * for some reason.
 	 */
-	gtk_signal_emit (GTK_OBJECT (global_icon_factory),
-			 signals[ICONS_CHANGED]);
+	g_signal_emit (G_OBJECT (global_icon_factory),
+			 signals[ICONS_CHANGED], 0);
 }
 
 static void       
@@ -889,8 +889,8 @@ mime_type_data_changed_callback (GnomeVFSMIMEMonitor *monitor, gpointer user_dat
 	/* We don't know which data changed, so we have to assume that
 	 * any or all icons might have changed.
 	 */
-	gtk_signal_emit (GTK_OBJECT (get_icon_factory ()), 
-			 signals[ICONS_CHANGED]);
+	g_signal_emit (G_OBJECT (get_icon_factory ()), 
+			 signals[ICONS_CHANGED], 0);
 }				 
 
 /* Decompose a scalable icon into its text pieces. */
diff --git a/libnautilus-private/nautilus-icon-text-item.c b/libnautilus-private/nautilus-icon-text-item.c
index 7391fc482..39c92349e 100644
--- a/libnautilus-private/nautilus-icon-text-item.c
+++ b/libnautilus-private/nautilus-icon-text-item.c
@@ -136,7 +136,7 @@ iti_stop_editing (Iti *iti)
 
 	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (iti));
 
-	gtk_signal_emit (GTK_OBJECT (iti), iti_signals[EDITING_STOPPED]);
+	g_signal_emit (G_OBJECT (iti), iti_signals[EDITING_STOPPED], 0);
 }
 
 /* Lays out the text in an icon item */
@@ -179,12 +179,12 @@ layout_text (Iti *iti)
 	height = iti->ti->height + 2 * MARGIN_Y;
 
 	if (width != old_width)
-		gtk_signal_emit (GTK_OBJECT (iti), iti_signals[WIDTH_CHANGED]);
+		g_signal_emit (G_OBJECT (iti), iti_signals[WIDTH_CHANGED], 0);
 
 	if (height != old_height)
-		gtk_signal_emit (GTK_OBJECT (iti), iti_signals[HEIGHT_CHANGED]);
+		g_signal_emit (G_OBJECT (iti), iti_signals[HEIGHT_CHANGED], 0);
 	
-	gtk_signal_emit (GTK_OBJECT (iti), iti_signals [TEXT_EDITED]);		
+	g_signal_emit (G_OBJECT (iti), iti_signals [TEXT_EDITED], 0);		
 }
 
 /* Accepts the text in the off-screen entry of an icon text item */
@@ -197,7 +197,7 @@ iti_edition_accept (Iti *iti)
 	priv = iti->priv;
 	accept = TRUE;
 
-	gtk_signal_emit (GTK_OBJECT (iti), iti_signals [TEXT_CHANGED], &accept);
+	g_signal_emit (G_OBJECT (iti), iti_signals [TEXT_CHANGED], 0, &accept);
 
 	if (iti->editing){
 		if (accept) {
@@ -263,7 +263,7 @@ iti_start_editing (Iti *iti)
 
 	if (priv->entry_top == NULL) {
 		priv->entry = (NautilusEntry *) nautilus_entry_new ();
-		gtk_signal_connect (GTK_OBJECT (priv->entry), "activate",
+		g_signal_connect (G_OBJECT (priv->entry), "activate",
 				    GTK_SIGNAL_FUNC (iti_entry_activate), iti);
 		/* Make clipboard functions cause an update the appearance of 
 		   the icon text item itself, since the clipboard functions 
@@ -287,7 +287,7 @@ iti_start_editing (Iti *iti)
 
 	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (iti));
 
-	gtk_signal_emit (GTK_OBJECT (iti), iti_signals[EDITING_STARTED]);
+	g_signal_emit (G_OBJECT (iti), iti_signals[EDITING_STARTED], 0);
 }
 
 /* Destroy method handler for the icon text item */
@@ -854,7 +854,7 @@ iti_start_selecting (Iti *iti, int idx, guint32 event_time)
 
 	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (iti));
 
-	gtk_signal_emit (GTK_OBJECT (iti), iti_signals[SELECTION_STARTED]);
+	g_signal_emit (G_OBJECT (iti), iti_signals[SELECTION_STARTED], 0);
 }
 
 /* Stops the selection state in the icon text item */
@@ -874,9 +874,9 @@ iti_stop_selecting (Iti *iti, guint32 event_time)
 	iti->selecting = FALSE;
 
 	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (iti));
-	gtk_signal_emit (GTK_OBJECT (iti), iti_signals[SELECTION_STOPPED]);
+	g_signal_emit (G_OBJECT (iti), iti_signals[SELECTION_STOPPED], 0);
 	/* Hack, since the real nautilus entry can't get this information */
-	gtk_signal_emit_by_name (GTK_OBJECT (priv->entry), "selection_changed");
+	g_signal_emit_by_name (GTK_OBJECT (priv->entry), "selection_changed");
 }
 
 /* Handles selection range changes on the icon text item */
@@ -1178,7 +1178,7 @@ iti_class_init (NautilusIconTextItemClass *text_item_class)
 		 G_SIGNAL_RUN_LAST,
 		 G_STRUCT_OFFSET (NautilusIconTextItemClass, text_changed),
 		 NULL, NULL,
-		 gtk_marshal_BOOL__NONE,
+		 gtk_marshal_BOOLEAN__VOID,
 		 GTK_TYPE_BOOL, 0);
 
 	iti_signals [TEXT_EDITED] = g_signal_new
@@ -1187,7 +1187,7 @@ iti_class_init (NautilusIconTextItemClass *text_item_class)
 		 G_SIGNAL_RUN_LAST,
 		 G_STRUCT_OFFSET (NautilusIconTextItemClass, text_edited),
 		 NULL, NULL,
-		 gtk_marshal_NONE__NONE,
+		 gtk_marshal_VOID__VOID,
 		 G_TYPE_NONE, 0);
 
 	iti_signals [HEIGHT_CHANGED] = g_signal_new
@@ -1196,7 +1196,7 @@ iti_class_init (NautilusIconTextItemClass *text_item_class)
 		 G_SIGNAL_RUN_LAST,
 		 G_STRUCT_OFFSET (NautilusIconTextItemClass, height_changed),
 		 NULL, NULL,
-		 gtk_marshal_NONE__NONE,
+		 gtk_marshal_VOID__VOID,
 		 G_TYPE_NONE, 0);
 
 	iti_signals [WIDTH_CHANGED] = g_signal_new
@@ -1205,7 +1205,7 @@ iti_class_init (NautilusIconTextItemClass *text_item_class)
 		 G_SIGNAL_RUN_LAST,
 		 G_STRUCT_OFFSET (NautilusIconTextItemClass, width_changed),
 		 NULL, NULL,
-		 gtk_marshal_NONE__NONE,
+		 gtk_marshal_VOID__VOID,
 		 G_TYPE_NONE, 0);
 
 	iti_signals[EDITING_STARTED] = g_signal_new
@@ -1214,7 +1214,7 @@ iti_class_init (NautilusIconTextItemClass *text_item_class)
 		 G_SIGNAL_RUN_LAST,
 		 G_STRUCT_OFFSET (NautilusIconTextItemClass, editing_started),
 		 NULL, NULL,
-		 gtk_marshal_NONE__NONE,
+		 gtk_marshal_VOID__VOID,
 		 G_TYPE_NONE, 0);
 
 	iti_signals[EDITING_STOPPED] = g_signal_new
@@ -1223,7 +1223,7 @@ iti_class_init (NautilusIconTextItemClass *text_item_class)
 		 G_SIGNAL_RUN_LAST,
 		 G_STRUCT_OFFSET (NautilusIconTextItemClass, editing_stopped),
 		 NULL, NULL,
-		 gtk_marshal_NONE__NONE,
+		 gtk_marshal_VOID__VOID,
 		 G_TYPE_NONE, 0);
 
 	iti_signals[SELECTION_STARTED] = g_signal_new
@@ -1232,7 +1232,7 @@ iti_class_init (NautilusIconTextItemClass *text_item_class)
 		 G_SIGNAL_RUN_LAST,
 		 G_STRUCT_OFFSET (NautilusIconTextItemClass, selection_started),
 		 NULL, NULL,
-		 gtk_marshal_NONE__NONE,
+		 gtk_marshal_VOID__VOID,
 		 G_TYPE_NONE, 0);
 
 	iti_signals[SELECTION_STOPPED] = g_signal_new
@@ -1241,7 +1241,7 @@ iti_class_init (NautilusIconTextItemClass *text_item_class)
 		 G_SIGNAL_RUN_LAST,
 		 G_STRUCT_OFFSET (NautilusIconTextItemClass, selection_stopped),
 		 NULL, NULL,
-		 gtk_marshal_NONE__NONE,
+		 gtk_marshal_VOID__VOID,
 		 G_TYPE_NONE, 0);
 
 	object_class->destroy = iti_destroy;
diff --git a/libnautilus-private/nautilus-merged-directory.c b/libnautilus-private/nautilus-merged-directory.c
index d7a21febd..5438871de 100644
--- a/libnautilus-private/nautilus-merged-directory.c
+++ b/libnautilus-private/nautilus-merged-directory.c
@@ -500,7 +500,7 @@ merged_add_real_directory (NautilusMergedDirectory *merged,
 	merged->details->directories_not_done_loading = g_list_prepend
 		(merged->details->directories_not_done_loading, real_directory);
 
-	gtk_signal_connect (GTK_OBJECT (real_directory),
+	g_signal_connect (G_OBJECT (real_directory),
 			    "done_loading",
 			    G_CALLBACK (done_loading_callback),
 			    merged);
@@ -515,11 +515,11 @@ merged_add_real_directory (NautilusMergedDirectory *merged,
 			      real_directory);
 	/* FIXME bugzilla.gnome.org 42541: Do we need to add the directory to callbacks too? */
 
-	gtk_signal_connect (GTK_OBJECT (real_directory),
+	g_signal_connect (G_OBJECT (real_directory),
 			    "files_added",
 			    G_CALLBACK (forward_files_added_cover),
 			    merged);
-	gtk_signal_connect (GTK_OBJECT (real_directory),
+	g_signal_connect (G_OBJECT (real_directory),
 			    "files_changed",
 			    G_CALLBACK (forward_files_changed_cover),
 			    merged);
@@ -538,8 +538,8 @@ nautilus_merged_directory_add_real_directory (NautilusMergedDirectory *merged,
 		return;
 	}
 
-	gtk_signal_emit (GTK_OBJECT (merged),
-			 signals[ADD_REAL_DIRECTORY],
+	g_signal_emit (G_OBJECT (merged),
+			 signals[ADD_REAL_DIRECTORY], 0,
 			 real_directory);
 }
 
@@ -607,8 +607,8 @@ nautilus_merged_directory_remove_real_directory (NautilusMergedDirectory *merged
 		return;
 	}
 
-	gtk_signal_emit (GTK_OBJECT (merged),
-			 signals[REMOVE_REAL_DIRECTORY],
+	g_signal_emit (G_OBJECT (merged),
+			 signals[REMOVE_REAL_DIRECTORY], 0,
 			 real_directory);
 }
 
@@ -653,7 +653,7 @@ nautilus_merged_directory_class_init (gpointer klass)
 		                G_STRUCT_OFFSET (NautilusMergedDirectoryClass, 
 						     add_real_directory),
 		                NULL, NULL,
-		                gtk_marshal_NONE__POINTER,
+		                gtk_marshal_VOID__POINTER,
 		                G_TYPE_NONE, 1, GTK_TYPE_POINTER);
 	signals[REMOVE_REAL_DIRECTORY] 
 		= g_signal_new ("remove_real_directory",
@@ -662,6 +662,6 @@ nautilus_merged_directory_class_init (gpointer klass)
 		                G_STRUCT_OFFSET (NautilusMergedDirectoryClass, 
 						     remove_real_directory),
 		                NULL, NULL,
-		                gtk_marshal_NONE__POINTER,
+		                gtk_marshal_VOID__POINTER,
 		                G_TYPE_NONE, 1, GTK_TYPE_POINTER);
 }
diff --git a/libnautilus-private/nautilus-metafile-factory.c b/libnautilus-private/nautilus-metafile-factory.c
index 142e5aeb5..82dbf8368 100644
--- a/libnautilus-private/nautilus-metafile-factory.c
+++ b/libnautilus-private/nautilus-metafile-factory.c
@@ -34,24 +34,10 @@ struct NautilusMetafileFactoryDetails {
 static void nautilus_metafile_factory_init       (NautilusMetafileFactory      *factory);
 static void nautilus_metafile_factory_class_init (NautilusMetafileFactoryClass *klass);
 
-static void destroy (GtkObject *factory);
-
-static Nautilus_Metafile corba_open (PortableServer_Servant  servant,
-				     const CORBA_char       *directory,
-				     CORBA_Environment      *ev);
-
 EEL_BONOBO_BOILERPLATE_FULL (NautilusMetafileFactory,
-			       Nautilus_MetafileFactory,
-			       nautilus_metafile_factory,
-			       BONOBO_OBJECT_TYPE)
-
-static void
-nautilus_metafile_factory_class_init (NautilusMetafileFactoryClass *klass)
-{
-	GTK_OBJECT_CLASS (klass)->destroy = destroy;
-
-	klass->epv.open = corba_open;
-}
+			     Nautilus_MetafileFactory,
+			     nautilus_metafile_factory,
+			     BONOBO_OBJECT_TYPE)
 
 static void
 nautilus_metafile_factory_init (NautilusMetafileFactory *factory)
@@ -60,21 +46,21 @@ nautilus_metafile_factory_init (NautilusMetafileFactory *factory)
 }
 
 static void
-destroy (GtkObject *object)
+finalize (GObject *object)
 {
 	NautilusMetafileFactory *factory;
 
 	factory = NAUTILUS_METAFILE_FACTORY (object);
 	g_free (factory->details);
 
-	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (G_OBJECT_CLASS, finalize, (object));
 }
 
 static NautilusMetafileFactory *
 nautilus_metafile_factory_new (void)
 {
 	NautilusMetafileFactory *metafile_factory;
-	metafile_factory = NAUTILUS_METAFILE_FACTORY (gtk_object_new (NAUTILUS_TYPE_METAFILE_FACTORY, NULL));
+	metafile_factory = NAUTILUS_METAFILE_FACTORY (g_object_new (NAUTILUS_TYPE_METAFILE_FACTORY, NULL));
 	return metafile_factory;
 }
 
@@ -106,6 +92,15 @@ corba_open (PortableServer_Servant  servant,
 	    CORBA_Environment      *ev)
 {
 	BonoboObject *object;
+
 	object = BONOBO_OBJECT (nautilus_metafile_get (directory));
 	return CORBA_Object_duplicate (bonobo_object_corba_objref (object), ev);
 }
+
+static void
+nautilus_metafile_factory_class_init (NautilusMetafileFactoryClass *klass)
+{
+	G_OBJECT_CLASS (klass)->finalize = finalize;
+
+	klass->epv.open = corba_open;
+}
diff --git a/libnautilus-private/nautilus-metafile.c b/libnautilus-private/nautilus-metafile.c
index c34e69546..291406269 100644
--- a/libnautilus-private/nautilus-metafile.c
+++ b/libnautilus-private/nautilus-metafile.c
@@ -61,58 +61,6 @@
 static void nautilus_metafile_init       (NautilusMetafile      *metafile);
 static void nautilus_metafile_class_init (NautilusMetafileClass *klass);
 
-static void destroy (GtkObject *metafile);
-
-static CORBA_boolean corba_is_read (PortableServer_Servant  servant,
-				    CORBA_Environment      *ev);
-
-static CORBA_char *corba_get		      (PortableServer_Servant  servant,
-					       const CORBA_char       *file_name,
-					       const CORBA_char       *key,
-					       const CORBA_char       *default_value,
-					       CORBA_Environment      *ev);
-static Nautilus_MetadataList *corba_get_list (PortableServer_Servant  servant,
-					       const CORBA_char      *file_name,
-					       const CORBA_char      *list_key,
-					       const CORBA_char      *list_subkey,
-					       CORBA_Environment     *ev);
-
-static void corba_set      (PortableServer_Servant  servant,
-			    const CORBA_char       *file_name,
-			    const CORBA_char       *key,
-			    const CORBA_char       *default_value,
-			    const CORBA_char       *metadata,
-			    CORBA_Environment      *ev);
-static void corba_set_list (PortableServer_Servant       servant,
-			    const CORBA_char            *file_name,
-			    const CORBA_char            *list_key,
-			    const CORBA_char            *list_subkey,
-			    const Nautilus_MetadataList *list,
-			    CORBA_Environment           *ev);
-					       
-static void corba_copy             (PortableServer_Servant   servant,
-				    const CORBA_char        *source_file_name,
-				    const CORBA_char        *destination_directory_uri,
-				    const CORBA_char        *destination_file_name,
-				    CORBA_Environment       *ev);
-static void corba_remove           (PortableServer_Servant  servant,
-				    const CORBA_char       *file_name,
-				    CORBA_Environment      *ev);
-static void corba_rename           (PortableServer_Servant  servant,
-				    const CORBA_char       *old_file_name,
-				    const CORBA_char       *new_file_name,
-				    CORBA_Environment      *ev);
-static void corba_rename_directory (PortableServer_Servant  servant,
-				    const CORBA_char       *new_directory_uri,
-				    CORBA_Environment      *ev);
-
-static void corba_register_monitor   (PortableServer_Servant          servant,
-				      const Nautilus_MetafileMonitor  monitor,
-				      CORBA_Environment              *ev);
-static void corba_unregister_monitor (PortableServer_Servant          servant,
-				      const Nautilus_MetafileMonitor  monitor,
-				      CORBA_Environment              *ev);
-
 static char    *get_file_metadata      (NautilusMetafile *metafile,
 					const char       *file_name,
 					const char       *key,
@@ -199,24 +147,6 @@ struct NautilusMetafileDetails {
 static GHashTable *metafiles;
 
 static void
-nautilus_metafile_class_init (NautilusMetafileClass *klass)
-{
-	GTK_OBJECT_CLASS (klass)->destroy = destroy;
-
-	klass->epv.is_read            = corba_is_read;
-	klass->epv.get                = corba_get;
-	klass->epv.get_list           = corba_get_list;
-	klass->epv.set                = corba_set;
-	klass->epv.set_list           = corba_set_list;
-	klass->epv.copy               = corba_copy;
-	klass->epv.remove             = corba_remove;
-	klass->epv.rename             = corba_rename;
-	klass->epv.rename_directory   = corba_rename_directory;
-	klass->epv.register_monitor   = corba_register_monitor;
-	klass->epv.unregister_monitor = corba_unregister_monitor;
-}
-
-static void
 nautilus_metafile_init (NautilusMetafile *metafile)
 {
 	metafile->details = g_new0 (NautilusMetafileDetails, 1);
@@ -226,7 +156,7 @@ nautilus_metafile_init (NautilusMetafile *metafile)
 }
 
 static void
-destroy (GtkObject *object)
+finalize (GObject *object)
 {
 	NautilusMetafile  *metafile;
 
@@ -257,7 +187,7 @@ destroy (GtkObject *object)
 
 	g_free (metafile->details);
 
-	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (G_OBJECT_CLASS, finalize, (object));
 }
 
 static GnomeVFSURI *
@@ -334,7 +264,7 @@ nautilus_metafile_new (const char *directory_uri)
 {
 	NautilusMetafile *metafile;
 	
-	metafile = NAUTILUS_METAFILE (gtk_object_new (NAUTILUS_TYPE_METAFILE, NULL));
+	metafile = NAUTILUS_METAFILE (g_object_new (NAUTILUS_TYPE_METAFILE, NULL));
 
 	nautilus_metafile_set_directory_uri (metafile, directory_uri);
 
@@ -2137,3 +2067,21 @@ directory_request_write_metafile (NautilusMetafile *metafile)
 				      metafile);
 	}
 }
+
+static void
+nautilus_metafile_class_init (NautilusMetafileClass *klass)
+{
+	G_OBJECT_CLASS (klass)->finalize = finalize;
+
+	klass->epv.is_read            = corba_is_read;
+	klass->epv.get                = corba_get;
+	klass->epv.get_list           = corba_get_list;
+	klass->epv.set                = corba_set;
+	klass->epv.set_list           = corba_set_list;
+	klass->epv.copy               = corba_copy;
+	klass->epv.remove             = corba_remove;
+	klass->epv.rename             = corba_rename;
+	klass->epv.rename_directory   = corba_rename_directory;
+	klass->epv.register_monitor   = corba_register_monitor;
+	klass->epv.unregister_monitor = corba_unregister_monitor;
+}
diff --git a/libnautilus-private/nautilus-program-chooser.c b/libnautilus-private/nautilus-program-chooser.c
index 17abc6208..fa0d8a3c3 100644
--- a/libnautilus-private/nautilus-program-chooser.c
+++ b/libnautilus-private/nautilus-program-chooser.c
@@ -1230,7 +1230,7 @@ create_program_clist ()
 	 */
 	gtk_clist_set_compare_func (clist, compare_program_file_pairs);
 
-	gtk_signal_connect (GTK_OBJECT (clist),
+	g_signal_connect (G_OBJECT (clist),
 			    "click_column",
 			    G_CALLBACK (switch_sort_column),
 			    NULL);
@@ -1348,7 +1348,7 @@ nautilus_program_chooser_new (GnomeVFSMimeActionType action_type,
   	gtk_widget_show (change_button);
   	gtk_box_pack_end (GTK_BOX (change_button_holder), change_button, TRUE, FALSE, 0);
 
-  	gtk_signal_connect (GTK_OBJECT (change_button),
+  	g_signal_connect (G_OBJECT (change_button),
   			    "clicked",
   			    G_CALLBACK (run_program_configurator_callback),
   			    window);
@@ -1368,7 +1368,7 @@ nautilus_program_chooser_new (GnomeVFSMimeActionType action_type,
 	gtk_box_pack_end (GTK_BOX (capplet_hbox), capplet_button_vbox, FALSE, FALSE, 0);
 	capplet_button = gtk_button_new_with_mnemonic (_("_Go There"));	 
 
-	gtk_signal_connect (GTK_OBJECT (capplet_button),
+	g_signal_connect (G_OBJECT (capplet_button),
 			    "clicked",
 			    G_CALLBACK (launch_mime_capplet_and_close_dialog),
 			    window);
@@ -1398,7 +1398,7 @@ nautilus_program_chooser_new (GnomeVFSMimeActionType action_type,
   	update_selected_item_details (GNOME_DIALOG (window));
 
   	/* Update selected item info whenever selection changes. */
-  	gtk_signal_connect (GTK_OBJECT (clist),
+  	g_signal_connect (G_OBJECT (clist),
   			    "select_row",
   			    G_CALLBACK (program_list_selection_changed_callback),
   			    window);
diff --git a/libnautilus-private/nautilus-trash-file.c b/libnautilus-private/nautilus-trash-file.c
index e350f452c..57b70685e 100644
--- a/libnautilus-private/nautilus-trash-file.c
+++ b/libnautilus-private/nautilus-trash-file.c
@@ -284,7 +284,7 @@ add_real_file (NautilusTrashFile *trash,
 	trash->details->files = g_list_prepend
 		(trash->details->files, real_file);
 	
-	gtk_signal_connect (GTK_OBJECT (real_file),
+	g_signal_connect (G_OBJECT (real_file),
 			    "changed",
 			    G_CALLBACK (real_file_changed_callback),
 			    trash);
diff --git a/libnautilus-private/nautilus-trash-monitor.c b/libnautilus-private/nautilus-trash-monitor.c
index 78f2fbeb9..57f484d55 100644
--- a/libnautilus-private/nautilus-trash-monitor.c
+++ b/libnautilus-private/nautilus-trash-monitor.c
@@ -73,7 +73,7 @@ nautilus_trash_monitor_class_init (NautilusTrashMonitorClass *klass)
 		 G_SIGNAL_RUN_LAST,
 		 G_STRUCT_OFFSET (NautilusTrashMonitorClass, trash_state_changed),
 		 NULL, NULL,
-		 gtk_marshal_NONE__BOOL,
+		 gtk_marshal_VOID__BOOLEAN,
 		 G_TYPE_NONE, 1,
 		 GTK_TYPE_BOOL);
 
@@ -83,7 +83,7 @@ nautilus_trash_monitor_class_init (NautilusTrashMonitorClass *klass)
 		 G_SIGNAL_RUN_LAST,
 		 G_STRUCT_OFFSET (NautilusTrashMonitorClass, check_trash_directory_added),
 		 NULL, NULL,
-		 gtk_marshal_NONE__POINTER,
+		 gtk_marshal_VOID__POINTER,
 		 G_TYPE_NONE, 1,
 		 GTK_TYPE_POINTER);
 }
@@ -112,8 +112,8 @@ nautilus_trash_files_changed_callback (NautilusDirectory *directory, GList *file
 		nautilus_file_unref (file);
 
 		/* trash got empty or full, notify everyone who cares */
-		gtk_signal_emit (GTK_OBJECT (trash_monitor), 
-				 signals[TRASH_STATE_CHANGED],
+		g_signal_emit (G_OBJECT (trash_monitor), 
+				 signals[TRASH_STATE_CHANGED], 0,
 				 trash_monitor->details->empty);
 	}
 }
@@ -190,7 +190,7 @@ nautilus_trash_monitor_get (void)
 		trash_directory = nautilus_directory_get (EEL_TRASH_URI);
 		
 		nautilus_trash_monitor = NAUTILUS_TRASH_MONITOR
-			(gtk_object_new (NAUTILUS_TYPE_TRASH_MONITOR, NULL));
+			(g_object_new (NAUTILUS_TYPE_TRASH_MONITOR, NULL));
 		gtk_object_ref (GTK_OBJECT (nautilus_trash_monitor));
 		gtk_object_sink (GTK_OBJECT (nautilus_trash_monitor));
 		g_atexit (unref_trash_monitor);
@@ -273,8 +273,8 @@ add_one_trash_directory_if_needed (const NautilusVolume *volume,
 	NautilusTrashMonitor *trash_monitor;
 
 	trash_monitor = NAUTILUS_TRASH_MONITOR (callback_data);
-	gtk_signal_emit (GTK_OBJECT (trash_monitor),
-			 signals[CHECK_TRASH_DIRECTORY_ADDED],
+	g_signal_emit (G_OBJECT (trash_monitor),
+			 signals[CHECK_TRASH_DIRECTORY_ADDED], 0,
 			 volume);
 	
 	return FALSE;
diff --git a/libnautilus-private/nautilus-undo-context.c b/libnautilus-private/nautilus-undo-context.c
index 58182b97a..abc94a0b3 100644
--- a/libnautilus-private/nautilus-undo-context.c
+++ b/libnautilus-private/nautilus-undo-context.c
@@ -30,19 +30,9 @@
 #include <bonobo/bonobo-main.h>
 #include <gtk/gtksignal.h>
 
-typedef struct {
-	POA_Nautilus_Undo_Context servant;
-	NautilusUndoContext *bonobo_object;
-} impl_POA_Nautilus_Undo_Context;
-
 /* GtkObject */
 static void                  nautilus_undo_context_class_init       (NautilusUndoContextClass *class);
 static void                  nautilus_undo_context_init             (NautilusUndoContext      *item);
-static void                  destroy                                      (GtkObject                *object);
-
-/* CORBA/Bonobo */
-static Nautilus_Undo_Manager impl_Nautilus_Undo_Context__get_undo_manager (PortableServer_Servant    servant,
-									   CORBA_Environment        *ev);
 
 EEL_BONOBO_BOILERPLATE_FULL (NautilusUndoContext,
 			       Nautilus_Undo_Context,
@@ -55,8 +45,7 @@ impl_Nautilus_Undo_Context__get_undo_manager (PortableServer_Servant servant,
 {
 	NautilusUndoContext *context;
 	
-	context = ((impl_POA_Nautilus_Undo_Context *) servant)->bonobo_object;
-	g_assert (NAUTILUS_IS_UNDO_CONTEXT (context));
+	context = NAUTILUS_UNDO_CONTEXT (bonobo_object_from_servant (servant));
 	return CORBA_Object_duplicate (context->undo_manager, ev);
 }
 
@@ -68,7 +57,7 @@ nautilus_undo_context_new (Nautilus_Undo_Manager undo_manager)
 	
 	CORBA_exception_init (&ev);
 
-	context = NAUTILUS_UNDO_CONTEXT (gtk_object_new (nautilus_undo_context_get_type (), NULL));
+	context = NAUTILUS_UNDO_CONTEXT (g_object_new (nautilus_undo_context_get_type (), NULL));
 	context->undo_manager = CORBA_Object_duplicate (undo_manager, &ev);
 	
   	CORBA_exception_free (&ev);
@@ -82,7 +71,7 @@ nautilus_undo_context_init (NautilusUndoContext *context)
 }
 
 static void
-destroy (GtkObject *object)
+finalize (GObject *object)
 {
 	CORBA_Environment ev;	
 	NautilusUndoContext *context;
@@ -94,13 +83,13 @@ destroy (GtkObject *object)
 	
  	CORBA_exception_free (&ev);
 	
-	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (G_OBJECT_CLASS, finalize, (object));
 }
 
 static void
 nautilus_undo_context_class_init (NautilusUndoContextClass *klass)
 {
-	GTK_OBJECT_CLASS (klass)->destroy = destroy;
+	G_OBJECT_CLASS (klass)->finalize = finalize;
 	
 	klass->epv._get_undo_manager = impl_Nautilus_Undo_Context__get_undo_manager;
 }
diff --git a/libnautilus-private/nautilus-undo-manager.c b/libnautilus-private/nautilus-undo-manager.c
index c94668607..fb3b47e04 100644
--- a/libnautilus-private/nautilus-undo-manager.c
+++ b/libnautilus-private/nautilus-undo-manager.c
@@ -119,7 +119,7 @@ corba_append (PortableServer_Servant servant,
 		manager->details->new_transaction_is_redo;
 	
 	/* Fire off signal indicating that the undo state has changed. */
-	gtk_signal_emit (GTK_OBJECT (manager), signals[CHANGED]);
+	g_signal_emit (G_OBJECT (manager), signals[CHANGED], 0);
 }
 
 static void
@@ -142,7 +142,7 @@ corba_forget (PortableServer_Servant servant,
 	release_transaction (manager);
 	
 	/* Fire off signal indicating that the undo state has changed. */
-	gtk_signal_emit (GTK_OBJECT (manager), signals[CHANGED]);
+	g_signal_emit (G_OBJECT (manager), signals[CHANGED], 0);
 }
 
 static void
@@ -198,7 +198,7 @@ nautilus_undo_manager_undo (NautilusUndoManager *manager)
 		bonobo_object_release_unref (transaction, &ev);
 
 		/* Fire off signal indicating the undo state has changed. */
-		gtk_signal_emit (GTK_OBJECT (manager), signals[CHANGED]);
+		g_signal_emit (G_OBJECT (manager), signals[CHANGED], 0);
 	}
 
 	CORBA_exception_free (&ev);
diff --git a/libnautilus-private/nautilus-undo-signal-handlers.c b/libnautilus-private/nautilus-undo-signal-handlers.c
index cab6660d8..bbf6945e4 100644
--- a/libnautilus-private/nautilus-undo-signal-handlers.c
+++ b/libnautilus-private/nautilus-undo-signal-handlers.c
@@ -80,7 +80,7 @@ nautilus_undo_set_up_nautilus_entry_for_undo (NautilusEntry *entry)
 				  data, free_editable_object_data);
 
 	/* Connect to entry signals */
-	gtk_signal_connect (GTK_OBJECT (entry), 
+	g_signal_connect (G_OBJECT (entry), 
 		    "user_changed",
 		    GTK_SIGNAL_FUNC (nautilus_entry_user_changed_callback),
 		    NULL);
@@ -192,12 +192,12 @@ nautilus_undo_set_up_editable_for_undo (GtkEditable *editable)
 	}
 
 	/* Connect to editable signals */
-	gtk_signal_connect (GTK_OBJECT (editable), 
+	g_signal_connect (G_OBJECT (editable), 
 		    "insert_text",
 		    GTK_SIGNAL_FUNC (editable_insert_text_callback),
 		    NULL);
 	
-	gtk_signal_connect (GTK_OBJECT (editable), 
+	g_signal_connect (G_OBJECT (editable), 
 		    "delete_text",
 		    GTK_SIGNAL_FUNC (editable_delete_text_callback),
 		    NULL);
@@ -328,7 +328,7 @@ nautilus_undo_editable_set_undo_key (GtkEditable *editable, gboolean value)
 #ifdef UNDO_ENABLED
 	if (value) {
 		/* Connect to entry signals */
-		gtk_signal_connect (GTK_OBJECT (editable), 
+		g_signal_connect (G_OBJECT (editable), 
 				    "key_press_event",
 				    GTK_SIGNAL_FUNC (editable_key_press_event),
 				    NULL);
diff --git a/libnautilus-private/nautilus-vfs-directory.c b/libnautilus-private/nautilus-vfs-directory.c
index 1ea221468..b71eb7f0d 100644
--- a/libnautilus-private/nautilus-vfs-directory.c
+++ b/libnautilus-private/nautilus-vfs-directory.c
@@ -39,8 +39,8 @@ static void nautilus_vfs_directory_init       (gpointer   object,
 static void nautilus_vfs_directory_class_init (gpointer   klass);
 
 EEL_CLASS_BOILERPLATE (NautilusVFSDirectory,
-				   nautilus_vfs_directory,
-				   NAUTILUS_TYPE_DIRECTORY)
+		       nautilus_vfs_directory,
+		       NAUTILUS_TYPE_DIRECTORY)
 
 static void
 nautilus_vfs_directory_init (gpointer object, gpointer klass)
diff --git a/libnautilus-private/nautilus-volume-monitor.c b/libnautilus-private/nautilus-volume-monitor.c
index 3dd13c9f4..f6279bb91 100644
--- a/libnautilus-private/nautilus-volume-monitor.c
+++ b/libnautilus-private/nautilus-volume-monitor.c
@@ -305,7 +305,7 @@ nautilus_volume_monitor_class_init (NautilusVolumeMonitorClass *klass)
 		                G_STRUCT_OFFSET (NautilusVolumeMonitorClass, 
 						     volume_mounted),
 		                NULL, NULL,
-		                gtk_marshal_NONE__POINTER,
+		                gtk_marshal_VOID__POINTER,
 		                G_TYPE_NONE, 1, GTK_TYPE_POINTER);
 
 	signals[VOLUME_UNMOUNT_STARTED] 
@@ -315,7 +315,7 @@ nautilus_volume_monitor_class_init (NautilusVolumeMonitorClass *klass)
 		                G_STRUCT_OFFSET (NautilusVolumeMonitorClass, 
 						     volume_unmount_started),
 		                NULL, NULL,
-		                gtk_marshal_NONE__POINTER,
+		                gtk_marshal_VOID__POINTER,
 		                G_TYPE_NONE, 1, GTK_TYPE_POINTER);
 
 	signals[VOLUME_UNMOUNT_FAILED] 
@@ -325,7 +325,7 @@ nautilus_volume_monitor_class_init (NautilusVolumeMonitorClass *klass)
 		                G_STRUCT_OFFSET (NautilusVolumeMonitorClass, 
 						     volume_unmount_failed),
 		                NULL, NULL,
-		                gtk_marshal_NONE__POINTER,
+		                gtk_marshal_VOID__POINTER,
 		                G_TYPE_NONE, 1, GTK_TYPE_POINTER);
 
 	signals[VOLUME_UNMOUNTED] 
@@ -335,7 +335,7 @@ nautilus_volume_monitor_class_init (NautilusVolumeMonitorClass *klass)
 		                G_STRUCT_OFFSET (NautilusVolumeMonitorClass, 
 						     volume_unmounted),
 		                NULL, NULL,
-		                gtk_marshal_NONE__POINTER,
+		                gtk_marshal_VOID__POINTER,
 		                G_TYPE_NONE, 1, GTK_TYPE_POINTER);
 
 	/* Check environment a bit. */
@@ -391,7 +391,7 @@ nautilus_volume_monitor_get (void)
 {
 	if (global_volume_monitor == NULL) {
 		global_volume_monitor = NAUTILUS_VOLUME_MONITOR
-			(gtk_object_new (nautilus_volume_monitor_get_type(),
+			(g_object_new (nautilus_volume_monitor_get_type(),
 					 NULL));
 		gtk_object_ref (GTK_OBJECT (global_volume_monitor));
 		gtk_object_sink (GTK_OBJECT (global_volume_monitor));
@@ -800,8 +800,8 @@ mount_volume_make_name (NautilusVolume *volume)
 static void
 mount_volume_activate (NautilusVolumeMonitor *monitor, NautilusVolume *volume)
 {
-	gtk_signal_emit (GTK_OBJECT (monitor),
-			 signals[VOLUME_MOUNTED],
+	g_signal_emit (G_OBJECT (monitor),
+			 signals[VOLUME_MOUNTED], 0,
 			 volume);
 }
 
@@ -839,8 +839,8 @@ mount_volume_deactivate (NautilusVolumeMonitor *monitor, NautilusVolume *volume)
 	default:
 	}
 
-	gtk_signal_emit (GTK_OBJECT (monitor),
-			 signals[VOLUME_UNMOUNTED],
+	g_signal_emit (G_OBJECT (monitor),
+			 signals[VOLUME_UNMOUNTED], 0,
 			 volume);
 }
 
@@ -1387,7 +1387,7 @@ display_mount_error (gpointer callback_data)
 		for (p = monitor->details->mounts; p != NULL; p = p->next) {
 			volume = (NautilusVolume *)p->data;
 			if (strcmp (volume->mount_path, info->mount_point) == 0) {
-				gtk_signal_emit (GTK_OBJECT (monitor), signals[VOLUME_UNMOUNT_FAILED], volume);
+				g_signal_emit (G_OBJECT (monitor), signals[VOLUME_UNMOUNT_FAILED], 0, volume);
 				break;
 			}
 		}
@@ -1568,7 +1568,7 @@ nautilus_volume_monitor_mount_unmount_removable (NautilusVolumeMonitor *monitor,
                command = find_command (UMOUNT_COMMAND);
                command_string = g_strconcat (command, UMOUNT_SEPARATOR, name, NULL);
                if (volume != NULL) {
-			gtk_signal_emit (GTK_OBJECT (monitor), signals[VOLUME_UNMOUNT_STARTED], volume);
+			g_signal_emit (G_OBJECT (monitor), signals[VOLUME_UNMOUNT_STARTED], 0, volume);
 		}
        }
 
diff --git a/libnautilus/Makefile.am b/libnautilus/Makefile.am
index d47757469..993310e4d 100644
--- a/libnautilus/Makefile.am
+++ b/libnautilus/Makefile.am
@@ -64,7 +64,7 @@ nautilus_distributed_undo_idl_stamp: nautilus-distributed-undo.idl
 
 $(libnautilus_la_OBJECTS): nautilus_view_component_idl_stamp nautilus_distributed_undo_idl_stamp
 
-uidir = $(datadir)/gnome/ui
+uidir = $(datadir)/gnome-2.0/ui
 ui_DATA = \
 	nautilus-clipboard-ui.xml	\
 	$(NULL)
diff --git a/libnautilus/nautilus-clipboard.c b/libnautilus/nautilus-clipboard.c
index e9982c377..8b2b3eaf0 100644
--- a/libnautilus/nautilus-clipboard.c
+++ b/libnautilus/nautilus-clipboard.c
@@ -440,7 +440,7 @@ nautilus_clipboard_set_up_editable (GtkEditable *target,
 	gtk_signal_connect_after (GTK_OBJECT (target), "focus_out_event",
 				  G_CALLBACK (focus_changed_callback), target_data);
 
-	gtk_signal_connect (GTK_OBJECT (target), "destroy",
+	g_signal_connect (G_OBJECT (target), "destroy",
 			    G_CALLBACK (target_destroy_callback), target_data);
 	
 	/* Call the focus changed callback once to merge if the window is
@@ -510,11 +510,11 @@ nautilus_clipboard_set_up_editable_in_control (GtkEditable *target,
 	gtk_object_set_data (GTK_OBJECT (target),
 			     "Nautilus:shares_selection_changes",
 			     GINT_TO_POINTER (shares_selection_changes));
-	gtk_signal_connect (GTK_OBJECT (target),
+	g_signal_connect (G_OBJECT (target),
 			    "focus_in_event",
 			    G_CALLBACK (first_focus_callback),
 			    control);
-	gtk_signal_connect (GTK_OBJECT (target),
+	g_signal_connect (G_OBJECT (target),
 			    "destroy",
 			    G_CALLBACK (control_destroyed_callback),
 			    control);
diff --git a/libnautilus/nautilus-undo-transaction.c b/libnautilus/nautilus-undo-transaction.c
index 484a7154d..ecb4b2152 100644
--- a/libnautilus/nautilus-undo-transaction.c
+++ b/libnautilus/nautilus-undo-transaction.c
@@ -34,34 +34,18 @@
 
 #define NAUTILUS_UNDO_TRANSACTION_LIST_DATA "Nautilus undo transaction list"
 
-typedef struct {
-	POA_Nautilus_Undo_Transaction servant;
-	NautilusUndoTransaction *bonobo_object;
-} impl_POA_Nautilus_Undo_Transaction;
-
-static void                    nautilus_undo_transaction_class_init         (NautilusUndoTransactionClass *class);
-static void                    nautilus_undo_transaction_init               (NautilusUndoTransaction      *item);
-static void                    nautilus_undo_transaction_destroy                  (GtkObject                    *object);
-static void                    nautilus_undo_transaction_undo                     (NautilusUndoTransaction      *transaction);
-
-/* CORBA/Bonobo */
-static Nautilus_Undo_MenuItem *impl_Nautilus_Undo_Transaction__get_undo_menu_item (PortableServer_Servant        servant,
-										   CORBA_Environment            *ev);
-static Nautilus_Undo_MenuItem *impl_Nautilus_Undo_Transaction__get_redo_menu_item (PortableServer_Servant        servant,
-										   CORBA_Environment            *ev);
-static CORBA_char *            impl_Nautilus_Undo_Transaction__get_operation_name (PortableServer_Servant        servant,
-										   CORBA_Environment            *ev);
-static void                    impl_Nautilus_Undo_Transaction__undo               (PortableServer_Servant        servant,
-										   CORBA_Environment            *ev);
+static void nautilus_undo_transaction_class_init (NautilusUndoTransactionClass *class);
+static void nautilus_undo_transaction_init       (NautilusUndoTransaction      *item);
+static void nautilus_undo_transaction_undo       (NautilusUndoTransaction      *transaction);
 
 /* undo atoms */
-static void                    undo_atom_list_free                                (GList                        *list);
-static void                    undo_atom_list_undo_and_free                       (GList                        *list);
+static void undo_atom_list_free                  (GList                        *list);
+static void undo_atom_list_undo_and_free         (GList                        *list);
 
 EEL_BONOBO_BOILERPLATE_FULL (NautilusUndoTransaction,
-			       Nautilus_Undo_Transaction,
-			       nautilus_undo_transaction,
-			       BONOBO_OBJECT_TYPE)
+			     Nautilus_Undo_Transaction,
+			     nautilus_undo_transaction,
+			     BONOBO_OBJECT_TYPE)
 
 static Nautilus_Undo_MenuItem *
 impl_Nautilus_Undo_Transaction__get_undo_menu_item (PortableServer_Servant servant,
@@ -70,7 +54,7 @@ impl_Nautilus_Undo_Transaction__get_undo_menu_item (PortableServer_Servant serva
 	NautilusUndoTransaction *transaction;
 	Nautilus_Undo_MenuItem *item;
 
-	transaction = ((impl_POA_Nautilus_Undo_Transaction *) servant)->bonobo_object;
+	transaction = NAUTILUS_UNDO_TRANSACTION (bonobo_object_from_servant (servant));
 	
 	item = Nautilus_Undo_MenuItem__alloc ();
      	item->label = CORBA_string_dup (transaction->undo_menu_item_label);
@@ -86,7 +70,7 @@ impl_Nautilus_Undo_Transaction__get_redo_menu_item (PortableServer_Servant serva
 	NautilusUndoTransaction *transaction;
 	Nautilus_Undo_MenuItem *item;
 
-	transaction = ((impl_POA_Nautilus_Undo_Transaction *) servant)->bonobo_object;
+	transaction = NAUTILUS_UNDO_TRANSACTION (bonobo_object_from_servant (servant));
 	
 	item = Nautilus_Undo_MenuItem__alloc ();
      	item->label = CORBA_string_dup (transaction->redo_menu_item_label);
@@ -101,7 +85,7 @@ impl_Nautilus_Undo_Transaction__get_operation_name (PortableServer_Servant serva
 {
 	NautilusUndoTransaction *transaction;
 	
-	transaction = ((impl_POA_Nautilus_Undo_Transaction *) servant)->bonobo_object;
+	transaction = NAUTILUS_UNDO_TRANSACTION (bonobo_object_from_servant (servant));
 	return CORBA_string_dup (transaction->operation_name);
 }
 
@@ -111,7 +95,7 @@ impl_Nautilus_Undo_Transaction__undo (PortableServer_Servant servant,
 {
 	NautilusUndoTransaction *transaction;
 	
-	transaction = ((impl_POA_Nautilus_Undo_Transaction *) servant)->bonobo_object;
+	transaction = NAUTILUS_UNDO_TRANSACTION (bonobo_object_from_servant (servant));
 	nautilus_undo_transaction_undo (transaction);
 }
 
@@ -124,9 +108,7 @@ nautilus_undo_transaction_new (const char *operation_name,
 {
 	NautilusUndoTransaction *transaction;
 
-	transaction = NAUTILUS_UNDO_TRANSACTION (gtk_object_new (nautilus_undo_transaction_get_type (), NULL));
-	gtk_object_ref (GTK_OBJECT (transaction));
-	gtk_object_sink (GTK_OBJECT (transaction));
+	transaction = NAUTILUS_UNDO_TRANSACTION (g_object_new (nautilus_undo_transaction_get_type (), NULL));
 	
 	transaction->operation_name = g_strdup (operation_name);
 	transaction->undo_menu_item_label = g_strdup (undo_menu_item_label);
@@ -173,7 +155,7 @@ remove_transaction_from_atom_targets (NautilusUndoTransaction *transaction)
 }
 
 static void
-nautilus_undo_transaction_destroy (GtkObject *object)
+nautilus_undo_transaction_finalize (GObject *object)
 {
 	NautilusUndoTransaction *transaction;
 	CORBA_Environment ev;
@@ -193,20 +175,7 @@ nautilus_undo_transaction_destroy (GtkObject *object)
 	CORBA_Object_release (transaction->owner, &ev);
 	CORBA_exception_free (&ev);
 	
-	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
-}
-
-static void
-nautilus_undo_transaction_class_init (NautilusUndoTransactionClass *klass)
-{
-	POA_Nautilus_Undo_Transaction__epv *epv = &klass->epv;
-
-	GTK_OBJECT_CLASS (klass)->destroy = nautilus_undo_transaction_destroy;
-	
-	epv->_get_undo_menu_item = &impl_Nautilus_Undo_Transaction__get_undo_menu_item;
-	epv->_get_redo_menu_item = &impl_Nautilus_Undo_Transaction__get_redo_menu_item;
-	epv->_get_operation_name = &impl_Nautilus_Undo_Transaction__get_operation_name;
-	epv->undo = &impl_Nautilus_Undo_Transaction__undo;
+	EEL_CALL_PARENT (G_OBJECT_CLASS, finalize, (object));
 }
 
 void
@@ -387,3 +356,16 @@ undo_atom_list_undo_and_free (GList *list)
 	g_list_foreach (list, undo_atom_undo_and_free_cover, NULL);
 	g_list_free (list);
 }
+
+static void
+nautilus_undo_transaction_class_init (NautilusUndoTransactionClass *klass)
+{
+	POA_Nautilus_Undo_Transaction__epv *epv = &klass->epv;
+
+	G_OBJECT_CLASS (klass)->finalize = nautilus_undo_transaction_finalize;
+	
+	epv->_get_undo_menu_item = &impl_Nautilus_Undo_Transaction__get_undo_menu_item;
+	epv->_get_redo_menu_item = &impl_Nautilus_Undo_Transaction__get_redo_menu_item;
+	epv->_get_operation_name = &impl_Nautilus_Undo_Transaction__get_operation_name;
+	epv->undo = &impl_Nautilus_Undo_Transaction__undo;
+}
diff --git a/libnautilus/nautilus-undo.c b/libnautilus/nautilus-undo.c
index 088fa0957..1590a0a9e 100644
--- a/libnautilus/nautilus-undo.c
+++ b/libnautilus/nautilus-undo.c
@@ -279,6 +279,6 @@ nautilus_undo_set_up_bonobo_control (BonoboControl *control)
 	g_return_if_fail (BONOBO_IS_CONTROL (control));
 
 	set_up_bonobo_control (control);
-	gtk_signal_connect (GTK_OBJECT (control), "set_frame",
+	g_signal_connect (G_OBJECT (control), "set_frame",
 			    GTK_SIGNAL_FUNC (set_up_bonobo_control), NULL);
 }
diff --git a/libnautilus/nautilus-view-standard-main.c b/libnautilus/nautilus-view-standard-main.c
index 19ad0619a..47a20ba28 100644
--- a/libnautilus/nautilus-view-standard-main.c
+++ b/libnautilus/nautilus-view-standard-main.c
@@ -109,7 +109,7 @@ make_object (BonoboGenericFactory *factory,
 		g_source_remove (callback_data->delayed_quit_timeout_id);
 		callback_data->delayed_quit_timeout_id = 0;
 	}
-	gtk_signal_connect (GTK_OBJECT (view), "destroy",
+	g_signal_connect (G_OBJECT (view), "destroy",
 			    G_CALLBACK (object_destroyed), callback_data);
 
 	return BONOBO_OBJECT (view);
@@ -318,6 +318,6 @@ typedef GtkType (* TypeFunc) (void);
 NautilusView *
 nautilus_view_create_from_get_type_function (const char *iid, void *user_data)
 {
-	return NAUTILUS_VIEW (gtk_object_new (((TypeFunc) (user_data)) (), NULL));
+	return NAUTILUS_VIEW (g_object_new (((TypeFunc) (user_data)) (), NULL));
 }
 
diff --git a/libnautilus/nautilus-view.c b/libnautilus/nautilus-view.c
index 061610a56..c64949f10 100644
--- a/libnautilus/nautilus-view.c
+++ b/libnautilus/nautilus-view.c
@@ -69,22 +69,7 @@ typedef struct {
 	char *title;
 } LocationPlus;
 
-static void impl_Nautilus_View_load_location     (PortableServer_Servant  servant,
-						  const CORBA_char       *location,
-						  CORBA_Environment      *ev);
-static void impl_Nautilus_View_stop_loading      (PortableServer_Servant  servant,
-						  CORBA_Environment      *ev);
-static void impl_Nautilus_View_selection_changed (PortableServer_Servant  servant,
-						  const Nautilus_URIList *selection,
-						  CORBA_Environment      *ev);
-static void impl_Nautilus_View_title_changed     (PortableServer_Servant  servant,
-						  const CORBA_char       *title,
-						  CORBA_Environment      *ev);
-static void impl_Nautilus_View_history_changed   (PortableServer_Servant  servant,
-						  const Nautilus_History *history,
-						  CORBA_Environment      *ev);
 static void nautilus_view_init             (NautilusView           *view);
-static void nautilus_view_destroy                (GtkObject              *object);
 static void nautilus_view_class_init       (NautilusViewClass      *klass);
 
 EEL_BONOBO_BOILERPLATE_FULL (NautilusView,
@@ -166,44 +151,44 @@ static void
 call_load_location (NautilusView *view,
 		    gpointer callback_data)
 {
-	gtk_signal_emit (GTK_OBJECT (view),
-			 signals[LOAD_LOCATION],
-			 callback_data);
+	g_signal_emit (G_OBJECT (view),
+		       signals[LOAD_LOCATION], 0,
+		       callback_data);
 }
 
 static void
 call_stop_loading (NautilusView *view,
 		   gpointer callback_data)
 {
-	gtk_signal_emit (GTK_OBJECT (view),
-			 signals[STOP_LOADING]);
+	g_signal_emit (G_OBJECT (view),
+		       signals[STOP_LOADING], 0);
 }
 
 static void
 call_selection_changed (NautilusView *view,
 			gpointer callback_data)
 {
-	gtk_signal_emit (GTK_OBJECT (view),
-			 signals[SELECTION_CHANGED],
-			 callback_data);
+	g_signal_emit (G_OBJECT (view),
+		       signals[SELECTION_CHANGED], 0,
+		       callback_data);
 }
 
 static void
 call_title_changed (NautilusView *view,
 		    gpointer callback_data)
 {
-	gtk_signal_emit (GTK_OBJECT (view),
-			 signals[TITLE_CHANGED],
-			 callback_data);
+	g_signal_emit (G_OBJECT (view),
+		       signals[TITLE_CHANGED], 0,
+		       callback_data);
 }
 
 static void
 call_history_changed (NautilusView *view,
 		      gpointer callback_data)
 {
-	gtk_signal_emit (GTK_OBJECT (view),
-			 signals[HISTORY_CHANGED],
-			 callback_data);
+	g_signal_emit (G_OBJECT (view),
+		       signals[HISTORY_CHANGED], 0,
+		       callback_data);
 }
 
 static void
@@ -289,64 +274,6 @@ impl_Nautilus_View_history_changed (PortableServer_Servant servant,
 }
 
 static void
-nautilus_view_class_init (NautilusViewClass *klass)
-{
-	GtkObjectClass *object_class;
-	POA_Nautilus_View__epv *epv = &klass->epv;
-	
-	object_class = (GtkObjectClass *) klass;
-
-	object_class->destroy = nautilus_view_destroy;
-	
-	signals[LOAD_LOCATION] =
-		g_signal_new ("load_location",
-		              G_TYPE_FROM_CLASS (object_class),
-		              G_SIGNAL_RUN_LAST,
-		              G_STRUCT_OFFSET (NautilusViewClass, load_location),
-		              NULL, NULL,
-		              g_cclosure_marshal_VOID__STRING,
-		              G_TYPE_NONE, 1, G_TYPE_STRING);
-	signals[STOP_LOADING] =
-		g_signal_new ("stop_loading",
-		              G_TYPE_FROM_CLASS (object_class),
-		              G_SIGNAL_RUN_LAST,
-		              G_STRUCT_OFFSET (NautilusViewClass, stop_loading),
-		              NULL, NULL,
-		              gtk_marshal_NONE__NONE,
-		              G_TYPE_NONE, 0);
-	signals[SELECTION_CHANGED] =
-		g_signal_new ("selection_changed",
-		              G_TYPE_FROM_CLASS (object_class),
-		              G_SIGNAL_RUN_LAST,
-		              G_STRUCT_OFFSET (NautilusViewClass, selection_changed),
-		              NULL, NULL,
-		              gtk_marshal_NONE__POINTER,
-		              G_TYPE_NONE, 1, GTK_TYPE_POINTER);
-	signals[TITLE_CHANGED] =
-		g_signal_new ("title_changed",
-		              G_TYPE_FROM_CLASS (object_class),
-		              G_SIGNAL_RUN_LAST,
-		              G_STRUCT_OFFSET (NautilusViewClass, title_changed),
-		              NULL, NULL,
-		              g_cclosure_marshal_VOID__STRING,
-		              G_TYPE_NONE, 1, G_TYPE_STRING);
-	signals[HISTORY_CHANGED] =
-		g_signal_new ("history_changed",
-		              G_TYPE_FROM_CLASS (object_class),
-		              G_SIGNAL_RUN_LAST,
-		              G_STRUCT_OFFSET (NautilusViewClass, history_changed),
-		              NULL, NULL,
-		              gtk_marshal_NONE__POINTER,
-		              G_TYPE_NONE, 1, GTK_TYPE_POINTER);
-
-	epv->load_location = impl_Nautilus_View_load_location;
-	epv->stop_loading = impl_Nautilus_View_stop_loading;
-	epv->selection_changed = impl_Nautilus_View_selection_changed;
-	epv->title_changed = impl_Nautilus_View_title_changed;
-	epv->history_changed = impl_Nautilus_View_history_changed;
-}
-
-static void
 nautilus_view_init (NautilusView *view)
 {
 	view->details = g_new0 (NautilusViewDetails, 1);
@@ -366,7 +293,7 @@ NautilusView *
 nautilus_view_new_from_bonobo_control (BonoboControl *control)
 {
 	return nautilus_view_construct_from_bonobo_control 
-		(NAUTILUS_VIEW (gtk_object_new (NAUTILUS_TYPE_VIEW, NULL)), 
+		(NAUTILUS_VIEW (g_object_new (NAUTILUS_TYPE_VIEW, NULL)), 
 		 control);
 }
 
@@ -393,7 +320,7 @@ nautilus_view_construct_from_bonobo_control (NautilusView   *view,
 }
 
 static void
-nautilus_view_destroy (GtkObject *object)
+nautilus_view_finalize (GObject *object)
 {
 	NautilusView *view;
 
@@ -404,7 +331,7 @@ nautilus_view_destroy (GtkObject *object)
 
 	g_free (view->details);
 	
-	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (G_OBJECT_CLASS, finalize, (object));
 }
 
 static Nautilus_ViewFrame
@@ -873,3 +800,58 @@ nautilus_view_set_up_ui (NautilusView *view,
 
 	return ui_component;
 }
+
+static void
+nautilus_view_class_init (NautilusViewClass *klass)
+{
+	POA_Nautilus_View__epv *epv = &klass->epv;
+	
+	G_OBJECT_CLASS (klass)->finalize = nautilus_view_finalize;
+	
+	signals[LOAD_LOCATION] =
+		g_signal_new ("load_location",
+		              G_TYPE_FROM_CLASS (klass),
+		              G_SIGNAL_RUN_LAST,
+		              G_STRUCT_OFFSET (NautilusViewClass, load_location),
+		              NULL, NULL,
+		              g_cclosure_marshal_VOID__STRING,
+		              G_TYPE_NONE, 1, G_TYPE_STRING);
+	signals[STOP_LOADING] =
+		g_signal_new ("stop_loading",
+		              G_TYPE_FROM_CLASS (klass),
+		              G_SIGNAL_RUN_LAST,
+		              G_STRUCT_OFFSET (NautilusViewClass, stop_loading),
+		              NULL, NULL,
+		              gtk_marshal_NONE__NONE,
+		              G_TYPE_NONE, 0);
+	signals[SELECTION_CHANGED] =
+		g_signal_new ("selection_changed",
+		              G_TYPE_FROM_CLASS (klass),
+		              G_SIGNAL_RUN_LAST,
+		              G_STRUCT_OFFSET (NautilusViewClass, selection_changed),
+		              NULL, NULL,
+		              gtk_marshal_NONE__POINTER,
+		              G_TYPE_NONE, 1, GTK_TYPE_POINTER);
+	signals[TITLE_CHANGED] =
+		g_signal_new ("title_changed",
+		              G_TYPE_FROM_CLASS (klass),
+		              G_SIGNAL_RUN_LAST,
+		              G_STRUCT_OFFSET (NautilusViewClass, title_changed),
+		              NULL, NULL,
+		              g_cclosure_marshal_VOID__STRING,
+		              G_TYPE_NONE, 1, G_TYPE_STRING);
+	signals[HISTORY_CHANGED] =
+		g_signal_new ("history_changed",
+		              G_TYPE_FROM_CLASS (klass),
+		              G_SIGNAL_RUN_LAST,
+		              G_STRUCT_OFFSET (NautilusViewClass, history_changed),
+		              NULL, NULL,
+		              gtk_marshal_NONE__POINTER,
+		              G_TYPE_NONE, 1, GTK_TYPE_POINTER);
+
+	epv->load_location = impl_Nautilus_View_load_location;
+	epv->stop_loading = impl_Nautilus_View_stop_loading;
+	epv->selection_changed = impl_Nautilus_View_selection_changed;
+	epv->title_changed = impl_Nautilus_View_title_changed;
+	epv->history_changed = impl_Nautilus_View_history_changed;
+}
diff --git a/src/Makefile.am b/src/Makefile.am
index d66c5f53b..eb074b047 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -130,7 +130,7 @@ server_DATA = $(server_in_files:.server.in=.server)
 
 @INTLTOOL_SERVER_RULE@
 
-uidir = $(datadir)/gnome/ui
+uidir = $(datadir)/gnome-2.0/ui
 ui_DATA = 					\
 	nautilus-shell-ui.xml			\
 	$(NULL)
diff --git a/src/file-manager/Makefile.am b/src/file-manager/Makefile.am
index 06b702043..512acb04e 100644
--- a/src/file-manager/Makefile.am
+++ b/src/file-manager/Makefile.am
@@ -31,7 +31,7 @@ libnautilus_file_manager_la_SOURCES=	\
 	nautilus-indexing-info.h 	\
 	$(NULL)
 
-uidir = $(datadir)/gnome/ui
+uidir = $(datadir)/gnome-2.0/ui
 ui_DATA =					\
 	nautilus-desktop-icon-view-ui.xml	\
 	nautilus-directory-view-ui.xml		\
diff --git a/src/file-manager/fm-desktop-icon-view.c b/src/file-manager/fm-desktop-icon-view.c
index 0a3065125..2e5029daa 100644
--- a/src/file-manager/fm-desktop-icon-view.c
+++ b/src/file-manager/fm-desktop-icon-view.c
@@ -531,7 +531,7 @@ delayed_init (FMDesktopIconView *desktop_icon_view)
 {
 	/* Keep track of the load time. */
 	desktop_icon_view->details->done_loading_signal = 
-		gtk_signal_connect (GTK_OBJECT (fm_directory_view_get_model
+		g_signal_connect (G_OBJECT (fm_directory_view_get_model
 						(FM_DIRECTORY_VIEW (desktop_icon_view))),
 				    "done_loading",
 				    GTK_SIGNAL_FUNC (done_loading), desktop_icon_view);
@@ -610,17 +610,17 @@ fm_desktop_icon_view_init (FMDesktopIconView *desktop_icon_view)
 					     	     create_one_mount_link,
 						     desktop_icon_view);
 	
-	gtk_signal_connect (GTK_OBJECT (icon_container),
+	g_signal_connect (G_OBJECT (icon_container),
 			    "middle_click",
 			    GTK_SIGNAL_FUNC (fm_desktop_icon_view_handle_middle_click),
 			    desktop_icon_view);
 			    
-	gtk_signal_connect (GTK_OBJECT (icon_container),
+	g_signal_connect (G_OBJECT (icon_container),
 			    "compare_icons",
 			    GTK_SIGNAL_FUNC (desktop_icons_compare_callback),
 			    desktop_icon_view);
 
-	gtk_signal_connect (GTK_OBJECT (desktop_icon_view),
+	g_signal_connect (G_OBJECT (desktop_icon_view),
 			    "event",
 			    GTK_SIGNAL_FUNC (event_callback),
 			    desktop_icon_view);
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index 4ac72b022..b84b46b31 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -1139,12 +1139,12 @@ add_scripts_directory (FMDirectoryView *view,
 
 	g_list_free (attributes);
 
-	gtk_signal_connect (GTK_OBJECT (directory),
+	g_signal_connect (G_OBJECT (directory),
 			    "files_added",
 			    G_CALLBACK (scripts_added_or_changed_callback),
 			    view);
 
-	gtk_signal_connect (GTK_OBJECT (directory), 
+	g_signal_connect (G_OBJECT (directory), 
 			    "files_changed",
 			    G_CALLBACK (scripts_added_or_changed_callback),
 			    view);
@@ -1195,37 +1195,37 @@ fm_directory_view_init (FMDirectoryView *view)
 	view->details->sort_directories_first = 
 		eel_preferences_get_boolean (NAUTILUS_PREFERENCES_SORT_DIRECTORIES_FIRST);
 
-	gtk_signal_connect (GTK_OBJECT (view->details->nautilus_view), 
+	g_signal_connect (G_OBJECT (view->details->nautilus_view), 
 			    "stop_loading",
 			    G_CALLBACK (stop_loading_callback),
 			    view);
-	gtk_signal_connect (GTK_OBJECT (view->details->nautilus_view), 
+	g_signal_connect (G_OBJECT (view->details->nautilus_view), 
 			    "load_location",
 			    G_CALLBACK (load_location_callback), 
 			    view);
-	gtk_signal_connect (GTK_OBJECT (view->details->nautilus_view), 
+	g_signal_connect (G_OBJECT (view->details->nautilus_view), 
 			    "selection_changed",
 			    G_CALLBACK (selection_changed_callback), 
 			    view);
 
-        gtk_signal_connect (GTK_OBJECT (fm_directory_view_get_bonobo_control (view)),
+        g_signal_connect (G_OBJECT (fm_directory_view_get_bonobo_control (view)),
                             "activate",
                             G_CALLBACK (bonobo_control_activate_callback),
                             view);
 
-	gtk_signal_connect (GTK_OBJECT (view->details->zoomable), 
+	g_signal_connect (G_OBJECT (view->details->zoomable), 
 			    "zoom_in",
 			    G_CALLBACK (zoomable_zoom_in_callback),
 			    view);
-	gtk_signal_connect (GTK_OBJECT (view->details->zoomable), 
+	g_signal_connect (G_OBJECT (view->details->zoomable), 
 			    "zoom_out", 
 			    G_CALLBACK (zoomable_zoom_out_callback),
 			    view);
-	gtk_signal_connect (GTK_OBJECT (view->details->zoomable), 
+	g_signal_connect (G_OBJECT (view->details->zoomable), 
 			    "set_zoom_level", 
 			    G_CALLBACK (zoomable_set_zoom_level_callback),
 			    view);
-	gtk_signal_connect (GTK_OBJECT (view->details->zoomable), 
+	g_signal_connect (G_OBJECT (view->details->zoomable), 
 			    "zoom_to_fit", 
 			    G_CALLBACK (zoomable_zoom_to_fit_callback),
 			    view);
@@ -1825,7 +1825,7 @@ pre_copy_move (FMDirectoryView *directory_view)
 	 * operate on. The ADD_FILE signal is registered as G_SIGNAL_RUN_LAST, so we
 	 * must use connect_after.
 	 */
-	gtk_signal_connect (GTK_OBJECT (directory_view),
+	g_signal_connect (G_OBJECT (directory_view),
 			    "add_file",
 			    G_CALLBACK (pre_copy_move_add_file_callback),
 			    copy_move_done_data);
@@ -2071,23 +2071,23 @@ process_old_files (FMDirectoryView *view)
 	send_selection_change = FALSE;
 
 	if (files_added != NULL || files_changed != NULL) {
-		gtk_signal_emit (GTK_OBJECT (view), signals[BEGIN_FILE_CHANGES]);
+		g_signal_emit (G_OBJECT (view), signals[BEGIN_FILE_CHANGES], 0);
 
 		for (node = files_added; node != NULL; node = node->next) {
 			file = NAUTILUS_FILE (node->data);
-			gtk_signal_emit (GTK_OBJECT (view),
-					 signals[ADD_FILE], file);
+			g_signal_emit (G_OBJECT (view),
+					 signals[ADD_FILE], 0, file);
 		}
 
 		for (node = files_changed; node != NULL; node = node->next) {
 			file = NAUTILUS_FILE (node->data);
-			gtk_signal_emit (GTK_OBJECT (view),
+			g_signal_emit (G_OBJECT (view),
 					 signals[still_should_show_file (view, file)
-						 ? FILE_CHANGED : REMOVE_FILE],
+						 ? FILE_CHANGED : REMOVE_FILE], 0,
 					 file);
 		}
 
-		gtk_signal_emit (GTK_OBJECT (view), signals[END_FILE_CHANGES]);
+		g_signal_emit (G_OBJECT (view), signals[END_FILE_CHANGES], 0);
 
 		if (files_changed != NULL) {
 			selection = fm_directory_view_get_selection (view);
@@ -2344,8 +2344,8 @@ load_error_callback (NautilusDirectory *directory,
 	/* Emit a signal to tell subclasses that a load error has
 	 * occurred, so they can handle it in the UI.
 	 */
-	gtk_signal_emit (GTK_OBJECT (view),
-			 signals[LOAD_ERROR], load_error_code);
+	g_signal_emit (G_OBJECT (view),
+			 signals[LOAD_ERROR], 0, load_error_code);
 }
 
 static void
@@ -2400,7 +2400,7 @@ fm_directory_view_clear (FMDirectoryView *view)
 {
 	g_return_if_fail (FM_IS_DIRECTORY_VIEW (view));
 
-	gtk_signal_emit (GTK_OBJECT (view), signals[CLEAR]);
+	g_signal_emit (G_OBJECT (view), signals[CLEAR], 0);
 }
 
 /**
@@ -2417,7 +2417,7 @@ fm_directory_view_begin_loading (FMDirectoryView *view)
 {
 	g_return_if_fail (FM_IS_DIRECTORY_VIEW (view));
 
-	gtk_signal_emit (GTK_OBJECT (view), signals[BEGIN_LOADING]);
+	g_signal_emit (G_OBJECT (view), signals[BEGIN_LOADING], 0);
 }
 
 /**
@@ -2434,7 +2434,7 @@ fm_directory_view_end_loading (FMDirectoryView *view)
 {
 	g_return_if_fail (FM_IS_DIRECTORY_VIEW (view));
 
-	gtk_signal_emit (GTK_OBJECT (view), signals[END_LOADING]);
+	g_signal_emit (G_OBJECT (view), signals[END_LOADING], 0);
 }
 
 /**
@@ -5708,7 +5708,7 @@ fm_directory_view_class_init (FMDirectoryViewClass *klass)
 		              G_SIGNAL_RUN_LAST,
 		              G_STRUCT_OFFSET (FMDirectoryViewClass, load_error),
 		              NULL, NULL,
-		              gtk_marshal_NONE__INT,
+		              gtk_marshal_VOID__INT,
 		              G_TYPE_NONE, 1, GTK_TYPE_INT);
 	signals[REMOVE_FILE] =
 		g_signal_new ("remove_file",
diff --git a/src/file-manager/fm-icon-view.c b/src/file-manager/fm-icon-view.c
index a52343958..eb0abe83d 100644
--- a/src/file-manager/fm-icon-view.c
+++ b/src/file-manager/fm-icon-view.c
@@ -1327,7 +1327,7 @@ fm_icon_view_merge_menus (FMDirectoryView *view)
 	icon_view = FM_ICON_VIEW (view);
 
 	icon_view->details->ui = bonobo_ui_component_new ("Icon View");
-	gtk_signal_connect (GTK_OBJECT (icon_view->details->ui),
+	g_signal_connect (G_OBJECT (icon_view->details->ui),
 			    "ui_event", G_CALLBACK (handle_ui_event), icon_view);
 	bonobo_ui_component_set_container (icon_view->details->ui,
 					   fm_directory_view_get_bonobo_ui_container (view),
@@ -2436,87 +2436,87 @@ create_icon_container (FMIconView *icon_view)
 
 	GTK_WIDGET_SET_FLAGS (icon_container, GTK_CAN_FOCUS);
 	
-	gtk_signal_connect (GTK_OBJECT (icon_container),
+	g_signal_connect (G_OBJECT (icon_container),
 			    "activate",
 			    G_CALLBACK (icon_container_activate_callback),
 			    icon_view);
-	gtk_signal_connect (GTK_OBJECT (icon_container),
+	g_signal_connect (G_OBJECT (icon_container),
 			    "band_select_started",
 			    G_CALLBACK (band_select_started_callback),
 			    icon_view);
-	gtk_signal_connect (GTK_OBJECT (icon_container),
+	g_signal_connect (G_OBJECT (icon_container),
 			    "band_select_ended",
 			    G_CALLBACK (band_select_ended_callback),
 			    icon_view);
-	gtk_signal_connect (GTK_OBJECT (icon_container),
+	g_signal_connect (G_OBJECT (icon_container),
 			    "compare_icons",
 			    G_CALLBACK (icon_container_compare_icons_callback),
 			    icon_view);
-	gtk_signal_connect (GTK_OBJECT (icon_container),
+	g_signal_connect (G_OBJECT (icon_container),
 			    "compare_icons_by_name",
 			    G_CALLBACK (icon_container_compare_icons_by_name_callback),
 			    icon_view);
-	gtk_signal_connect (GTK_OBJECT (icon_container),
+	g_signal_connect (G_OBJECT (icon_container),
 			    "context_click_selection",
 			    G_CALLBACK (icon_container_context_click_selection_callback),
 			    icon_view);
-	gtk_signal_connect (GTK_OBJECT (icon_container),
+	g_signal_connect (G_OBJECT (icon_container),
 			    "context_click_background",
 			    G_CALLBACK (icon_container_context_click_background_callback),
 			    icon_view);
-	gtk_signal_connect (GTK_OBJECT (icon_container),
+	g_signal_connect (G_OBJECT (icon_container),
 			    "icon_position_changed",
 			    G_CALLBACK (icon_position_changed_callback),
 			    icon_view);
-	gtk_signal_connect (GTK_OBJECT (icon_container),
+	g_signal_connect (G_OBJECT (icon_container),
 			    "icon_text_changed",
 			    G_CALLBACK (fm_icon_view_icon_text_changed_callback),
 			    icon_view);
-	gtk_signal_connect (GTK_OBJECT (icon_container),
+	g_signal_connect (G_OBJECT (icon_container),
 			    "selection_changed",
 			    G_CALLBACK (selection_changed_callback),
 			    icon_view);
-	gtk_signal_connect (GTK_OBJECT (icon_container),
+	g_signal_connect (G_OBJECT (icon_container),
 			    "get_icon_images",
 			    G_CALLBACK (get_icon_images_callback),
 			    icon_view);
-	gtk_signal_connect (GTK_OBJECT (icon_container),
+	g_signal_connect (G_OBJECT (icon_container),
 			    "get_icon_uri",
 			    G_CALLBACK (get_icon_uri_callback),
 			    icon_view);
-	gtk_signal_connect (GTK_OBJECT (icon_container),
+	g_signal_connect (G_OBJECT (icon_container),
 			    "get_icon_drop_target_uri",
 			    G_CALLBACK (get_icon_drop_target_uri_callback),
 			    icon_view);
-	gtk_signal_connect (GTK_OBJECT (icon_container),
+	g_signal_connect (G_OBJECT (icon_container),
 			    "get_icon_text",
 			    G_CALLBACK (get_icon_text_callback),
 			    icon_view);
-	gtk_signal_connect (GTK_OBJECT (icon_container),
+	g_signal_connect (G_OBJECT (icon_container),
 			    "move_copy_items",
 			    G_CALLBACK (icon_view_move_copy_items),
 			    directory_view);
-	gtk_signal_connect (GTK_OBJECT (icon_container),
+	g_signal_connect (G_OBJECT (icon_container),
 			    "get_container_uri",
 			    G_CALLBACK (icon_view_get_container_uri),
 			    directory_view);
-	gtk_signal_connect (GTK_OBJECT (icon_container),
+	g_signal_connect (G_OBJECT (icon_container),
 			    "can_accept_item",
 			    G_CALLBACK (icon_view_can_accept_item),
 			    directory_view);
-	gtk_signal_connect (GTK_OBJECT (icon_container),
+	g_signal_connect (G_OBJECT (icon_container),
 			    "get_stored_icon_position",
 			    G_CALLBACK (get_stored_icon_position_callback),
 			    directory_view);
-	gtk_signal_connect (GTK_OBJECT (icon_container),
+	g_signal_connect (G_OBJECT (icon_container),
 			    "layout_changed",
 			    G_CALLBACK (layout_changed_callback),
 			    directory_view);
-	gtk_signal_connect (GTK_OBJECT (icon_container),
+	g_signal_connect (G_OBJECT (icon_container),
 			    "preview",
 			    G_CALLBACK (icon_container_preview_callback),
 			    icon_view);
-	gtk_signal_connect (GTK_OBJECT (icon_container),
+	g_signal_connect (G_OBJECT (icon_container),
 			    "renaming_icon",
 			    G_CALLBACK (renaming_icon_callback),
 			    directory_view);
@@ -2801,7 +2801,7 @@ fm_icon_view_init (FMIconView *icon_view)
 						  G_OBJECT (icon_view));
 
 	icon_container = get_icon_container (icon_view);
-	gtk_signal_connect (GTK_OBJECT (icon_container),
+	g_signal_connect (G_OBJECT (icon_container),
 			    "handle_uri_list",
 			    G_CALLBACK (icon_view_handle_uri_list),
 			    icon_view);
diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c
index 321e13a79..f223e36ae 100644
--- a/src/file-manager/fm-list-view.c
+++ b/src/file-manager/fm-list-view.c
@@ -1146,63 +1146,63 @@ set_up_list (FMListView *list_view)
 
 	GTK_WIDGET_SET_FLAGS (list, GTK_CAN_FOCUS);
 
-	gtk_signal_connect (GTK_OBJECT (list),
+	g_signal_connect (G_OBJECT (list),
 			    "activate",
 			    G_CALLBACK (list_activate_callback),
 			    list_view);
-	gtk_signal_connect (GTK_OBJECT (list),
+	g_signal_connect (G_OBJECT (list),
 			    "selection_changed",
 			    G_CALLBACK (list_selection_changed_callback),
 			    list_view);
-	gtk_signal_connect (GTK_OBJECT (list),
+	g_signal_connect (G_OBJECT (list),
 			    "click_column",
 			    G_CALLBACK (column_clicked_callback),
 			    list_view);
-	gtk_signal_connect (GTK_OBJECT (list),
+	g_signal_connect (G_OBJECT (list),
 			    "context_click_selection",
 			    G_CALLBACK (context_click_selection_callback),
 			    list_view);
-	gtk_signal_connect (GTK_OBJECT (list),
+	g_signal_connect (G_OBJECT (list),
 			    "context_click_background",
 			    G_CALLBACK (context_click_background_callback),
 			    list_view);
-	gtk_signal_connect (GTK_OBJECT (list),
+	g_signal_connect (G_OBJECT (list),
 			    "select_matching_name",
 			    G_CALLBACK (select_matching_name_callback),
 			    list_view);
-	gtk_signal_connect (GTK_OBJECT (list),
+	g_signal_connect (G_OBJECT (list),
 			    "select_previous_name",
 			    G_CALLBACK (select_previous_name_callback),
 			    list_view);
-	gtk_signal_connect (GTK_OBJECT (list),
+	g_signal_connect (G_OBJECT (list),
 			    "select_next_name",
 			    G_CALLBACK (select_next_name_callback),
 			    list_view);
-	gtk_signal_connect (GTK_OBJECT (list),
+	g_signal_connect (G_OBJECT (list),
 			    "handle_dragged_items",
 			    G_CALLBACK (fm_list_handle_dragged_items),
 			    list_view);
-	gtk_signal_connect (GTK_OBJECT (list),
+	g_signal_connect (G_OBJECT (list),
 			    "handle_dropped_items",
 			    G_CALLBACK (fm_list_handle_dropped_items),
 			    list_view);
-	gtk_signal_connect (GTK_OBJECT (list),
+	g_signal_connect (G_OBJECT (list),
 			    "get_default_action",
 			    G_CALLBACK (fm_list_get_default_action),
 			    list_view);
-	gtk_signal_connect (GTK_OBJECT (list),
+	g_signal_connect (G_OBJECT (list),
 			    "drag_data_get",
 			    G_CALLBACK (fm_list_drag_data_get),
 			    list_view);
-	gtk_signal_connect (GTK_OBJECT (list),
+	g_signal_connect (G_OBJECT (list),
 			    "get_drag_pixbuf",
 			    G_CALLBACK (fm_list_get_drag_pixbuf),
 			    list_view);
-	gtk_signal_connect (GTK_OBJECT (list),
+	g_signal_connect (G_OBJECT (list),
 			    "get_sort_column_index",
 			    G_CALLBACK (fm_list_get_sort_column_index),
 			    list_view);
-	gtk_signal_connect (GTK_OBJECT (list),
+	g_signal_connect (G_OBJECT (list),
 			    "get_cell_text",
 			    G_CALLBACK (get_cell_text),
 			    list_view);	
@@ -1213,7 +1213,7 @@ set_up_list (FMListView *list_view)
 	 * the "realize" signal is slightly too early, so we connect to
 	 * "map".
 	 */
-	gtk_signal_connect (GTK_OBJECT (list_view),
+	g_signal_connect (G_OBJECT (list_view),
 			    "map",
 			    G_CALLBACK (fm_list_view_reset_row_height),
 			    NULL);
diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c
index c9cb036e2..3c0af5340 100644
--- a/src/file-manager/fm-properties-window.c
+++ b/src/file-manager/fm-properties-window.c
@@ -1591,11 +1591,11 @@ create_basic_page (FMPropertiesWindow *window)
 	nautilus_undo_editable_set_undo_key (GTK_EDITABLE (name_field), TRUE);
 #endif
 
-	gtk_signal_connect (GTK_OBJECT (name_field), "focus_out_event",
+	g_signal_connect (G_OBJECT (name_field), "focus_out_event",
       	              	    GTK_SIGNAL_FUNC (name_field_focus_out),
                             window);
                       			    
-	gtk_signal_connect (GTK_OBJECT (name_field), "activate",
+	g_signal_connect (G_OBJECT (name_field), "activate",
       	              	    G_CALLBACK (name_field_activate),
                             window);
 
@@ -1652,7 +1652,7 @@ create_basic_page (FMPropertiesWindow *window)
 		gtk_widget_show (temp_button);
 		gtk_box_pack_start (GTK_BOX(button_box), temp_button, FALSE, FALSE, 4);  
 
-	 	gtk_signal_connect (GTK_OBJECT (temp_button), "clicked", GTK_SIGNAL_FUNC (remove_image_button_callback), window);
+	 	g_signal_connect (G_OBJECT (temp_button), "clicked", GTK_SIGNAL_FUNC (remove_image_button_callback), window);
 
 		window->details->remove_image_button = temp_button;
 		
@@ -1704,7 +1704,7 @@ create_emblems_page (FMPropertiesWindow *window)
 	 * This must be done after the widget is realized, due to
 	 * an apparent bug in gtk_viewport_set_shadow_type.
 	 */
-	gtk_signal_connect (GTK_OBJECT (GTK_BIN (scroller)->child), 
+	g_signal_connect (G_OBJECT (GTK_BIN (scroller)->child), 
 			    "realize", 
 			    G_CALLBACK (remove_default_viewport_shadow),
 			    NULL);
@@ -1754,7 +1754,7 @@ create_emblems_page (FMPropertiesWindow *window)
 					  file,
 					  (GtkDestroyNotify) nautilus_file_unref);
 		
-		gtk_signal_connect (GTK_OBJECT (button),
+		g_signal_connect (G_OBJECT (button),
 				    "toggled",
 				    G_CALLBACK (property_button_toggled),
 				    NULL);
@@ -1877,7 +1877,7 @@ set_up_permissions_checkbox (GtkWidget *check_button,
 {
 	guint toggled_signal_id;
 
-	toggled_signal_id = gtk_signal_connect (GTK_OBJECT (check_button), "toggled",
+	toggled_signal_id = g_signal_connect (G_OBJECT (check_button), "toggled",
       	              	    			GTK_SIGNAL_FUNC (permissions_check_button_toggled),
                             			file);
 
@@ -2417,7 +2417,7 @@ fm_properties_window_present (NautilusFile *original_file, FMDirectoryView *dire
 	 */
 	
 	g_hash_table_insert (pending_files, target_file, target_file);
-	gtk_signal_connect (GTK_OBJECT (directory_view),
+	g_signal_connect (G_OBJECT (directory_view),
 			    "destroy",
 			    G_CALLBACK (directory_view_destroyed_callback),
 			    startup_data);
diff --git a/src/file-manager/fm-search-list-view.c b/src/file-manager/fm-search-list-view.c
index ebd6b7c6a..e5590ca8c 100644
--- a/src/file-manager/fm-search-list-view.c
+++ b/src/file-manager/fm-search-list-view.c
@@ -387,7 +387,7 @@ fm_search_list_view_init (gpointer object,
 
 	nautilus_view = fm_directory_view_get_nautilus_view (directory_view);
 
-	gtk_signal_connect (GTK_OBJECT (nautilus_view),
+	g_signal_connect (G_OBJECT (nautilus_view),
 			    "load_location",
 			    GTK_SIGNAL_FUNC (load_location_callback),
 			    NULL);
diff --git a/src/file-manager/nautilus-indexing-info.c b/src/file-manager/nautilus-indexing-info.c
index 15acde983..a884fe28e 100644
--- a/src/file-manager/nautilus-indexing-info.c
+++ b/src/file-manager/nautilus-indexing-info.c
@@ -230,7 +230,7 @@ index_progress_dialog_new (void)
                                            NULL,
                                            progress_data,
                                            g_free);
-        gtk_signal_connect (GTK_OBJECT (progress_bar_hbox),
+        g_signal_connect (G_OBJECT (progress_bar_hbox),
                             "destroy",
                             timeout_remove_callback,
                             GUINT_TO_POINTER (timeout_id));
diff --git a/src/nautilus-about.c b/src/nautilus-about.c
index af42ba878..6c20a676a 100644
--- a/src/nautilus-about.c
+++ b/src/nautilus-about.c
@@ -159,7 +159,7 @@ nautilus_about_init (NautilusAbout *about)
 			      area_width, area_height);
 	gtk_widget_set_events (about->details->drawing_area, GDK_EXPOSURE_MASK);
 
-	gtk_signal_connect (GTK_OBJECT (about->details->drawing_area), "expose_event",
+	g_signal_connect (G_OBJECT (about->details->drawing_area), "expose_event",
 			    G_CALLBACK (nautilus_about_repaint), about);
 
 	gtk_widget_show (about->details->drawing_area);
diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index 26dcaff69..f51c78aca 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -109,17 +109,17 @@ create_object (PortableServer_Servant servant,
 	NautilusApplication *application;
 
 	if (strcmp (iid, NAUTILUS_ICON_VIEW_IID) == 0) {
-		directory_view = FM_DIRECTORY_VIEW (gtk_object_new (fm_icon_view_get_type (), NULL));
+		directory_view = FM_DIRECTORY_VIEW (g_object_new (fm_icon_view_get_type (), NULL));
 		object = BONOBO_OBJECT (fm_directory_view_get_nautilus_view (directory_view));
 	} else if (strcmp (iid, NAUTILUS_DESKTOP_ICON_VIEW_IID) == 0) {
-		directory_view = FM_DIRECTORY_VIEW (gtk_object_new (fm_desktop_icon_view_get_type (), NULL));
+		directory_view = FM_DIRECTORY_VIEW (g_object_new (fm_desktop_icon_view_get_type (), NULL));
 		object = BONOBO_OBJECT (fm_directory_view_get_nautilus_view (directory_view));
 #if GNOME2_CONVERSION_COMPLETE
 	} else if (strcmp (iid, NAUTILUS_LIST_VIEW_IID) == 0) {
-		directory_view = FM_DIRECTORY_VIEW (gtk_object_new (fm_list_view_get_type (), NULL));
+		directory_view = FM_DIRECTORY_VIEW (g_object_new (fm_list_view_get_type (), NULL));
 		object = BONOBO_OBJECT (fm_directory_view_get_nautilus_view (directory_view));
 	} else if (strcmp (iid, SEARCH_LIST_VIEW_IID) == 0) {
-		directory_view = FM_DIRECTORY_VIEW (gtk_object_new (fm_search_list_view_get_type (), NULL));
+		directory_view = FM_DIRECTORY_VIEW (g_object_new (fm_search_list_view_get_type (), NULL));
 		object = BONOBO_OBJECT (fm_directory_view_get_nautilus_view (directory_view));
 #endif
 	} else if (strcmp (iid, SHELL_IID) == 0) {
@@ -147,13 +147,13 @@ nautilus_application_init (NautilusApplication *application)
 	application->undo_manager = nautilus_undo_manager_new ();
 
 	/* Watch for volume mounts so we can restore open windows */
-	gtk_signal_connect (GTK_OBJECT (nautilus_volume_monitor_get ()),
+	g_signal_connect (G_OBJECT (nautilus_volume_monitor_get ()),
 			    "volume_mounted",
 			    G_CALLBACK (volume_mounted_callback),
 			    application);
 
 	/* Watch for volume unmounts so we can close open windows */
-	gtk_signal_connect (GTK_OBJECT (nautilus_volume_monitor_get ()),
+	g_signal_connect (G_OBJECT (nautilus_volume_monitor_get ()),
 			    "volume_unmounted",
 			    G_CALLBACK (volume_unmounted_callback),
 			    application);
@@ -672,11 +672,11 @@ nautilus_application_create_window (NautilusApplication *application)
 						  "app", G_OBJECT (application),
 						  "app_id", "nautilus", NULL));
 	
-	gtk_signal_connect (GTK_OBJECT (window), 
+	g_signal_connect (G_OBJECT (window), 
 			    "delete_event", G_CALLBACK (nautilus_window_delete_event_callback),
                     	    NULL);
 
-	gtk_signal_connect (GTK_OBJECT (window),
+	g_signal_connect (G_OBJECT (window),
 			    "destroy", G_CALLBACK (nautilus_application_destroyed_window),
 			    application);
 
@@ -937,11 +937,11 @@ init_session (void)
 
 	client = gnome_master_client ();
 
-	gtk_signal_connect (GTK_OBJECT (client), "save_yourself",
+	g_signal_connect (G_OBJECT (client), "save_yourself",
 			    (GtkSignalFunc) save_session,
 			    NULL);
 	
-	gtk_signal_connect (GTK_OBJECT (client), "die",
+	g_signal_connect (G_OBJECT (client), "die",
 			    (GtkSignalFunc) removed_from_session,
 			    NULL);
 	
diff --git a/src/nautilus-bookmark-list.c b/src/nautilus-bookmark-list.c
index 33f65b1c9..ee76dd9cf 100644
--- a/src/nautilus-bookmark-list.c
+++ b/src/nautilus-bookmark-list.c
@@ -82,7 +82,7 @@ nautilus_bookmark_list_class_init (NautilusBookmarkListClass *class)
 		              G_STRUCT_OFFSET (NautilusBookmarkListClass, 
 						   contents_changed),
 		              NULL, NULL,
-		              gtk_marshal_NONE__NONE,
+		              gtk_marshal_VOID__VOID,
 		              G_TYPE_NONE, 0);
 }
 
@@ -192,12 +192,12 @@ insert_bookmark_internal (NautilusBookmarkList *bookmarks,
 					 bookmark, 
 					 index);
 
-	gtk_signal_connect (GTK_OBJECT (bookmark),
+	g_signal_connect (G_OBJECT (bookmark),
 			    "appearance_changed",
 			    G_CALLBACK (bookmark_in_list_changed_callback),
 			    bookmarks);				 
 
-	gtk_signal_connect (GTK_OBJECT (bookmark),
+	g_signal_connect (G_OBJECT (bookmark),
 			    "contents_changed",
 			    G_CALLBACK (bookmark_in_list_changed_callback),
 			    bookmarks);				 
@@ -258,8 +258,8 @@ nautilus_bookmark_list_contents_changed (NautilusBookmarkList *bookmarks)
 	g_return_if_fail (NAUTILUS_IS_BOOKMARK_LIST (bookmarks));
 
 	nautilus_bookmark_list_save_file (bookmarks);
-	gtk_signal_emit (GTK_OBJECT (bookmarks), 
-			 signals[CONTENTS_CHANGED]);
+	g_signal_emit (G_OBJECT (bookmarks), 
+			 signals[CONTENTS_CHANGED], 0);
 }
 
 
@@ -468,7 +468,7 @@ nautilus_bookmark_list_new (void)
 {
 	NautilusBookmarkList *list;
 
-	list = NAUTILUS_BOOKMARK_LIST (gtk_object_new (NAUTILUS_TYPE_BOOKMARK_LIST, NULL));
+	list = NAUTILUS_BOOKMARK_LIST (g_object_new (NAUTILUS_TYPE_BOOKMARK_LIST, NULL));
 	gtk_object_ref (GTK_OBJECT (list));
 	gtk_object_sink (GTK_OBJECT (list));
 
diff --git a/src/nautilus-bookmarks-window.c b/src/nautilus-bookmarks-window.c
index 7212cb569..52bf4f9a3 100644
--- a/src/nautilus-bookmarks-window.c
+++ b/src/nautilus-bookmarks-window.c
@@ -206,45 +206,45 @@ create_bookmarks_window (NautilusBookmarkList *list, GtkObject *undo_manager_sou
 			    G_CALLBACK(on_select_row),
 			    NULL);
 
-	gtk_signal_connect (GTK_OBJECT (window), "delete_event",
+	g_signal_connect (G_OBJECT (window), "delete_event",
                     	    G_CALLBACK (on_window_delete_event),
                     	    NULL);
                     	    
-	gtk_signal_connect (GTK_OBJECT (window), "hide",
+	g_signal_connect (G_OBJECT (window), "hide",
                     	    G_CALLBACK (on_window_hide_event),
                     	    NULL);
                     	    
-	gtk_signal_connect (GTK_OBJECT (window), "destroy",
+	g_signal_connect (G_OBJECT (window), "destroy",
                     	    G_CALLBACK (on_window_destroy_event),
                     	    NULL);
                     	    
 	name_field_changed_signalID =
-		gtk_signal_connect (GTK_OBJECT (name_field), "changed",
+		g_signal_connect (G_OBJECT (name_field), "changed",
                 	            G_CALLBACK (on_name_field_changed),
                       		    NULL);
                       		    
-	gtk_signal_connect (GTK_OBJECT (name_field), "focus_out_event",
+	g_signal_connect (G_OBJECT (name_field), "focus_out_event",
       	              	    G_CALLBACK (on_text_field_focus_out_event),
                             NULL);
                             
-	gtk_signal_connect (GTK_OBJECT (name_field), "activate",
+	g_signal_connect (G_OBJECT (name_field), "activate",
       	              	    G_CALLBACK (name_or_uri_field_activate),
                             NULL);
 
 	uri_field_changed_signalID = 
-		gtk_signal_connect (GTK_OBJECT (uri_field), "changed",
+		g_signal_connect (G_OBJECT (uri_field), "changed",
                 	    	    G_CALLBACK (on_uri_field_changed),
                       		    NULL);
                       		    
-	gtk_signal_connect (GTK_OBJECT (uri_field), "focus_out_event",
+	g_signal_connect (G_OBJECT (uri_field), "focus_out_event",
         	            G_CALLBACK (on_text_field_focus_out_event),
               	    	    NULL);
               	    	    
-	gtk_signal_connect (GTK_OBJECT (uri_field), "activate",
+	g_signal_connect (G_OBJECT (uri_field), "activate",
       	              	    G_CALLBACK (name_or_uri_field_activate),
                             NULL);
 
-	gtk_signal_connect (GTK_OBJECT (remove_button), "clicked",
+	g_signal_connect (G_OBJECT (remove_button), "clicked",
         	            G_CALLBACK (on_remove_button_clicked),
                       	    NULL);
 
@@ -666,7 +666,7 @@ set_up_close_accelerator (GtkWidget *window)
 	 * here because we have to handle saving geometry before hiding the
 	 * window.
 	 */
-	gtk_signal_connect (GTK_OBJECT (window),
+	g_signal_connect (G_OBJECT (window),
 			    "key_press_event",
 			    G_CALLBACK (handle_close_accelerator),
 			    NULL);
diff --git a/src/nautilus-complex-search-bar.c b/src/nautilus-complex-search-bar.c
index c3be6ee6a..81b6c5a5a 100644
--- a/src/nautilus-complex-search-bar.c
+++ b/src/nautilus-complex-search-bar.c
@@ -113,7 +113,7 @@ search_bar_criterion_type_changed_callback (GtkObject *old_criterion_object,
 							 "type"));
 	new_criterion = nautilus_search_bar_criterion_new_with_type (new_type, 
 								     bar);
-	gtk_signal_connect (GTK_OBJECT (new_criterion),
+	g_signal_connect (G_OBJECT (new_criterion),
 			    "criterion_type_changed",
 			    G_CALLBACK (search_bar_criterion_type_changed_callback),
 			    bar);
@@ -204,7 +204,7 @@ nautilus_complex_search_bar_init (NautilusComplexSearchBar *bar)
 
 	file_name_criterion = nautilus_search_bar_criterion_first_new (bar);
 
-	gtk_signal_connect (GTK_OBJECT (file_name_criterion),
+	g_signal_connect (G_OBJECT (file_name_criterion),
 			    "criterion_type_changed",
 			    G_CALLBACK (search_bar_criterion_type_changed_callback),
 			    bar);
@@ -223,13 +223,13 @@ nautilus_complex_search_bar_init (NautilusComplexSearchBar *bar)
 
 	hbox = gtk_hwrap_box_new (FALSE);
 
-	gtk_signal_connect (GTK_OBJECT (hbox),
+	g_signal_connect (G_OBJECT (hbox),
 			    "need_reallocation",
 			    G_CALLBACK (queue_search_bar_resize_callback),
 			    bar);
 
 	bar->details->more_options = gtk_button_new_with_label (_("More Options"));
-	gtk_signal_connect (GTK_OBJECT (bar->details->more_options), "clicked",
+	g_signal_connect (G_OBJECT (bar->details->more_options), "clicked",
 			    G_CALLBACK (more_options_callback), bar);
 				
 				
@@ -239,7 +239,7 @@ nautilus_complex_search_bar_init (NautilusComplexSearchBar *bar)
 	gtk_widget_show (bar->details->more_options);
 
 	bar->details->fewer_options = gtk_button_new_with_label (_("Fewer Options"));
-	gtk_signal_connect (GTK_OBJECT (bar->details->fewer_options), "clicked",
+	g_signal_connect (G_OBJECT (bar->details->fewer_options), "clicked",
 			    G_CALLBACK (fewer_options_callback), bar);
 
 	gtk_wrap_box_pack (GTK_WRAP_BOX (hbox),
@@ -528,7 +528,7 @@ more_options_callback (GtkObject *object,
 	last_criterion = (NautilusSearchBarCriterion *)((g_slist_last (list))->data);
 	criterion = nautilus_search_bar_criterion_next_new (last_criterion->details->type,
 							    bar);
-	gtk_signal_connect (GTK_OBJECT (criterion),
+	g_signal_connect (G_OBJECT (criterion),
 			    "criterion_type_changed",
 			    G_CALLBACK (search_bar_criterion_type_changed_callback),
 			    bar);
diff --git a/src/nautilus-component-adapter-factory.c b/src/nautilus-component-adapter-factory.c
index 7c13a0728..6c25f3177 100644
--- a/src/nautilus-component-adapter-factory.c
+++ b/src/nautilus-component-adapter-factory.c
@@ -158,7 +158,7 @@ nautilus_component_adapter_factory_get (void)
 
 	if (global_component_adapter_factory == NULL) {
 		factory = NAUTILUS_COMPONENT_ADAPTER_FACTORY
-			(gtk_object_new (NAUTILUS_TYPE_COMPONENT_ADAPTER_FACTORY, NULL));
+			(g_object_new (NAUTILUS_TYPE_COMPONENT_ADAPTER_FACTORY, NULL));
 		
 		gtk_object_ref (GTK_OBJECT (factory));
 		gtk_object_sink (GTK_OBJECT (factory));
diff --git a/src/nautilus-desktop-window.c b/src/nautilus-desktop-window.c
index 4aa47a458..b9ca47cac 100644
--- a/src/nautilus-desktop-window.c
+++ b/src/nautilus-desktop-window.c
@@ -134,8 +134,8 @@ nautilus_desktop_window_new (NautilusApplication *application)
 	/* Special sawmill setting*/
 	gtk_window_set_wmclass (GTK_WINDOW (window), "desktop_window", "Nautilus");
 
-	gtk_signal_connect (GTK_OBJECT (window), "realize", GTK_SIGNAL_FUNC (nautilus_desktop_window_realized), NULL);
-	gtk_signal_connect (GTK_OBJECT (window), "delete_event", GTK_SIGNAL_FUNC (nautilus_desktop_window_delete_event), NULL);
+	g_signal_connect (G_OBJECT (window), "realize", GTK_SIGNAL_FUNC (nautilus_desktop_window_realized), NULL);
+	g_signal_connect (G_OBJECT (window), "delete_event", GTK_SIGNAL_FUNC (nautilus_desktop_window_delete_event), NULL);
 
 	/* Point window at the desktop folder.
 	 * Note that nautilus_desktop_window_init is too early to do this.
diff --git a/src/nautilus-information-panel.c b/src/nautilus-information-panel.c
index 2ca5550e5..9c03f2ec1 100644
--- a/src/nautilus-information-panel.c
+++ b/src/nautilus-information-panel.c
@@ -546,7 +546,7 @@ nautilus_sidebar_create_context_menu (NautilusSidebar *sidebar)
  	gtk_widget_show (menu_item);
 	gtk_menu_append (GTK_MENU(menu), menu_item);
         gtk_widget_set_sensitive (menu_item, has_background);
-	gtk_signal_connect (GTK_OBJECT (menu_item), "activate",
+	g_signal_connect (G_OBJECT (menu_item), "activate",
 			    G_CALLBACK (reset_background_callback), sidebar);
 
 	/* add a separator */
@@ -710,8 +710,8 @@ receive_dropped_uri_list (NautilusSidebar *sidebar,
 				(eel_get_widget_background (GTK_WIDGET (sidebar)),
 				 uris[0]);
 		} else if (exactly_one) {
-			gtk_signal_emit (GTK_OBJECT (sidebar),
-					 signals[LOCATION_CHANGED],
+			g_signal_emit (G_OBJECT (sidebar),
+					 signals[LOCATION_CHANGED], 0,
 			 		 uris[0]);	
 		}
 		break;
@@ -916,7 +916,7 @@ nautilus_sidebar_add_panel (NautilusSidebar *sidebar, NautilusViewFrame *panel)
 
 	gtk_widget_show (label);
 	
-	gtk_signal_connect (GTK_OBJECT (panel), "view_loaded",
+	g_signal_connect (G_OBJECT (panel), "view_loaded",
 			    G_CALLBACK (view_loaded_callback), sidebar);
 	
 	gtk_notebook_append_page (GTK_NOTEBOOK (sidebar->details->notebook),
@@ -1386,7 +1386,7 @@ add_command_buttons (NautilusSidebar *sidebar, GList *application_list)
 
 	/* Catch-all button after all the others. */
 	temp_button = gtk_button_new_with_label (_("Open with..."));
-	gtk_signal_connect (GTK_OBJECT (temp_button), "clicked",
+	g_signal_connect (G_OBJECT (temp_button), "clicked",
 			    G_CALLBACK (open_with_callback), NULL);
 	gtk_object_set_user_data (GTK_OBJECT (temp_button), sidebar);
 	gtk_widget_show (temp_button);
@@ -1502,7 +1502,7 @@ nautilus_sidebar_update_buttons (NautilusSidebar *sidebar)
 		gtk_widget_show (temp_button);
 		sidebar->details->has_buttons = TRUE;
 					
-		gtk_signal_connect (GTK_OBJECT (temp_button), "clicked",
+		g_signal_connect (G_OBJECT (temp_button), "clicked",
 			GTK_SIGNAL_FUNC (empty_trash_callback), NULL);
 		
 		gtk_signal_connect_while_alive (GTK_OBJECT (nautilus_trash_monitor_get ()),
@@ -1547,11 +1547,11 @@ nautilus_sidebar_update_appearance (NautilusSidebar *sidebar)
 	background = eel_get_widget_background (GTK_WIDGET (sidebar));
 	if (!sidebar->details->background_connected) {
 		sidebar->details->background_connected = TRUE;
-		gtk_signal_connect (GTK_OBJECT (background),
+		g_signal_connect (G_OBJECT (background),
 				    "settings_changed",
 				    G_CALLBACK (background_settings_changed_callback),
 				    sidebar);
-		gtk_signal_connect (GTK_OBJECT (background),
+		g_signal_connect (G_OBJECT (background),
 				    "reset",
 				    G_CALLBACK (background_reset_callback),
 				    sidebar);
diff --git a/src/nautilus-link-set-window.c b/src/nautilus-link-set-window.c
index 8f5b1970e..6744d9fba 100644
--- a/src/nautilus-link-set-window.c
+++ b/src/nautilus-link-set-window.c
@@ -109,7 +109,7 @@ make_link_set_check_box(const char *directory_path, GtkWidget *checkbox_table,
 				  g_strdup(name),
 				  g_free);
 		
-	gtk_signal_connect (GTK_OBJECT (checkbox),
+	g_signal_connect (G_OBJECT (checkbox),
 			    "toggled",
 			    G_CALLBACK (link_set_check_box_toggled),
 			    window);
@@ -259,7 +259,7 @@ nautilus_link_set_toggle_configure_window (const char *directory_path, GtkWindow
 		link_set_window = nautilus_link_set_configure_window (directory_path, 
 								      window_to_update);
 		
-		gtk_signal_connect (GTK_OBJECT (link_set_window), "delete_event",
+		g_signal_connect (G_OBJECT (link_set_window), "delete_event",
 				    GTK_SIGNAL_FUNC (delete_window_callback), NULL);
 	}
 									
diff --git a/src/nautilus-location-bar.c b/src/nautilus-location-bar.c
index 790c080e4..121fc0d9a 100644
--- a/src/nautilus-location-bar.c
+++ b/src/nautilus-location-bar.c
@@ -243,6 +243,8 @@ style_set_handler (GtkWidget *widget, GtkStyle *previous_style)
 #endif
 }
 
+#if GNOME2_CONVERSION_COMPLETE
+
 /* utility routine to determine the string to expand to.  If we don't have anything yet, accept
    the whole string, otherwise accept the largest part common to both */
 
@@ -566,6 +568,7 @@ editable_key_press_callback (GtkObject *object,
 
 	nautilus_location_bar_update_label (bar);
 }
+#endif
 
 static void
 real_activate (NautilusNavigationBar *navigation_bar)
@@ -641,7 +644,7 @@ nautilus_location_bar_init (NautilusLocationBar *bar)
 	gtk_container_add   (GTK_CONTAINER (event_box), label);
 	gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_RIGHT);
 	gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5);
-	gtk_signal_connect (GTK_OBJECT (label), "style_set", 
+	g_signal_connect (G_OBJECT (label), "style_set", 
 			    G_CALLBACK (style_set_handler), NULL);
 
 	gtk_box_pack_start  (GTK_BOX (hbox), event_box, FALSE, TRUE,
@@ -655,6 +658,7 @@ nautilus_location_bar_init (NautilusLocationBar *bar)
 				   G_CALLBACK (nautilus_navigation_bar_location_changed),
 				   GTK_OBJECT (bar));
 
+#if GNOME2_CONVERSION_COMPLETE
 	/* The callback uses the marshal interface directly
 	 * so it can both read and write the return value.
 	 */
@@ -662,6 +666,7 @@ nautilus_location_bar_init (NautilusLocationBar *bar)
 				 NULL, editable_key_press_callback,
 				 bar, NULL,
 				 FALSE, TRUE);
+#endif
 	
 	gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
 
@@ -682,7 +687,7 @@ nautilus_location_bar_init (NautilusLocationBar *bar)
 			    GTK_DEST_DEFAULT_ALL,
 			    drop_types, G_N_ELEMENTS (drop_types),
 			    GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK);
-	gtk_signal_connect (GTK_OBJECT (bar), "drag_data_received",
+	g_signal_connect (G_OBJECT (bar), "drag_data_received",
 			    GTK_SIGNAL_FUNC (drag_data_received_callback),
 			    NULL);
 
diff --git a/src/nautilus-navigation-bar.c b/src/nautilus-navigation-bar.c
index 7d9ff1d90..1d033a6aa 100644
--- a/src/nautilus-navigation-bar.c
+++ b/src/nautilus-navigation-bar.c
@@ -62,7 +62,7 @@ nautilus_navigation_bar_class_init (NautilusNavigationBarClass *klass)
 		 G_STRUCT_OFFSET (NautilusNavigationBarClass,
 				    activate),
 		 NULL, NULL,
-		 gtk_marshal_NONE__NONE,
+		 gtk_marshal_VOID__VOID,
 		 G_TYPE_NONE, 0);
 
 	signals[LOCATION_CHANGED] = g_signal_new
@@ -98,7 +98,7 @@ nautilus_navigation_bar_activate (NautilusNavigationBar *bar)
 {
 	g_return_if_fail (NAUTILUS_IS_NAVIGATION_BAR (bar));
 
-	gtk_signal_emit (GTK_OBJECT (bar), signals[ACTIVATE]);
+	g_signal_emit (G_OBJECT (bar), signals[ACTIVATE], 0);
 }
 
 /**
@@ -145,8 +145,8 @@ nautilus_navigation_bar_location_changed (NautilusNavigationBar *bar)
 	g_return_if_fail (NAUTILUS_IS_NAVIGATION_BAR (bar));
 
 	location = nautilus_navigation_bar_get_location (bar);
-	gtk_signal_emit (GTK_OBJECT (bar),
-			 signals[LOCATION_CHANGED],
+	g_signal_emit (G_OBJECT (bar),
+			 signals[LOCATION_CHANGED], 0,
 			 location);
 	g_free (location);
 }
diff --git a/src/nautilus-navigation-window-menus.c b/src/nautilus-navigation-window-menus.c
index 5775910f1..5b1cda7dc 100644
--- a/src/nautilus-navigation-window-menus.c
+++ b/src/nautilus-navigation-window-menus.c
@@ -1328,10 +1328,8 @@ nautilus_window_initialize_menus_part_1 (NautilusWindow *window)
 	user_level_changed_callback (window);
 
 	/* Register to catch Bonobo UI events so we can notice View As changes */
-	gtk_signal_connect (GTK_OBJECT (window->details->shell_ui),
-			    "ui_event", 
-			    G_CALLBACK (nautilus_window_handle_ui_event_callback), 
-			    window);
+	g_signal_connect (G_OBJECT (window->details->shell_ui), "ui_event", 
+			  G_CALLBACK (nautilus_window_handle_ui_event_callback), window);
 
 	bonobo_ui_component_thaw (window->details->shell_ui, NULL);
 	
diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c
index 3fc14b51f..e62322c92 100644
--- a/src/nautilus-navigation-window.c
+++ b/src/nautilus-navigation-window.c
@@ -166,11 +166,11 @@ nautilus_window_class_init (NautilusWindowClass *klass)
 	widget_class->unrealize = nautilus_window_unrealize;
 	
 	gtk_object_add_arg_type ("NautilusWindow::app_id",
-				 GTK_TYPE_STRING,
+				 G_TYPE_STRING,
 				 GTK_ARG_READWRITE | GTK_ARG_CONSTRUCT,
 				 ARG_APP_ID);
 	gtk_object_add_arg_type ("NautilusWindow::app",
-				 GTK_TYPE_OBJECT,
+				 G_TYPE_OBJECT,
 				 GTK_ARG_READWRITE | GTK_ARG_CONSTRUCT,
 				 ARG_APP);
 	
@@ -633,10 +633,10 @@ nautilus_window_constructed (NautilusWindow *window)
 	window->navigation_bar = nautilus_switchable_navigation_bar_new (window);
 	gtk_widget_show (GTK_WIDGET (window->navigation_bar));
 
-	gtk_signal_connect (GTK_OBJECT (window->navigation_bar), "location_changed",
+	g_signal_connect (G_OBJECT (window->navigation_bar), "location_changed",
 			    G_CALLBACK (navigation_bar_location_changed_callback), window);
 
-	gtk_signal_connect (GTK_OBJECT (window->navigation_bar), "mode_changed",
+	g_signal_connect (G_OBJECT (window->navigation_bar), "mode_changed",
 			    G_CALLBACK (navigation_bar_mode_changed_callback), window);
 
 	gtk_box_pack_start (GTK_BOX (location_bar_box), window->navigation_bar,
@@ -701,7 +701,7 @@ nautilus_window_constructed (NautilusWindow *window)
 		/* set up the sidebar */
 		window->sidebar = nautilus_sidebar_new ();
 		gtk_widget_show (GTK_WIDGET (window->sidebar));
-		gtk_signal_connect (GTK_OBJECT (window->sidebar), "location_changed",
+		g_signal_connect (G_OBJECT (window->sidebar), "location_changed",
 				    G_CALLBACK (go_to_callback), window);
 		e_paned_pack1 (E_PANED (window->content_hbox),
 			       GTK_WIDGET (window->sidebar),
@@ -1144,7 +1144,7 @@ create_view_as_menu_item (NautilusWindow *window,
 	menu_item = gtk_menu_item_new_with_label (menu_label);
 	g_free (menu_label);
 
-	gtk_signal_connect (GTK_OBJECT (menu_item),
+	g_signal_connect (G_OBJECT (menu_item),
 			    "activate",
 			    G_CALLBACK (view_as_menu_switch_views_callback),
 			    window);
@@ -1481,7 +1481,7 @@ load_view_as_menus_callback (NautilusFile *file,
 
 	/* Add "View as..." extra bonus choice. */
        	menu_item = gtk_menu_item_new_with_label (_("View as..."));
-        gtk_signal_connect (GTK_OBJECT (menu_item),
+        g_signal_connect (G_OBJECT (menu_item),
         		    "activate",
         		    G_CALLBACK (view_as_menu_choose_view_callback),
         		    window);
@@ -1735,7 +1735,7 @@ nautilus_window_allow_stop (NautilusWindow *window, gboolean allow)
 void
 nautilus_send_history_list_changed (void)
 {
-	gtk_signal_emit_by_name (nautilus_signaller_get_current (),
+	g_signal_emit_by_name (nautilus_signaller_get_current (),
 			 	 "history_list_changed");
 }
 
diff --git a/src/nautilus-object-window.c b/src/nautilus-object-window.c
index 3fc14b51f..e62322c92 100644
--- a/src/nautilus-object-window.c
+++ b/src/nautilus-object-window.c
@@ -166,11 +166,11 @@ nautilus_window_class_init (NautilusWindowClass *klass)
 	widget_class->unrealize = nautilus_window_unrealize;
 	
 	gtk_object_add_arg_type ("NautilusWindow::app_id",
-				 GTK_TYPE_STRING,
+				 G_TYPE_STRING,
 				 GTK_ARG_READWRITE | GTK_ARG_CONSTRUCT,
 				 ARG_APP_ID);
 	gtk_object_add_arg_type ("NautilusWindow::app",
-				 GTK_TYPE_OBJECT,
+				 G_TYPE_OBJECT,
 				 GTK_ARG_READWRITE | GTK_ARG_CONSTRUCT,
 				 ARG_APP);
 	
@@ -633,10 +633,10 @@ nautilus_window_constructed (NautilusWindow *window)
 	window->navigation_bar = nautilus_switchable_navigation_bar_new (window);
 	gtk_widget_show (GTK_WIDGET (window->navigation_bar));
 
-	gtk_signal_connect (GTK_OBJECT (window->navigation_bar), "location_changed",
+	g_signal_connect (G_OBJECT (window->navigation_bar), "location_changed",
 			    G_CALLBACK (navigation_bar_location_changed_callback), window);
 
-	gtk_signal_connect (GTK_OBJECT (window->navigation_bar), "mode_changed",
+	g_signal_connect (G_OBJECT (window->navigation_bar), "mode_changed",
 			    G_CALLBACK (navigation_bar_mode_changed_callback), window);
 
 	gtk_box_pack_start (GTK_BOX (location_bar_box), window->navigation_bar,
@@ -701,7 +701,7 @@ nautilus_window_constructed (NautilusWindow *window)
 		/* set up the sidebar */
 		window->sidebar = nautilus_sidebar_new ();
 		gtk_widget_show (GTK_WIDGET (window->sidebar));
-		gtk_signal_connect (GTK_OBJECT (window->sidebar), "location_changed",
+		g_signal_connect (G_OBJECT (window->sidebar), "location_changed",
 				    G_CALLBACK (go_to_callback), window);
 		e_paned_pack1 (E_PANED (window->content_hbox),
 			       GTK_WIDGET (window->sidebar),
@@ -1144,7 +1144,7 @@ create_view_as_menu_item (NautilusWindow *window,
 	menu_item = gtk_menu_item_new_with_label (menu_label);
 	g_free (menu_label);
 
-	gtk_signal_connect (GTK_OBJECT (menu_item),
+	g_signal_connect (G_OBJECT (menu_item),
 			    "activate",
 			    G_CALLBACK (view_as_menu_switch_views_callback),
 			    window);
@@ -1481,7 +1481,7 @@ load_view_as_menus_callback (NautilusFile *file,
 
 	/* Add "View as..." extra bonus choice. */
        	menu_item = gtk_menu_item_new_with_label (_("View as..."));
-        gtk_signal_connect (GTK_OBJECT (menu_item),
+        g_signal_connect (G_OBJECT (menu_item),
         		    "activate",
         		    G_CALLBACK (view_as_menu_choose_view_callback),
         		    window);
@@ -1735,7 +1735,7 @@ nautilus_window_allow_stop (NautilusWindow *window, gboolean allow)
 void
 nautilus_send_history_list_changed (void)
 {
-	gtk_signal_emit_by_name (nautilus_signaller_get_current (),
+	g_signal_emit_by_name (nautilus_signaller_get_current (),
 			 	 "history_list_changed");
 }
 
diff --git a/src/nautilus-preferences-dialog.c b/src/nautilus-preferences-dialog.c
index db014dc56..828199b47 100644
--- a/src/nautilus-preferences-dialog.c
+++ b/src/nautilus-preferences-dialog.c
@@ -448,12 +448,12 @@ preferences_dialog_create (void)
 
 	gtk_window_set_wmclass (GTK_WINDOW (dialog), "nautilus_preferences", "Nautilus");
 
-	gtk_signal_connect (GTK_OBJECT (dialog),
+	g_signal_connect (G_OBJECT (dialog),
 			    "response",
 			    GTK_SIGNAL_FUNC (dialog_button_response_callback),
 			    dialog);
 
-	gtk_signal_connect (GTK_OBJECT (dialog),
+	g_signal_connect (G_OBJECT (dialog),
 			    "close",
 			    GTK_SIGNAL_FUNC (dialog_close_callback),
 			    NULL);
@@ -554,7 +554,7 @@ preferences_dialog_populate_themes_group (EelPreferencesGroup *group)
 						      "theme_changed",
 						      0);
 	/* Keep track of theme chooser changes */
-	gtk_signal_connect (GTK_OBJECT (child),
+	g_signal_connect (G_OBJECT (child),
 			    "theme_changed",
 			    GTK_SIGNAL_FUNC (theme_changed_callback),
 			    NULL);
@@ -562,7 +562,7 @@ preferences_dialog_populate_themes_group (EelPreferencesGroup *group)
 	/* Have the custom preferences item tell us when its time to update the displayed
 	 * with with the one stored in preferences
 	 */
-	gtk_signal_connect (GTK_OBJECT (item),
+	g_signal_connect (G_OBJECT (item),
 			    "custom_update_displayed_value",
 			    GTK_SIGNAL_FUNC (update_theme_selector_displayed_value_callback),
 			    child);
diff --git a/src/nautilus-profiler.c b/src/nautilus-profiler.c
index 51d82fa49..0b668f6af 100644
--- a/src/nautilus-profiler.c
+++ b/src/nautilus-profiler.c
@@ -182,7 +182,7 @@ dump_dialog_new (const char *title)
 	dump_dialog->window = gtk_window_new (GTK_WINDOW_DIALOG);
 	eel_gtk_window_set_up_close_accelerator 
 		(GTK_WINDOW (dump_dialog->window));
-	gtk_signal_connect (GTK_OBJECT (dump_dialog->window),
+	g_signal_connect (G_OBJECT (dump_dialog->window),
 			    "delete_event", 
 			    GTK_SIGNAL_FUNC (window_delete_event),
 			    dump_dialog->window);
@@ -201,12 +201,12 @@ dump_dialog_new (const char *title)
 	gtk_widget_set_sensitive (print_button, FALSE);
 	gtk_widget_set_sensitive (save_button, FALSE);
 
-	gtk_signal_connect (GTK_OBJECT (print_button),
+	g_signal_connect (G_OBJECT (print_button),
 			    "clicked", 
 			    GTK_SIGNAL_FUNC (window_print_button_callback),
 			    dump_dialog);
 
-	gtk_signal_connect (GTK_OBJECT (save_button),
+	g_signal_connect (G_OBJECT (save_button),
 			    "clicked", 
 			    GTK_SIGNAL_FUNC (window_save_button_callback),
 			    dump_dialog);
diff --git a/src/nautilus-property-browser.c b/src/nautilus-property-browser.c
index 3acba7b82..5d4f694d3 100644
--- a/src/nautilus-property-browser.c
+++ b/src/nautilus-property-browser.c
@@ -373,7 +373,7 @@ nautilus_property_browser_init (GtkObject *object)
 	gtk_box_pack_end (GTK_BOX(property_browser->details->bottom_box),
 			  property_browser->details->add_button, FALSE, FALSE, GNOME_PAD_SMALL);
  	  
- 	gtk_signal_connect (GTK_OBJECT (property_browser->details->add_button), "clicked",
+ 	g_signal_connect (G_OBJECT (property_browser->details->add_button), "clicked",
 			    G_CALLBACK (add_new_button_callback), property_browser);
 	
 	/* now create the "remove" button */
@@ -392,7 +392,7 @@ nautilus_property_browser_init (GtkObject *object)
 			  FALSE,
 			  GNOME_PAD_SMALL);
 	
- 	gtk_signal_connect (GTK_OBJECT (property_browser->details->remove_button),
+ 	g_signal_connect (G_OBJECT (property_browser->details->remove_button),
 			    "clicked",
 			    G_CALLBACK (remove_button_callback),
 			    property_browser);
@@ -412,11 +412,11 @@ nautilus_property_browser_init (GtkObject *object)
 				      nautilus_property_browser_theme_changed,
 				      property_browser);	
 	
-	gtk_signal_connect (GTK_OBJECT (property_browser), "delete_event",
+	g_signal_connect (G_OBJECT (property_browser), "delete_event",
                     	    G_CALLBACK (nautilus_property_browser_delete_event_callback),
                     	    NULL);
 
-	gtk_signal_connect (GTK_OBJECT (property_browser), "hide",
+	g_signal_connect (G_OBJECT (property_browser), "hide",
                     	    G_CALLBACK (nautilus_property_browser_hide_callback),
                     	    NULL);
 
@@ -1198,7 +1198,7 @@ show_color_selection_window (GtkWidget *widget, gpointer *data)
 	
 	eel_nullify_when_destroyed (&property_browser->details->dialog);
 
-	gtk_signal_connect (GTK_OBJECT (property_browser->details->dialog),
+	g_signal_connect (G_OBJECT (property_browser->details->dialog),
 				 "clicked",
 				 (GtkSignalFunc) add_color_to_browser, property_browser);
 	gtk_window_set_position (GTK_WINDOW (property_browser->details->dialog), GTK_WIN_POS_MOUSE);
@@ -1225,7 +1225,7 @@ add_new_color (NautilusPropertyBrowser *property_browser)
 		
 		eel_nullify_when_destroyed (&property_browser->details->dialog);
 
-		gtk_signal_connect (GTK_OBJECT (color_dialog->ok_button),
+		g_signal_connect (G_OBJECT (color_dialog->ok_button),
 				    "clicked",
 				    (GtkSignalFunc) show_color_selection_window, property_browser);
 		gtk_signal_connect_object (GTK_OBJECT (color_dialog->cancel_button),
@@ -1393,7 +1393,7 @@ add_new_emblem (NautilusPropertyBrowser *property_browser)
 
 		eel_nullify_when_destroyed (&property_browser->details->dialog);
 
-		gtk_signal_connect (GTK_OBJECT (property_browser->details->dialog),
+		g_signal_connect (G_OBJECT (property_browser->details->dialog),
 				    "clicked",
 				    (GtkSignalFunc) emblem_dialog_clicked, property_browser);
 		gtk_window_set_position (GTK_WINDOW (property_browser->details->dialog), GTK_WIN_POS_MOUSE);
@@ -1949,7 +1949,7 @@ nautilus_property_browser_update_contents (NautilusPropertyBrowser *property_bro
 	eel_wrap_table_set_y_spacing (EEL_WRAP_TABLE (property_browser->details->content_table),
 					   IMAGE_TABLE_Y_SPACING);
 	
-	gtk_signal_connect (GTK_OBJECT (property_browser->details->content_table),
+	g_signal_connect (G_OBJECT (property_browser->details->content_table),
 			    "child_pressed", 
 			    G_CALLBACK (element_clicked_callback),
 			    property_browser);
@@ -2174,5 +2174,5 @@ nautilus_property_browser_set_path (NautilusPropertyBrowser *property_browser,
 static void
 emit_emblems_changed_signal (void)
 {
-	gtk_signal_emit_by_name (nautilus_signaller_get_current (), "emblems_changed");
+	g_signal_emit_by_name (nautilus_signaller_get_current (), "emblems_changed");
 }
diff --git a/src/nautilus-search-bar-criterion.c b/src/nautilus-search-bar-criterion.c
index 303802d6a..5ada390d9 100644
--- a/src/nautilus-search-bar-criterion.c
+++ b/src/nautilus-search-bar-criterion.c
@@ -219,7 +219,7 @@ nautilus_search_bar_criterion_class_init (NautilusSearchBarCriterionClass *klass
 		 G_SIGNAL_RUN_LAST,
 		 0,
 		 NULL, NULL,
-		 gtk_marshal_NONE__NONE,
+		 gtk_marshal_VOID__VOID,
 		 G_TYPE_NONE, 0);
 				
 }
@@ -297,7 +297,7 @@ nautilus_search_bar_criterion_new_from_values (NautilusSearchBarCriterionType ty
 	details->bar = bar;
 	details->box = gtk_hwrap_box_new (FALSE);
 
-	gtk_signal_connect (GTK_OBJECT (details->box),
+	g_signal_connect (G_OBJECT (details->box),
 			    "need_reallocation",
 			    G_CALLBACK (queue_bar_resize_callback),
 			    bar);
@@ -317,7 +317,7 @@ nautilus_search_bar_criterion_new_from_values (NautilusSearchBarCriterionType ty
 		g_free (context_stripped_criteria_title);
 
 		gtk_object_set_data (GTK_OBJECT(item), "type", GINT_TO_POINTER(i));
-		gtk_signal_connect (GTK_OBJECT (item),
+		g_signal_connect (G_OBJECT (item),
 				    "activate",
 				    G_CALLBACK (criterion_type_changed_callback),
 				    criterion);
@@ -355,12 +355,12 @@ nautilus_search_bar_criterion_new_from_values (NautilusSearchBarCriterionType ty
 		   don't need a date, like "yesterday" */
 		if (details->type == NAUTILUS_DATE_MODIFIED_SEARCH_CRITERION) {
 			if (modified_relation_should_show_value (i)) {
-				gtk_signal_connect (GTK_OBJECT (item), "activate",
+				g_signal_connect (G_OBJECT (item), "activate",
 						    G_CALLBACK (show_date_widget),
 						    criterion);
 			}
 			else {
-				gtk_signal_connect (GTK_OBJECT (item), "activate",
+				g_signal_connect (G_OBJECT (item), "activate",
 						    G_CALLBACK (hide_date_widget),
 						    criterion);
 			}
@@ -718,7 +718,7 @@ nautilus_search_bar_criterion_update_valid_criteria_choices (NautilusSearchBarCr
 		
 		gtk_object_set_data (GTK_OBJECT(item), "type", GINT_TO_POINTER(i));
 		
-		gtk_signal_connect (GTK_OBJECT (item),
+		g_signal_connect (G_OBJECT (item),
 				    "activate",
 				    G_CALLBACK (criterion_type_changed_callback),
 				    criterion);
@@ -1046,8 +1046,8 @@ criterion_type_changed_callback (GtkObject *object,
 	g_return_if_fail (NAUTILUS_IS_COMPLEX_SEARCH_BAR (criterion->details->bar));
 	gtk_object_set_data (GTK_OBJECT (criterion), "type", 
 			     gtk_object_get_data (GTK_OBJECT (menu_item), "type"));
-	gtk_signal_emit (GTK_OBJECT (criterion),
-			 signals[CRITERION_TYPE_CHANGED]);
+	g_signal_emit (G_OBJECT (criterion),
+			 signals[CRITERION_TYPE_CHANGED], 0);
 	
 }
 
diff --git a/src/nautilus-shell.c b/src/nautilus-shell.c
index 1517c08d9..6f9bcb29a 100644
--- a/src/nautilus-shell.c
+++ b/src/nautilus-shell.c
@@ -215,7 +215,7 @@ display_caveat_first_time (NautilusShell *shell, NautilusWindow *window)
 	 */
 	if (!showed_caveat
 	    && g_getenv ("NAUTILUS_NO_CAVEAT_DIALOG") == NULL) {
-		gtk_signal_connect (GTK_OBJECT (window), "show",
+		g_signal_connect (G_OBJECT (window), "show",
 				    display_caveat, window);
 	}
 	showed_caveat = TRUE;
diff --git a/src/nautilus-sidebar-title.c b/src/nautilus-sidebar-title.c
index d9dd09de4..0807186a1 100644
--- a/src/nautilus-sidebar-title.c
+++ b/src/nautilus-sidebar-title.c
@@ -206,7 +206,7 @@ nautilus_sidebar_title_init (NautilusSidebarTitle *sidebar_title)
 					       "icons_changed",
 					       G_CALLBACK (update_icon),
 					       GTK_OBJECT (sidebar_title));
-	gtk_signal_connect (GTK_OBJECT (sidebar_title), "realize",
+	g_signal_connect (G_OBJECT (sidebar_title), "realize",
 			    G_CALLBACK (realize_callback), NULL);
 
 	/* Create the icon */
diff --git a/src/nautilus-sidebar.c b/src/nautilus-sidebar.c
index 2ca5550e5..9c03f2ec1 100644
--- a/src/nautilus-sidebar.c
+++ b/src/nautilus-sidebar.c
@@ -546,7 +546,7 @@ nautilus_sidebar_create_context_menu (NautilusSidebar *sidebar)
  	gtk_widget_show (menu_item);
 	gtk_menu_append (GTK_MENU(menu), menu_item);
         gtk_widget_set_sensitive (menu_item, has_background);
-	gtk_signal_connect (GTK_OBJECT (menu_item), "activate",
+	g_signal_connect (G_OBJECT (menu_item), "activate",
 			    G_CALLBACK (reset_background_callback), sidebar);
 
 	/* add a separator */
@@ -710,8 +710,8 @@ receive_dropped_uri_list (NautilusSidebar *sidebar,
 				(eel_get_widget_background (GTK_WIDGET (sidebar)),
 				 uris[0]);
 		} else if (exactly_one) {
-			gtk_signal_emit (GTK_OBJECT (sidebar),
-					 signals[LOCATION_CHANGED],
+			g_signal_emit (G_OBJECT (sidebar),
+					 signals[LOCATION_CHANGED], 0,
 			 		 uris[0]);	
 		}
 		break;
@@ -916,7 +916,7 @@ nautilus_sidebar_add_panel (NautilusSidebar *sidebar, NautilusViewFrame *panel)
 
 	gtk_widget_show (label);
 	
-	gtk_signal_connect (GTK_OBJECT (panel), "view_loaded",
+	g_signal_connect (G_OBJECT (panel), "view_loaded",
 			    G_CALLBACK (view_loaded_callback), sidebar);
 	
 	gtk_notebook_append_page (GTK_NOTEBOOK (sidebar->details->notebook),
@@ -1386,7 +1386,7 @@ add_command_buttons (NautilusSidebar *sidebar, GList *application_list)
 
 	/* Catch-all button after all the others. */
 	temp_button = gtk_button_new_with_label (_("Open with..."));
-	gtk_signal_connect (GTK_OBJECT (temp_button), "clicked",
+	g_signal_connect (G_OBJECT (temp_button), "clicked",
 			    G_CALLBACK (open_with_callback), NULL);
 	gtk_object_set_user_data (GTK_OBJECT (temp_button), sidebar);
 	gtk_widget_show (temp_button);
@@ -1502,7 +1502,7 @@ nautilus_sidebar_update_buttons (NautilusSidebar *sidebar)
 		gtk_widget_show (temp_button);
 		sidebar->details->has_buttons = TRUE;
 					
-		gtk_signal_connect (GTK_OBJECT (temp_button), "clicked",
+		g_signal_connect (G_OBJECT (temp_button), "clicked",
 			GTK_SIGNAL_FUNC (empty_trash_callback), NULL);
 		
 		gtk_signal_connect_while_alive (GTK_OBJECT (nautilus_trash_monitor_get ()),
@@ -1547,11 +1547,11 @@ nautilus_sidebar_update_appearance (NautilusSidebar *sidebar)
 	background = eel_get_widget_background (GTK_WIDGET (sidebar));
 	if (!sidebar->details->background_connected) {
 		sidebar->details->background_connected = TRUE;
-		gtk_signal_connect (GTK_OBJECT (background),
+		g_signal_connect (G_OBJECT (background),
 				    "settings_changed",
 				    G_CALLBACK (background_settings_changed_callback),
 				    sidebar);
-		gtk_signal_connect (GTK_OBJECT (background),
+		g_signal_connect (G_OBJECT (background),
 				    "reset",
 				    G_CALLBACK (background_reset_callback),
 				    sidebar);
diff --git a/src/nautilus-signaller.c b/src/nautilus-signaller.c
index 2c366822f..81cda3d57 100644
--- a/src/nautilus-signaller.c
+++ b/src/nautilus-signaller.c
@@ -95,7 +95,7 @@ GtkObject *
 nautilus_signaller_get_current (void)
 {
 	if (global_signaller == NULL) {
-		global_signaller = gtk_object_new (nautilus_signaller_get_type (), NULL);
+		global_signaller = g_object_new (nautilus_signaller_get_type (), NULL);
 		gtk_object_ref (GTK_OBJECT (global_signaller));
 		gtk_object_sink (GTK_OBJECT (global_signaller));
 		g_atexit (unref_global_signaller);
diff --git a/src/nautilus-spatial-window.c b/src/nautilus-spatial-window.c
index 3fc14b51f..e62322c92 100644
--- a/src/nautilus-spatial-window.c
+++ b/src/nautilus-spatial-window.c
@@ -166,11 +166,11 @@ nautilus_window_class_init (NautilusWindowClass *klass)
 	widget_class->unrealize = nautilus_window_unrealize;
 	
 	gtk_object_add_arg_type ("NautilusWindow::app_id",
-				 GTK_TYPE_STRING,
+				 G_TYPE_STRING,
 				 GTK_ARG_READWRITE | GTK_ARG_CONSTRUCT,
 				 ARG_APP_ID);
 	gtk_object_add_arg_type ("NautilusWindow::app",
-				 GTK_TYPE_OBJECT,
+				 G_TYPE_OBJECT,
 				 GTK_ARG_READWRITE | GTK_ARG_CONSTRUCT,
 				 ARG_APP);
 	
@@ -633,10 +633,10 @@ nautilus_window_constructed (NautilusWindow *window)
 	window->navigation_bar = nautilus_switchable_navigation_bar_new (window);
 	gtk_widget_show (GTK_WIDGET (window->navigation_bar));
 
-	gtk_signal_connect (GTK_OBJECT (window->navigation_bar), "location_changed",
+	g_signal_connect (G_OBJECT (window->navigation_bar), "location_changed",
 			    G_CALLBACK (navigation_bar_location_changed_callback), window);
 
-	gtk_signal_connect (GTK_OBJECT (window->navigation_bar), "mode_changed",
+	g_signal_connect (G_OBJECT (window->navigation_bar), "mode_changed",
 			    G_CALLBACK (navigation_bar_mode_changed_callback), window);
 
 	gtk_box_pack_start (GTK_BOX (location_bar_box), window->navigation_bar,
@@ -701,7 +701,7 @@ nautilus_window_constructed (NautilusWindow *window)
 		/* set up the sidebar */
 		window->sidebar = nautilus_sidebar_new ();
 		gtk_widget_show (GTK_WIDGET (window->sidebar));
-		gtk_signal_connect (GTK_OBJECT (window->sidebar), "location_changed",
+		g_signal_connect (G_OBJECT (window->sidebar), "location_changed",
 				    G_CALLBACK (go_to_callback), window);
 		e_paned_pack1 (E_PANED (window->content_hbox),
 			       GTK_WIDGET (window->sidebar),
@@ -1144,7 +1144,7 @@ create_view_as_menu_item (NautilusWindow *window,
 	menu_item = gtk_menu_item_new_with_label (menu_label);
 	g_free (menu_label);
 
-	gtk_signal_connect (GTK_OBJECT (menu_item),
+	g_signal_connect (G_OBJECT (menu_item),
 			    "activate",
 			    G_CALLBACK (view_as_menu_switch_views_callback),
 			    window);
@@ -1481,7 +1481,7 @@ load_view_as_menus_callback (NautilusFile *file,
 
 	/* Add "View as..." extra bonus choice. */
        	menu_item = gtk_menu_item_new_with_label (_("View as..."));
-        gtk_signal_connect (GTK_OBJECT (menu_item),
+        g_signal_connect (G_OBJECT (menu_item),
         		    "activate",
         		    G_CALLBACK (view_as_menu_choose_view_callback),
         		    window);
@@ -1735,7 +1735,7 @@ nautilus_window_allow_stop (NautilusWindow *window, gboolean allow)
 void
 nautilus_send_history_list_changed (void)
 {
-	gtk_signal_emit_by_name (nautilus_signaller_get_current (),
+	g_signal_emit_by_name (nautilus_signaller_get_current (),
 			 	 "history_list_changed");
 }
 
diff --git a/src/nautilus-switchable-navigation-bar.c b/src/nautilus-switchable-navigation-bar.c
index cfc492e1c..ed38405dc 100644
--- a/src/nautilus-switchable-navigation-bar.c
+++ b/src/nautilus-switchable-navigation-bar.c
@@ -218,7 +218,7 @@ nautilus_switchable_navigation_bar_set_mode (NautilusSwitchableNavigationBar
 	}
 #endif
 
-	gtk_signal_emit (GTK_OBJECT (bar), signals[MODE_CHANGED], mode);
+	g_signal_emit (G_OBJECT (bar), signals[MODE_CHANGED], 0, mode);
 }
 
 static char *
diff --git a/src/nautilus-theme-selector.c b/src/nautilus-theme-selector.c
index 9bcb9dab1..45c1d18c1 100644
--- a/src/nautilus-theme-selector.c
+++ b/src/nautilus-theme-selector.c
@@ -177,19 +177,19 @@ nautilus_theme_selector_init (NautilusThemeSelector *theme_selector)
 	gtk_box_pack_end (GTK_BOX (alignment_box), button_box, FALSE, FALSE, 2);
 
 	theme_selector->details->install_theme_button = gtk_button_new_with_label (_("Add New Theme..."));
-	gtk_signal_connect (GTK_OBJECT (theme_selector->details->install_theme_button),
+	g_signal_connect (G_OBJECT (theme_selector->details->install_theme_button),
 			    "clicked",
 			    GTK_SIGNAL_FUNC (install_theme_button_clicked_callback),
 			    theme_selector);
 
 	theme_selector->details->remove_theme_button = gtk_button_new_with_label (_("Remove Theme..."));
-	gtk_signal_connect (GTK_OBJECT (theme_selector->details->remove_theme_button),
+	g_signal_connect (G_OBJECT (theme_selector->details->remove_theme_button),
 			    "clicked",
 			    GTK_SIGNAL_FUNC (remove_theme_button_clicked_callback),
 			    theme_selector);
 
 	theme_selector->details->cancel_remove_button = gtk_button_new_with_label (_("Cancel Remove"));
-	gtk_signal_connect (GTK_OBJECT (theme_selector->details->cancel_remove_button),
+	g_signal_connect (G_OBJECT (theme_selector->details->cancel_remove_button),
 			    "clicked",
 			    GTK_SIGNAL_FUNC (cancel_remove_button_clicked_callback),
 			    theme_selector);
@@ -220,13 +220,13 @@ nautilus_theme_selector_init (NautilusThemeSelector *theme_selector)
 
 	theme_selector_update_remove_theme_button (theme_selector);
 
-	gtk_signal_connect (GTK_OBJECT (theme_selector->details->theme_selector),
+	g_signal_connect (G_OBJECT (theme_selector->details->theme_selector),
 			    "selection_changed",
 			    GTK_SIGNAL_FUNC (theme_selector_changed_callback),
 			    theme_selector);
 
 	theme_selector->details->theme_selector_changed_connection =
-		gtk_signal_connect (GTK_OBJECT (theme_selector->details->remove_theme_selector),
+		g_signal_connect (G_OBJECT (theme_selector->details->remove_theme_selector),
 				    "selection_changed",
 				    GTK_SIGNAL_FUNC (remove_theme_selector_changed_callback),
 				    theme_selector);
@@ -335,12 +335,12 @@ install_theme_button_clicked_callback (GtkWidget *button,
 			     THEME_SELECTOR_DATA_KEY,
 			     callback_data);
 
-	gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION (file_selection_dialog)->ok_button),
+	g_signal_connect (G_OBJECT (GTK_FILE_SELECTION (file_selection_dialog)->ok_button),
 			    "clicked",
 			    GTK_SIGNAL_FUNC (file_selection_ok_clicked_callback),
 			    file_selection_dialog);
 
-	gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION (file_selection_dialog)->cancel_button),
+	g_signal_connect (G_OBJECT (GTK_FILE_SELECTION (file_selection_dialog)->cancel_button),
 			    "clicked",
 			    GTK_SIGNAL_FUNC (file_selection_cancel_clicked_callback),
 			    file_selection_dialog);
@@ -513,8 +513,8 @@ theme_selector_changed_callback (EelImageChooser *image_chooser,
 	
 	selected_row_position = eel_image_chooser_get_selected_row (image_chooser);
 	
-	gtk_signal_emit (GTK_OBJECT (callback_data),
-			 theme_selector_signals[THEME_CHANGED]);
+	g_signal_emit (G_OBJECT (callback_data),
+			 theme_selector_signals[THEME_CHANGED], 0);
 }
 
 /* GtkObjectClass methods */
diff --git a/src/nautilus-view-frame-corba.c b/src/nautilus-view-frame-corba.c
index a77e97661..630ebd199 100644
--- a/src/nautilus-view-frame-corba.c
+++ b/src/nautilus-view-frame-corba.c
@@ -404,7 +404,7 @@ nautilus_view_frame_create_corba_part (NautilusViewFrame *widget)
 {
 	NautilusViewFrameCorbaPart *part;
 
-	part = NAUTILUS_VIEW_FRAME_CORBA_PART (gtk_object_new (NAUTILUS_TYPE_VIEW_FRAME_CORBA_PART, NULL));
+	part = NAUTILUS_VIEW_FRAME_CORBA_PART (g_object_new (NAUTILUS_TYPE_VIEW_FRAME_CORBA_PART, NULL));
 	part->widget = widget;
 	return BONOBO_OBJECT (part);
 }
diff --git a/src/nautilus-view-frame.c b/src/nautilus-view-frame.c
index c5f3aa8af..ec12b741c 100644
--- a/src/nautilus-view-frame.c
+++ b/src/nautilus-view-frame.c
@@ -163,7 +163,7 @@ nautilus_view_frame_class_init (NautilusViewFrameClass *klass)
 		 G_STRUCT_OFFSET (NautilusViewFrameClass, 
 				    change_selection),
 		 NULL, NULL,
-		 gtk_marshal_NONE__POINTER,
+		 gtk_marshal_VOID__POINTER,
 		 G_TYPE_NONE, 1, GTK_TYPE_POINTER);
 	signals[CHANGE_STATUS] = g_signal_new
 		("change_status",
@@ -181,7 +181,7 @@ nautilus_view_frame_class_init (NautilusViewFrameClass *klass)
 		 G_STRUCT_OFFSET (NautilusViewFrameClass, 
 				    failed),
 		 NULL, NULL,
-		 gtk_marshal_NONE__NONE,
+		 gtk_marshal_VOID__VOID,
 		 G_TYPE_NONE, 0);
 	signals[GET_HISTORY_LIST] = g_signal_new
 		("get_history_list",
@@ -199,7 +199,7 @@ nautilus_view_frame_class_init (NautilusViewFrameClass *klass)
 		 G_STRUCT_OFFSET (NautilusViewFrameClass, 
 				    go_back),
 		 NULL, NULL,
-		 gtk_marshal_NONE__NONE,
+		 gtk_marshal_VOID__VOID,
 		 G_TYPE_NONE, 0);
 	signals[LOAD_COMPLETE] = g_signal_new
 		("load_complete",
@@ -208,7 +208,7 @@ nautilus_view_frame_class_init (NautilusViewFrameClass *klass)
 		 G_STRUCT_OFFSET (NautilusViewFrameClass, 
 				    load_complete),
 		 NULL, NULL,
-		 gtk_marshal_NONE__NONE,
+		 gtk_marshal_VOID__VOID,
 		 G_TYPE_NONE, 0);
 	signals[LOAD_PROGRESS_CHANGED] = g_signal_new
 		("load_progress_changed",
@@ -217,7 +217,7 @@ nautilus_view_frame_class_init (NautilusViewFrameClass *klass)
 		 G_STRUCT_OFFSET (NautilusViewFrameClass, 
 				    load_progress_changed),
 		 NULL, NULL,
-		 gtk_marshal_NONE__NONE,
+		 gtk_marshal_VOID__VOID,
 		 G_TYPE_NONE, 0);
 	signals[LOAD_UNDERWAY] = g_signal_new
 		("load_underway",
@@ -226,7 +226,7 @@ nautilus_view_frame_class_init (NautilusViewFrameClass *klass)
 		 G_STRUCT_OFFSET (NautilusViewFrameClass, 
 				    load_underway),
 		 NULL, NULL,
-		 gtk_marshal_NONE__NONE,
+		 gtk_marshal_VOID__VOID,
 		 G_TYPE_NONE, 0);
 	signals[OPEN_LOCATION_FORCE_NEW_WINDOW] = g_signal_new
 		("open_location_force_new_window",
@@ -280,7 +280,7 @@ nautilus_view_frame_class_init (NautilusViewFrameClass *klass)
 		 G_STRUCT_OFFSET (NautilusViewFrameClass, 
 				    title_changed),
 		 NULL, NULL,
-		 gtk_marshal_NONE__NONE,
+		 gtk_marshal_VOID__VOID,
 		 G_TYPE_NONE, 0);
 	signals[VIEW_LOADED] = g_signal_new
 		("view_loaded",
@@ -289,7 +289,7 @@ nautilus_view_frame_class_init (NautilusViewFrameClass *klass)
 		 G_STRUCT_OFFSET (NautilusViewFrameClass, 
 				    view_loaded),
 		 NULL, NULL,
-		 gtk_marshal_NONE__NONE,
+		 gtk_marshal_VOID__VOID,
 		 G_TYPE_NONE, 0);
 	signals[ZOOM_LEVEL_CHANGED] = g_signal_new
 		("zoom_level_changed",
@@ -298,7 +298,7 @@ nautilus_view_frame_class_init (NautilusViewFrameClass *klass)
 		 G_STRUCT_OFFSET (NautilusViewFrameClass, 
 				    zoom_level_changed),
 		 NULL, NULL,
-		 gtk_marshal_NONE__NONE,
+		 gtk_marshal_VOID__VOID,
 		 G_TYPE_NONE, 0);
 	signals[ZOOM_PARAMETERS_CHANGED] = g_signal_new
 		("zoom_parameters_changed",
@@ -307,7 +307,7 @@ nautilus_view_frame_class_init (NautilusViewFrameClass *klass)
 		 G_STRUCT_OFFSET (NautilusViewFrameClass, 
 				    zoom_parameters_changed),
 		 NULL, NULL,
-		 gtk_marshal_NONE__NONE,
+		 gtk_marshal_VOID__VOID,
 		 G_TYPE_NONE, 0);
 }
 
@@ -419,7 +419,7 @@ static void
 emit_zoom_parameters_changed (NautilusViewFrame *view)
 {
 	if (view->details->zoomable_frame != NULL) {
-		gtk_signal_emit (GTK_OBJECT (view), signals[ZOOM_PARAMETERS_CHANGED]);
+		g_signal_emit (G_OBJECT (view), signals[ZOOM_PARAMETERS_CHANGED], 0);
 	}
 }
 
@@ -432,7 +432,7 @@ view_frame_activated (NautilusViewFrame *view)
 	switch (view->details->state) {
 	case VIEW_FRAME_EMPTY:
 		view->details->state = VIEW_FRAME_NO_LOCATION;
-		gtk_signal_emit (GTK_OBJECT (view), signals[VIEW_LOADED]);
+		g_signal_emit (G_OBJECT (view), signals[VIEW_LOADED], 0);
 		emit_zoom_parameters_changed (view);
 		send_history (view);
 		return;
@@ -489,7 +489,7 @@ view_frame_underway (NautilusViewFrame *view)
 	case VIEW_FRAME_WAITING:
 	case VIEW_FRAME_LOADED:
 		view->details->state = VIEW_FRAME_UNDERWAY;
-		gtk_signal_emit (GTK_OBJECT (view), signals[LOAD_UNDERWAY]);
+		g_signal_emit (G_OBJECT (view), signals[LOAD_UNDERWAY], 0);
 		return;
 	case VIEW_FRAME_UNDERWAY:
 	case VIEW_FRAME_FAILED:
@@ -548,7 +548,7 @@ view_frame_loaded (NautilusViewFrame *view)
 		/* fall through */
 	case VIEW_FRAME_UNDERWAY:
 		view->details->state = VIEW_FRAME_LOADED;
-		gtk_signal_emit (GTK_OBJECT (view), signals[LOAD_COMPLETE]);
+		g_signal_emit (G_OBJECT (view), signals[LOAD_COMPLETE], 0);
 		return;
 	case VIEW_FRAME_LOADED:
 	case VIEW_FRAME_FAILED:
@@ -573,7 +573,7 @@ view_frame_failed (NautilusViewFrame *view)
 		view->details->state = VIEW_FRAME_FAILED;
 		stop_activation (view);
 		destroy_view (view);
-		gtk_signal_emit (GTK_OBJECT (view), signals[FAILED]);
+		g_signal_emit (G_OBJECT (view), signals[FAILED], 0);
 		return;
 	case VIEW_FRAME_FAILED:
 		return;
@@ -621,8 +621,8 @@ static void
 emit_zoom_level_changed_callback (gpointer data,
 				  gpointer callback_data)
 {
-	gtk_signal_emit (GTK_OBJECT (data),
-			 signals[ZOOM_LEVEL_CHANGED],
+	g_signal_emit (G_OBJECT (data),
+			 signals[ZOOM_LEVEL_CHANGED], 0,
 			 * (float *) callback_data);
 }
 
@@ -891,7 +891,7 @@ nautilus_view_frame_load_location (NautilusViewFrame *view,
 
 	g_free (view->details->title);
 	view->details->title = NULL;
-	gtk_signal_emit (GTK_OBJECT (view), signals[TITLE_CHANGED]);
+	g_signal_emit (G_OBJECT (view), signals[TITLE_CHANGED], 0);
 
 	view_frame_wait (view);
 	
@@ -1133,8 +1133,8 @@ nautilus_view_frame_open_location_in_this_window (NautilusViewFrame *view,
 	}
 
 	view_frame_wait_is_over (view);
-	gtk_signal_emit (GTK_OBJECT (view),
-			 signals[OPEN_LOCATION_IN_THIS_WINDOW], location);
+	g_signal_emit (G_OBJECT (view),
+			 signals[OPEN_LOCATION_IN_THIS_WINDOW], 0, location);
 }
 
 void
@@ -1148,8 +1148,8 @@ nautilus_view_frame_open_location_prefer_existing_window (NautilusViewFrame *vie
 	}
 
 	view_frame_wait_is_over (view);
-	gtk_signal_emit (GTK_OBJECT (view),
-			 signals[OPEN_LOCATION_PREFER_EXISTING_WINDOW], location);
+	g_signal_emit (G_OBJECT (view),
+			 signals[OPEN_LOCATION_PREFER_EXISTING_WINDOW], 0, location);
 }
 
 void
@@ -1164,8 +1164,8 @@ nautilus_view_frame_open_location_force_new_window (NautilusViewFrame *view,
 	}
 
 	view_frame_wait_is_over (view);
-	gtk_signal_emit (GTK_OBJECT (view),
-			 signals[OPEN_LOCATION_FORCE_NEW_WINDOW],
+	g_signal_emit (G_OBJECT (view),
+			 signals[OPEN_LOCATION_FORCE_NEW_WINDOW], 0,
 			 location, selection);
 }
 
@@ -1185,8 +1185,8 @@ nautilus_view_frame_report_location_change (NautilusViewFrame *view,
 	view->details->title = g_strdup (title);
 
 	view_frame_wait_is_over (view);
-	gtk_signal_emit (GTK_OBJECT (view),
-			 signals[REPORT_LOCATION_CHANGE],
+	g_signal_emit (G_OBJECT (view),
+			 signals[REPORT_LOCATION_CHANGE], 0,
 			 location, selection, title);
 }
 
@@ -1207,8 +1207,8 @@ nautilus_view_frame_report_redirect (NautilusViewFrame *view,
 	view->details->title = g_strdup (title);
 
 	view_frame_wait_is_over (view);
-	gtk_signal_emit (GTK_OBJECT (view),
-			 signals[REPORT_REDIRECT],
+	g_signal_emit (G_OBJECT (view),
+			 signals[REPORT_REDIRECT], 0,
 			 from_location, to_location, selection, title);
 }
 
@@ -1223,8 +1223,8 @@ nautilus_view_frame_report_selection_change (NautilusViewFrame *view,
 	}
 
 	view_frame_wait_is_over (view);
-	gtk_signal_emit (GTK_OBJECT (view),
-			 signals[CHANGE_SELECTION], selection);
+	g_signal_emit (G_OBJECT (view),
+			 signals[CHANGE_SELECTION], 0, selection);
 }
 
 void
@@ -1238,8 +1238,8 @@ nautilus_view_frame_report_status (NautilusViewFrame *view,
 	}
 
 	view_frame_wait_is_over (view);
-	gtk_signal_emit (GTK_OBJECT (view),
-			 signals[CHANGE_STATUS], status);
+	g_signal_emit (G_OBJECT (view),
+			 signals[CHANGE_STATUS], 0, status);
 }
 
 void
@@ -1261,8 +1261,8 @@ nautilus_view_frame_report_load_progress (NautilusViewFrame *view,
 	}
 
 	view_frame_underway (view);
-	gtk_signal_emit (GTK_OBJECT (view),
-			 signals[LOAD_PROGRESS_CHANGED]);
+	g_signal_emit (G_OBJECT (view),
+			 signals[LOAD_PROGRESS_CHANGED], 0);
 }
 
 void
@@ -1296,7 +1296,7 @@ nautilus_view_frame_go_back (NautilusViewFrame *view)
 {
 	g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view));
 
-	gtk_signal_emit (GTK_OBJECT (view), signals[GO_BACK]);
+	g_signal_emit (G_OBJECT (view), signals[GO_BACK], 0);
 }
 
 void
@@ -1321,7 +1321,7 @@ nautilus_view_frame_set_title (NautilusViewFrame *view,
 
 	view_frame_wait_is_over (view);
 	if (changed) {
-		gtk_signal_emit (GTK_OBJECT (view), signals[TITLE_CHANGED]);
+		g_signal_emit (G_OBJECT (view), signals[TITLE_CHANGED], 0);
 	}
 }
 
@@ -1376,8 +1376,8 @@ get_history_list (NautilusViewFrame *view)
 	Nautilus_History *history_list;
 	
 	history_list = NULL;
-	gtk_signal_emit (GTK_OBJECT (view), 
-  			 signals[GET_HISTORY_LIST],
+	g_signal_emit (G_OBJECT (view), 
+  			 signals[GET_HISTORY_LIST], 0,
 			 &history_list);
   	return history_list;
 }
diff --git a/src/nautilus-window-manage-views.c b/src/nautilus-window-manage-views.c
index a2d8e945d..4f180d226 100644
--- a/src/nautilus-window-manage-views.c
+++ b/src/nautilus-window-manage-views.c
@@ -592,7 +592,7 @@ update_for_new_location (NautilusWindow *window)
         file = nautilus_file_get (window->details->location);
         nautilus_window_set_viewed_file (window, file);
         window->details->viewed_file_seen = !nautilus_file_is_not_yet_confirmed (file);
-        gtk_signal_connect (GTK_OBJECT (file),
+        g_signal_connect (G_OBJECT (file),
                             "changed",
                             G_CALLBACK (viewed_file_changed_callback),
                             window);
diff --git a/src/nautilus-window-menus.c b/src/nautilus-window-menus.c
index 5775910f1..5b1cda7dc 100644
--- a/src/nautilus-window-menus.c
+++ b/src/nautilus-window-menus.c
@@ -1328,10 +1328,8 @@ nautilus_window_initialize_menus_part_1 (NautilusWindow *window)
 	user_level_changed_callback (window);
 
 	/* Register to catch Bonobo UI events so we can notice View As changes */
-	gtk_signal_connect (GTK_OBJECT (window->details->shell_ui),
-			    "ui_event", 
-			    G_CALLBACK (nautilus_window_handle_ui_event_callback), 
-			    window);
+	g_signal_connect (G_OBJECT (window->details->shell_ui), "ui_event", 
+			  G_CALLBACK (nautilus_window_handle_ui_event_callback), window);
 
 	bonobo_ui_component_thaw (window->details->shell_ui, NULL);
 	
diff --git a/src/nautilus-window-toolbars.c b/src/nautilus-window-toolbars.c
index 9a772ada5..73690115e 100644
--- a/src/nautilus-window-toolbars.c
+++ b/src/nautilus-window-toolbars.c
@@ -372,11 +372,11 @@ set_up_back_or_forward_toolbar_item (NautilusWindow *window,
 	gtk_widget_show (GTK_WIDGET (item));
 
 	button = bonobo_ui_toolbar_button_item_get_button_widget (item);
-	gtk_signal_connect (GTK_OBJECT (button),
+	g_signal_connect (G_OBJECT (button),
 			    "button_press_event",
 			    GTK_SIGNAL_FUNC (back_or_forward_button_pressed_callback),
 			    window);
-	gtk_signal_connect (GTK_OBJECT (button),
+	g_signal_connect (G_OBJECT (button),
 			    "clicked",
 			    GTK_SIGNAL_FUNC (back_or_forward_button_clicked_callback),
 			    window);
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index 3fc14b51f..e62322c92 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -166,11 +166,11 @@ nautilus_window_class_init (NautilusWindowClass *klass)
 	widget_class->unrealize = nautilus_window_unrealize;
 	
 	gtk_object_add_arg_type ("NautilusWindow::app_id",
-				 GTK_TYPE_STRING,
+				 G_TYPE_STRING,
 				 GTK_ARG_READWRITE | GTK_ARG_CONSTRUCT,
 				 ARG_APP_ID);
 	gtk_object_add_arg_type ("NautilusWindow::app",
-				 GTK_TYPE_OBJECT,
+				 G_TYPE_OBJECT,
 				 GTK_ARG_READWRITE | GTK_ARG_CONSTRUCT,
 				 ARG_APP);
 	
@@ -633,10 +633,10 @@ nautilus_window_constructed (NautilusWindow *window)
 	window->navigation_bar = nautilus_switchable_navigation_bar_new (window);
 	gtk_widget_show (GTK_WIDGET (window->navigation_bar));
 
-	gtk_signal_connect (GTK_OBJECT (window->navigation_bar), "location_changed",
+	g_signal_connect (G_OBJECT (window->navigation_bar), "location_changed",
 			    G_CALLBACK (navigation_bar_location_changed_callback), window);
 
-	gtk_signal_connect (GTK_OBJECT (window->navigation_bar), "mode_changed",
+	g_signal_connect (G_OBJECT (window->navigation_bar), "mode_changed",
 			    G_CALLBACK (navigation_bar_mode_changed_callback), window);
 
 	gtk_box_pack_start (GTK_BOX (location_bar_box), window->navigation_bar,
@@ -701,7 +701,7 @@ nautilus_window_constructed (NautilusWindow *window)
 		/* set up the sidebar */
 		window->sidebar = nautilus_sidebar_new ();
 		gtk_widget_show (GTK_WIDGET (window->sidebar));
-		gtk_signal_connect (GTK_OBJECT (window->sidebar), "location_changed",
+		g_signal_connect (G_OBJECT (window->sidebar), "location_changed",
 				    G_CALLBACK (go_to_callback), window);
 		e_paned_pack1 (E_PANED (window->content_hbox),
 			       GTK_WIDGET (window->sidebar),
@@ -1144,7 +1144,7 @@ create_view_as_menu_item (NautilusWindow *window,
 	menu_item = gtk_menu_item_new_with_label (menu_label);
 	g_free (menu_label);
 
-	gtk_signal_connect (GTK_OBJECT (menu_item),
+	g_signal_connect (G_OBJECT (menu_item),
 			    "activate",
 			    G_CALLBACK (view_as_menu_switch_views_callback),
 			    window);
@@ -1481,7 +1481,7 @@ load_view_as_menus_callback (NautilusFile *file,
 
 	/* Add "View as..." extra bonus choice. */
        	menu_item = gtk_menu_item_new_with_label (_("View as..."));
-        gtk_signal_connect (GTK_OBJECT (menu_item),
+        g_signal_connect (G_OBJECT (menu_item),
         		    "activate",
         		    G_CALLBACK (view_as_menu_choose_view_callback),
         		    window);
@@ -1735,7 +1735,7 @@ nautilus_window_allow_stop (NautilusWindow *window, gboolean allow)
 void
 nautilus_send_history_list_changed (void)
 {
-	gtk_signal_emit_by_name (nautilus_signaller_get_current (),
+	g_signal_emit_by_name (nautilus_signaller_get_current (),
 			 	 "history_list_changed");
 }
 
diff --git a/src/nautilus-zoom-control.c b/src/nautilus-zoom-control.c
index 04941ac83..59a905988 100644
--- a/src/nautilus-zoom-control.c
+++ b/src/nautilus-zoom-control.c
@@ -474,7 +474,7 @@ zoom_menu_callback (GtkMenuItem *item, gpointer callback_data)
 
 	/* if we can zoom */
 	if (can_zoom) {	
-		gtk_signal_emit (GTK_OBJECT (zoom_control), signals[ZOOM_TO_LEVEL], zoom_level);
+		g_signal_emit (G_OBJECT (zoom_control), signals[ZOOM_TO_LEVEL], 0, zoom_level);
 	}
 }
 
@@ -515,7 +515,7 @@ create_zoom_menu_item (GtkMenu *menu, GtkWidget *widget, float zoom_level,
 					zoom_level == zoom_control->details->zoom_level);
 	
 	gtk_object_set_data_full (GTK_OBJECT (menu_item), "zoom_level", zoom_level_ptr, g_free);
-	gtk_signal_connect (GTK_OBJECT (menu_item), "activate",
+	g_signal_connect (G_OBJECT (menu_item), "activate",
 			    GTK_SIGNAL_FUNC (zoom_menu_callback),
 			    zoom_control);
 
@@ -566,11 +566,11 @@ nautilus_zoom_control_button_press_event (GtkWidget *widget, GdkEventButton *eve
  	}
 	
 	if ((event->x < (width / 3)) && nautilus_zoom_control_can_zoom_out (zoom_control)) {
-		gtk_signal_emit (GTK_OBJECT (widget), signals[ZOOM_OUT]);			
+		g_signal_emit (G_OBJECT (widget), signals[ZOOM_OUT], 0);			
 	} else if ((event->x > ((2 * width) / 3)) && nautilus_zoom_control_can_zoom_in (zoom_control)) {
-		gtk_signal_emit (GTK_OBJECT (widget), signals[ZOOM_IN]);			
+		g_signal_emit (G_OBJECT (widget), signals[ZOOM_IN], 0);			
 	} else if ((event->x >= (center - (width >> 3))) && (event->x <= (center + (width >> 3)))) {
-		gtk_signal_emit (GTK_OBJECT (widget), signals[ZOOM_TO_FIT]);			
+		g_signal_emit (G_OBJECT (widget), signals[ZOOM_TO_FIT], 0);			
 	}
 
 	/*
@@ -734,7 +734,7 @@ nautilus_zoom_control_class_init (NautilusZoomControlClass *zoom_control_class)
 		              G_STRUCT_OFFSET (NautilusZoomControlClass, 
 						   zoom_in),
 		              NULL, NULL,
-		              gtk_marshal_NONE__NONE,
+		              gtk_marshal_VOID__VOID,
 		              G_TYPE_NONE, 0);
 
 	signals[ZOOM_OUT] =
@@ -744,7 +744,7 @@ nautilus_zoom_control_class_init (NautilusZoomControlClass *zoom_control_class)
 		              G_STRUCT_OFFSET (NautilusZoomControlClass, 
 						   zoom_out),
 		              NULL, NULL,
-		              gtk_marshal_NONE__NONE,
+		              gtk_marshal_VOID__VOID,
 		              G_TYPE_NONE, 0);
 
 	signals[ZOOM_TO_LEVEL] =
@@ -766,6 +766,6 @@ nautilus_zoom_control_class_init (NautilusZoomControlClass *zoom_control_class)
 		              G_STRUCT_OFFSET (NautilusZoomControlClass, 
 						   zoom_to_fit),
 		              NULL, NULL,
-		              gtk_marshal_NONE__NONE,
+		              gtk_marshal_VOID__VOID,
 		              G_TYPE_NONE, 0);
 }
diff --git a/test/test-nautilus-async-activation.c b/test/test-nautilus-async-activation.c
index bb0191820..c3abb9f4e 100644
--- a/test/test-nautilus-async-activation.c
+++ b/test/test-nautilus-async-activation.c
@@ -67,7 +67,7 @@ main (int argc, char *argv[])
 		     bonobo_poa_manager ());
 
 	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	gtk_signal_connect (GTK_OBJECT (window), "destroy",
+	g_signal_connect (G_OBJECT (window), "destroy",
 			    gtk_main_quit, NULL);
 	gtk_widget_show_all (GTK_WIDGET (window));
 	
diff --git a/test/test-nautilus-preferences-change.c b/test/test-nautilus-preferences-change.c
index 41749b8ed..120a670da 100644
--- a/test/test-nautilus-preferences-change.c
+++ b/test/test-nautilus-preferences-change.c
@@ -94,7 +94,7 @@ picker_new (const char *name,
 	
 	string_picker = eel_string_picker_new ();
 	eel_caption_set_title_label (EEL_CAPTION (string_picker), name);
-	gtk_signal_connect (GTK_OBJECT (string_picker), "changed", GTK_SIGNAL_FUNC (int_picker_changed_callback),
+	g_signal_connect (G_OBJECT (string_picker), "changed", GTK_SIGNAL_FUNC (int_picker_changed_callback),
 			    (gpointer) name);
 	
 	eel_string_picker_set_string_list (EEL_STRING_PICKER (string_picker), entries);
@@ -118,7 +118,7 @@ user_level_picker_new (const char *name,
 	
 	string_picker = eel_string_picker_new ();
 	eel_caption_set_title_label (EEL_CAPTION (string_picker), name);
-	gtk_signal_connect (GTK_OBJECT (string_picker), "changed", GTK_SIGNAL_FUNC (user_level_picker_changed_callback),
+	g_signal_connect (G_OBJECT (string_picker), "changed", GTK_SIGNAL_FUNC (user_level_picker_changed_callback),
 			    (gpointer) name);
 	
 	eel_string_picker_set_string_list (EEL_STRING_PICKER (string_picker), entries);
diff --git a/test/test-nautilus-smooth-graphics.c b/test/test-nautilus-smooth-graphics.c
index 346ccf81c..82b8b7579 100644
--- a/test/test-nautilus-smooth-graphics.c
+++ b/test/test-nautilus-smooth-graphics.c
@@ -40,7 +40,7 @@ main (int argc, char * argv[])
 	nautilus_global_preferences_init ();
 
 	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	gtk_signal_connect (GTK_OBJECT (window), "delete_event", GTK_SIGNAL_FUNC (delete_event), NULL);
+	g_signal_connect (G_OBJECT (window), "delete_event", GTK_SIGNAL_FUNC (delete_event), NULL);
 	
 	button = gtk_toggle_button_new_with_label ("Smooth Graphics");
 
@@ -49,7 +49,7 @@ main (int argc, char * argv[])
 	
 	gtk_container_add (GTK_CONTAINER (window), button);
 
-	gtk_signal_connect (GTK_OBJECT (button),
+	g_signal_connect (G_OBJECT (button),
 			    "toggled",
 			    GTK_SIGNAL_FUNC (button_toggled),
 			    NULL);
diff --git a/test/test-nautilus-wrap-table.c b/test/test-nautilus-wrap-table.c
index d2756c9fa..4d7c7fe0b 100644
--- a/test/test-nautilus-wrap-table.c
+++ b/test/test-nautilus-wrap-table.c
@@ -45,7 +45,7 @@ main (int argc, char* argv[])
 	 * This must be done after the widget is realized, due to
 	 * an apparent bug in gtk_viewport_set_shadow_type.
 	 */
-// 	gtk_signal_connect (GTK_OBJECT (GTK_BIN (scroller)->child), 
+// 	g_signal_connect (G_OBJECT (GTK_BIN (scroller)->child), 
 // 			    "realize", 
 // 			    remove_default_viewport_shadow, 
 // 			    NULL);
diff --git a/test/test.c b/test/test.c
index 68949a066..73a67af21 100644
--- a/test/test.c
+++ b/test/test.c
@@ -58,7 +58,7 @@ test_window_new (const char *title, guint border_width)
 		gtk_window_set_title (GTK_WINDOW (window), title);
 	}
 
-	gtk_signal_connect (GTK_OBJECT (window),
+	g_signal_connect (G_OBJECT (window),
 			    "delete_event",
 			    GTK_SIGNAL_FUNC (test_delete_event),
 			    NULL);
author	Darin Adler <darin@src.gnome.org>	2001-11-04 21:41:24 +0000
committer	Darin Adler <darin@src.gnome.org>	2001-11-04 21:41:24 +0000
commit	bdcd47873fc00c8f0013a2ecc85731622b961326 (patch)
tree	55a16398d6ad6c5ec459a2be9ce8d812338295c8
parent	137cfdb8850ee9cdb2f5b340238de5eec0f60fb0 (diff)
download	nautilus-bdcd47873fc00c8f0013a2ecc85731622b961326.tar.gz