Normalize signal names

https://bugzilla.gnome.org/show_bug.cgi?id=692234

19 files changed, 122 insertions, 122 deletions

diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index 047090108..e9cfcc5ae 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -262,7 +262,7 @@ menu_provider_items_updated_handler (NautilusMenuProvider *provider, GtkWidget*
 {
 
 	g_signal_emit_by_name (nautilus_signaller_get_current (),
-			       "popup_menu_changed");
+			       "popup-menu-changed");
 }
 
 static void
@@ -276,7 +276,7 @@ menu_provider_init_callback (void)
         for (l = providers; l != NULL; l = l->next) {
                 NautilusMenuProvider *provider = NAUTILUS_MENU_PROVIDER (l->data);
 
-		g_signal_connect_after (G_OBJECT (provider), "items_updated",
+		g_signal_connect_after (G_OBJECT (provider), "items-updated",
                            (GCallback)menu_provider_items_updated_handler,
                            NULL);
         }
@@ -429,7 +429,7 @@ get_desktop_manager_selection (GdkDisplay *display, int screen)
 						 selection_atom,
 						 gdk_x11_get_server_time (gtk_widget_get_window (selection_widget)))) {
 		
-		g_signal_connect (selection_widget, "selection_get",
+		g_signal_connect (selection_widget, "selection-get",
 				  G_CALLBACK (selection_get_cb), NULL);
 		return selection_widget;
 	}
@@ -479,7 +479,7 @@ nautilus_application_create_desktop_windows (NautilusApplication *application)
 			window = nautilus_desktop_window_new (GTK_APPLICATION (application),
 							      gdk_display_get_screen (display, i));
 
-			g_signal_connect (selection_widget, "selection_clear_event",
+			g_signal_connect (selection_widget, "selection-clear-event",
 					  G_CALLBACK (selection_clear_event_cb), window);
 			
 			g_signal_connect (window, "unrealize",
diff --git a/src/nautilus-bookmarks-window.c b/src/nautilus-bookmarks-window.c
index 7032fbfc0..8b15c6c11 100644
--- a/src/nautilus-bookmarks-window.c
+++ b/src/nautilus-bookmarks-window.c
@@ -816,7 +816,7 @@ nautilus_bookmarks_window_constructed (GObject *object)
 	self->priv->name_changed_id =
 		g_signal_connect (self->priv->name_field, "changed",
 				  G_CALLBACK (on_name_field_changed), self);
-	g_signal_connect (self->priv->name_field, "focus_out_event",
+	g_signal_connect (self->priv->name_field, "focus-out-event",
 			  G_CALLBACK (on_text_field_focus_out_event), self);
 	g_signal_connect (self->priv->name_field, "activate",
 			  G_CALLBACK (name_or_uri_field_activate), self);
@@ -824,7 +824,7 @@ nautilus_bookmarks_window_constructed (GObject *object)
 	self->priv->uri_changed_id =
 		g_signal_connect (self->priv->uri_field, "changed",
 				  G_CALLBACK (on_uri_field_changed), self);
-	g_signal_connect (self->priv->uri_field, "focus_out_event",
+	g_signal_connect (self->priv->uri_field, "focus-out-event",
 			  G_CALLBACK (on_text_field_focus_out_event), self);
 	g_signal_connect (self->priv->uri_field, "activate",
 			  G_CALLBACK (name_or_uri_field_activate), self);
diff --git a/src/nautilus-canvas-view.c b/src/nautilus-canvas-view.c
index e25d32707..2cfe145d7 100644
--- a/src/nautilus-canvas-view.c
+++ b/src/nautilus-canvas-view.c
@@ -941,14 +941,14 @@ nautilus_canvas_view_set_zoom_level (NautilusCanvasView *view,
 	canvas_container = get_canvas_container (view);
 	if (nautilus_canvas_container_get_zoom_level (canvas_container) == new_level) {
 		if (always_emit) {
-			g_signal_emit_by_name (view, "zoom_level_changed");
+			g_signal_emit_by_name (view, "zoom-level-changed");
 		}
 		return;
 	}
 
 	nautilus_canvas_container_set_zoom_level (canvas_container, new_level);
 
-	g_signal_emit_by_name (view, "zoom_level_changed");
+	g_signal_emit_by_name (view, "zoom-level-changed");
 	
 	if (nautilus_view_get_active (NAUTILUS_VIEW (view))) {
 		nautilus_view_update_menus (NAUTILUS_VIEW (view));
@@ -1911,51 +1911,51 @@ create_canvas_container (NautilusCanvasView *canvas_view)
 	
 	g_signal_connect_object (canvas_container, "activate",	
 				 G_CALLBACK (canvas_container_activate_callback), canvas_view, 0);
-	g_signal_connect_object (canvas_container, "activate_alternate",	
+	g_signal_connect_object (canvas_container, "activate-alternate",	
 				 G_CALLBACK (canvas_container_activate_alternate_callback), canvas_view, 0);
-	g_signal_connect_object (canvas_container, "activate_previewer",
+	g_signal_connect_object (canvas_container, "activate-previewer",
 				 G_CALLBACK (canvas_container_activate_previewer_callback), canvas_view, 0);
-	g_signal_connect_object (canvas_container, "band_select_started",
+	g_signal_connect_object (canvas_container, "band-select-started",
 				 G_CALLBACK (band_select_started_callback), canvas_view, 0);
-	g_signal_connect_object (canvas_container, "band_select_ended",
+	g_signal_connect_object (canvas_container, "band-select-ended",
 				 G_CALLBACK (band_select_ended_callback), canvas_view, 0);
-	g_signal_connect_object (canvas_container, "context_click_selection",
+	g_signal_connect_object (canvas_container, "context-click-selection",
 				 G_CALLBACK (canvas_container_context_click_selection_callback), canvas_view, 0);
-	g_signal_connect_object (canvas_container, "context_click_background",
+	g_signal_connect_object (canvas_container, "context-click-background",
 				 G_CALLBACK (canvas_container_context_click_background_callback), canvas_view, 0);
-	g_signal_connect_object (canvas_container, "icon_position_changed",
+	g_signal_connect_object (canvas_container, "icon-position-changed",
 				 G_CALLBACK (icon_position_changed_callback), canvas_view, 0);
-	g_signal_connect_object (canvas_container, "selection_changed",
+	g_signal_connect_object (canvas_container, "selection-changed",
 				 G_CALLBACK (selection_changed_callback), canvas_view, 0);
 	/* FIXME: many of these should move into fm-canvas-container as virtual methods */
-	g_signal_connect_object (canvas_container, "get_icon_uri",
+	g_signal_connect_object (canvas_container, "get-icon-uri",
 				 G_CALLBACK (get_icon_uri_callback), canvas_view, 0);
-	g_signal_connect_object (canvas_container, "get_icon_drop_target_uri",
+	g_signal_connect_object (canvas_container, "get-icon-drop-target-uri",
 				 G_CALLBACK (get_icon_drop_target_uri_callback), canvas_view, 0);
-	g_signal_connect_object (canvas_container, "move_copy_items",
+	g_signal_connect_object (canvas_container, "move-copy-items",
 				 G_CALLBACK (canvas_view_move_copy_items), canvas_view, 0);
-	g_signal_connect_object (canvas_container, "get_container_uri",
+	g_signal_connect_object (canvas_container, "get-container-uri",
 				 G_CALLBACK (canvas_view_get_container_uri), canvas_view, 0);
-	g_signal_connect_object (canvas_container, "can_accept_item",
+	g_signal_connect_object (canvas_container, "can-accept-item",
 				 G_CALLBACK (canvas_view_can_accept_item), canvas_view, 0);
-	g_signal_connect_object (canvas_container, "get_stored_icon_position",
+	g_signal_connect_object (canvas_container, "get-stored-icon-position",
 				 G_CALLBACK (get_stored_icon_position_callback), canvas_view, 0);
-	g_signal_connect_object (canvas_container, "layout_changed",
+	g_signal_connect_object (canvas_container, "layout-changed",
 				 G_CALLBACK (layout_changed_callback), canvas_view, 0);
-	g_signal_connect_object (canvas_container, "icon_rename_started",
+	g_signal_connect_object (canvas_container, "icon-rename-started",
 				 G_CALLBACK (icon_rename_started_cb), canvas_view, 0);
-	g_signal_connect_object (canvas_container, "icon_rename_ended",
+	g_signal_connect_object (canvas_container, "icon-rename-ended",
 				 G_CALLBACK (icon_rename_ended_cb), canvas_view, 0);
-	g_signal_connect_object (canvas_container, "icon_stretch_started",
+	g_signal_connect_object (canvas_container, "icon-stretch-started",
 				 G_CALLBACK (nautilus_view_update_menus), canvas_view,
 				 G_CONNECT_SWAPPED);
-	g_signal_connect_object (canvas_container, "icon_stretch_ended",
+	g_signal_connect_object (canvas_container, "icon-stretch-ended",
 				 G_CALLBACK (nautilus_view_update_menus), canvas_view,
 				 G_CONNECT_SWAPPED);
 
-	g_signal_connect_object (canvas_container, "get_stored_layout_timestamp",
+	g_signal_connect_object (canvas_container, "get-stored-layout-timestamp",
 				 G_CALLBACK (get_stored_layout_timestamp), canvas_view, 0);
-	g_signal_connect_object (canvas_container, "store_layout_timestamp",
+	g_signal_connect_object (canvas_container, "store-layout-timestamp",
 				 G_CALLBACK (store_layout_timestamp), canvas_view, 0);
 
 	gtk_container_add (GTK_CONTAINER (canvas_view),
@@ -2228,20 +2228,20 @@ nautilus_canvas_view_init (NautilusCanvasView *canvas_view)
 				  G_CALLBACK (text_attribute_names_changed_callback),
 				  canvas_view);
 
-	g_signal_connect_object (canvas_container, "handle_netscape_url",
+	g_signal_connect_object (canvas_container, "handle-netscape-url",
 				 G_CALLBACK (canvas_view_handle_netscape_url), canvas_view, 0);
-	g_signal_connect_object (canvas_container, "handle_uri_list",
+	g_signal_connect_object (canvas_container, "handle-uri-list",
 				 G_CALLBACK (canvas_view_handle_uri_list), canvas_view, 0);
-	g_signal_connect_object (canvas_container, "handle_text",
+	g_signal_connect_object (canvas_container, "handle-text",
 				 G_CALLBACK (canvas_view_handle_text), canvas_view, 0);
-	g_signal_connect_object (canvas_container, "handle_raw",
+	g_signal_connect_object (canvas_container, "handle-raw",
 				 G_CALLBACK (canvas_view_handle_raw), canvas_view, 0);
-	g_signal_connect_object (canvas_container, "handle_hover",
+	g_signal_connect_object (canvas_container, "handle-hover",
 				 G_CALLBACK (canvas_view_handle_hover), canvas_view, 0);
 
 	canvas_view->details->clipboard_handler_id =
 		g_signal_connect (nautilus_clipboard_monitor_get (),
-		                  "clipboard_info",
+		                  "clipboard-info",
 		                  G_CALLBACK (canvas_view_notify_clipboard_info), canvas_view);
 }
 
diff --git a/src/nautilus-desktop-canvas-view.c b/src/nautilus-desktop-canvas-view.c
index 0f1ec3829..4d7c36243 100644
--- a/src/nautilus-desktop-canvas-view.c
+++ b/src/nautilus-desktop-canvas-view.c
@@ -359,7 +359,7 @@ nautilus_desktop_canvas_view_handle_middle_click (NautilusCanvasContainer *canva
 
 	/* Stop the event because we don't want anyone else dealing with it. */	
 	gdk_flush ();
-	g_signal_stop_emission_by_name (canvas_container, "middle_click");
+	g_signal_stop_emission_by_name (canvas_container, "middle-click");
 
 	/* build an X event to represent the middle click. */
 	x_event.type = ButtonPress;
@@ -491,7 +491,7 @@ delayed_init (NautilusDesktopCanvasView *desktop_canvas_view)
 {
 	/* Keep track of the load time. */
 	g_signal_connect_object (nautilus_view_get_model (NAUTILUS_VIEW (desktop_canvas_view)),
-				 "done_loading",
+				 "done-loading",
 				 G_CALLBACK (done_loading), desktop_canvas_view, 0);
 
 	/* Monitor desktop directory. */
@@ -554,7 +554,7 @@ nautilus_desktop_canvas_view_init (NautilusDesktopCanvasView *desktop_canvas_vie
 	 */
 	if (!nautilus_monitor_active ()) {
 		desktop_canvas_view->details->delayed_init_signal = g_signal_connect_object
-			(desktop_canvas_view, "begin_loading",
+			(desktop_canvas_view, "begin-loading",
 			 G_CALLBACK (delayed_init), desktop_canvas_view, 0);
 	}
 	
@@ -582,7 +582,7 @@ nautilus_desktop_canvas_view_init (NautilusDesktopCanvasView *desktop_canvas_vie
 	nautilus_view_set_show_foreign (NAUTILUS_VIEW (desktop_canvas_view),
 					FALSE);
 	
-	g_signal_connect_object (canvas_container, "middle_click",
+	g_signal_connect_object (canvas_container, "middle-click",
 				 G_CALLBACK (nautilus_desktop_canvas_view_handle_middle_click), desktop_canvas_view, 0);
 	g_signal_connect_object (desktop_canvas_view, "realize",
 				 G_CALLBACK (realized_callback), desktop_canvas_view, 0);
diff --git a/src/nautilus-desktop-item-properties.c b/src/nautilus-desktop-item-properties.c
index 529e1e926..18537ca12 100644
--- a/src/nautilus-desktop-item-properties.c
+++ b/src/nautilus-desktop-item-properties.c
@@ -350,7 +350,7 @@ build_grid (GtkWidget *container,
 		g_signal_connect (entry, "activate",
 				  G_CALLBACK (entry_activate_cb),
 				  container);
-		g_signal_connect (entry, "focus_out_event",
+		g_signal_connect (entry, "focus-out-event",
 				  G_CALLBACK (entry_focus_out_cb),
 				  container);
 		
@@ -363,7 +363,7 @@ build_grid (GtkWidget *container,
 					   target_table, G_N_ELEMENTS (target_table),
 					   GDK_ACTION_COPY | GDK_ACTION_MOVE);
 			
-			g_signal_connect (entry, "drag_data_received",
+			g_signal_connect (entry, "drag-data-received",
 					  G_CALLBACK (nautilus_desktop_item_properties_url_drag_data_received),
 					  entry);
 		} else if (strcmp (item_entry->field, "Exec") == 0) {
@@ -372,7 +372,7 @@ build_grid (GtkWidget *container,
 					   target_table, G_N_ELEMENTS (target_table),
 					   GDK_ACTION_COPY | GDK_ACTION_MOVE);
 			
-			g_signal_connect (entry, "drag_data_received",
+			g_signal_connect (entry, "drag-data-received",
 					  G_CALLBACK (nautilus_desktop_item_properties_exec_drag_data_received),
 					  entry);
 		}
diff --git a/src/nautilus-desktop-window.c b/src/nautilus-desktop-window.c
index 6fabf815c..8b64d5553 100644
--- a/src/nautilus-desktop-window.c
+++ b/src/nautilus-desktop-window.c
@@ -251,7 +251,7 @@ realize (GtkWidget *widget)
 	set_desktop_window_id (window, gtk_widget_get_window (widget));
 
 	details->size_changed_id =
-		g_signal_connect (gtk_window_get_screen (GTK_WINDOW (window)), "size_changed",
+		g_signal_connect (gtk_window_get_screen (GTK_WINDOW (window)), "size-changed",
 				  G_CALLBACK (nautilus_desktop_window_screen_size_changed), window);
 }
 
diff --git a/src/nautilus-file-management-properties.c b/src/nautilus-file-management-properties.c
index da18bba03..2e20cfad8 100644
--- a/src/nautilus-file-management-properties.c
+++ b/src/nautilus-file-management-properties.c
@@ -476,7 +476,7 @@ nautilus_file_management_properties_dialog_setup_list_column_page (GtkBuilder *b
 	chooser = nautilus_column_chooser_new (NULL);
 	g_signal_connect (chooser, "changed",
 			  G_CALLBACK (columns_changed_callback), chooser);
-	g_signal_connect (chooser, "use_default",
+	g_signal_connect (chooser, "use-default",
 			  G_CALLBACK (use_default_callback), chooser);
 
 	set_columns_from_settings (NAUTILUS_COLUMN_CHOOSER (chooser));
diff --git a/src/nautilus-image-properties-page.c b/src/nautilus-image-properties-page.c
index ba032a0f6..dd67ab9be 100644
--- a/src/nautilus-image-properties-page.c
+++ b/src/nautilus-image-properties-page.c
@@ -593,7 +593,7 @@ file_open_callback (GObject      *object,
 		g_free (mime_type);
 
 		g_signal_connect (page->details->loader,
-				  "size_prepared",
+				  "size-prepared",
 				  G_CALLBACK (size_prepared_callback),
 				  page);
 
diff --git a/src/nautilus-list-model.c b/src/nautilus-list-model.c
index ba8cb59c9..6ddcac6a0 100644
--- a/src/nautilus-list-model.c
+++ b/src/nautilus-list-model.c
@@ -1428,7 +1428,7 @@ nautilus_list_model_class_init (NautilusListModelClass *klass)
 	object_class->dispose = nautilus_list_model_dispose;
 
       list_model_signals[SUBDIRECTORY_UNLOADED] =
-        g_signal_new ("subdirectory_unloaded",
+        g_signal_new ("subdirectory-unloaded",
                       NAUTILUS_TYPE_LIST_MODEL,
                       G_SIGNAL_RUN_FIRST,
                       G_STRUCT_OFFSET (NautilusListModelClass, subdirectory_unloaded),
diff --git a/src/nautilus-list-view.c b/src/nautilus-list-view.c
index 90f3c50af..9d31ba6b7 100644
--- a/src/nautilus-list-view.c
+++ b/src/nautilus-list-view.c
@@ -1403,49 +1403,49 @@ create_and_set_up_tree_view (NautilusListView *view)
 		nautilus_tree_view_drag_dest_new (view->details->tree_view);
 
 	g_signal_connect_object (view->details->drag_dest,
-				 "get_root_uri",
+				 "get-root-uri",
 				 G_CALLBACK (get_root_uri_callback),
 				 view, 0);
 	g_signal_connect_object (view->details->drag_dest,
-				 "get_file_for_path",
+				 "get-file-for-path",
 				 G_CALLBACK (get_file_for_path_callback),
 				 view, 0);
 	g_signal_connect_object (view->details->drag_dest,
-				 "move_copy_items",
+				 "move-copy-items",
 				 G_CALLBACK (move_copy_items_callback),
 				 view, 0);
-	g_signal_connect_object (view->details->drag_dest, "handle_netscape_url",
+	g_signal_connect_object (view->details->drag_dest, "handle-netscape-url",
 				 G_CALLBACK (list_view_handle_netscape_url), view, 0);
-	g_signal_connect_object (view->details->drag_dest, "handle_uri_list",
+	g_signal_connect_object (view->details->drag_dest, "handle-uri-list",
 				 G_CALLBACK (list_view_handle_uri_list), view, 0);
-	g_signal_connect_object (view->details->drag_dest, "handle_text",
+	g_signal_connect_object (view->details->drag_dest, "handle-text",
 				 G_CALLBACK (list_view_handle_text), view, 0);
-	g_signal_connect_object (view->details->drag_dest, "handle_raw",
+	g_signal_connect_object (view->details->drag_dest, "handle-raw",
 				 G_CALLBACK (list_view_handle_raw), view, 0);
-	g_signal_connect_object (view->details->drag_dest, "handle_hover",
+	g_signal_connect_object (view->details->drag_dest, "handle-hover",
 				 G_CALLBACK (list_view_handle_hover), view, 0);
 
 	g_signal_connect_object (gtk_tree_view_get_selection (view->details->tree_view),
 				 "changed",
 				 G_CALLBACK (list_selection_changed_callback), view, 0);
 
-	g_signal_connect_object (view->details->tree_view, "drag_begin",
+	g_signal_connect_object (view->details->tree_view, "drag-begin",
 				 G_CALLBACK (drag_begin_callback), view, 0);
-	g_signal_connect_object (view->details->tree_view, "drag_data_get",
+	g_signal_connect_object (view->details->tree_view, "drag-data-get",
 				 G_CALLBACK (drag_data_get_callback), view, 0);
-	g_signal_connect_object (view->details->tree_view, "motion_notify_event",
+	g_signal_connect_object (view->details->tree_view, "motion-notify-event",
 				 G_CALLBACK (motion_notify_callback), view, 0);
-	g_signal_connect_object (view->details->tree_view, "enter_notify_event",
+	g_signal_connect_object (view->details->tree_view, "enter-notify-event",
 				 G_CALLBACK (enter_notify_callback), view, 0);
-	g_signal_connect_object (view->details->tree_view, "leave_notify_event",
+	g_signal_connect_object (view->details->tree_view, "leave-notify-event",
 				 G_CALLBACK (leave_notify_callback), view, 0);
-	g_signal_connect_object (view->details->tree_view, "button_press_event",
+	g_signal_connect_object (view->details->tree_view, "button-press-event",
 				 G_CALLBACK (button_press_callback), view, 0);
-	g_signal_connect_object (view->details->tree_view, "button_release_event",
+	g_signal_connect_object (view->details->tree_view, "button-release-event",
 				 G_CALLBACK (button_release_callback), view, 0);
-	g_signal_connect_object (view->details->tree_view, "key_press_event",
+	g_signal_connect_object (view->details->tree_view, "key-press-event",
 				 G_CALLBACK (key_press_callback), view, 0);
-	g_signal_connect_object (view->details->tree_view, "popup_menu",
+	g_signal_connect_object (view->details->tree_view, "popup-menu",
                                  G_CALLBACK (popup_menu_callback), view, 0);
 	g_signal_connect_object (view->details->tree_view, "row-activated",
                                  G_CALLBACK (row_activated_callback), view, 0);
@@ -1456,10 +1456,10 @@ create_and_set_up_tree_view (NautilusListView *view)
 	nautilus_list_model_set_drag_view (NAUTILUS_LIST_MODEL (view->details->model),
 				     view->details->tree_view,  0, 0);
 
-	g_signal_connect_object (view->details->model, "sort_column_changed",
+	g_signal_connect_object (view->details->model, "sort-column-changed",
 				 G_CALLBACK (sort_column_changed_callback), view, 0);
 	
-	g_signal_connect_object (view->details->model, "subdirectory_unloaded",
+	g_signal_connect_object (view->details->model, "subdirectory-unloaded",
 				 G_CALLBACK (subdirectory_unloaded_callback), view, 0);
 
 	gtk_tree_selection_set_mode (gtk_tree_view_get_selection (view->details->tree_view), GTK_SELECTION_MULTIPLE);
@@ -2318,7 +2318,7 @@ create_column_editor (NautilusListView *view)
 	g_signal_connect (column_chooser, "changed",
 			  G_CALLBACK (column_chooser_changed_callback),
 			  view);
-	g_signal_connect (column_chooser, "use_default",
+	g_signal_connect (column_chooser, "use-default",
 			  G_CALLBACK (column_chooser_use_default_callback),
 			  view);
 
@@ -2456,13 +2456,13 @@ nautilus_list_view_set_zoom_level (NautilusListView *view,
 
 	if (view->details->zoom_level == new_level) {
 		if (always_emit) {
-			g_signal_emit_by_name (NAUTILUS_VIEW(view), "zoom_level_changed");
+			g_signal_emit_by_name (NAUTILUS_VIEW(view), "zoom-level-changed");
 		}
 		return;
 	}
 
 	view->details->zoom_level = new_level;
-	g_signal_emit_by_name (NAUTILUS_VIEW(view), "zoom_level_changed");
+	g_signal_emit_by_name (NAUTILUS_VIEW(view), "zoom-level-changed");
 
 	/* Select correctly scaled icons. */
 	column = nautilus_list_model_get_column_id_from_zoom_level (new_level);
@@ -2980,7 +2980,7 @@ nautilus_list_view_init (NautilusListView *list_view)
 	list_view->details->hover_path = NULL;
 	list_view->details->clipboard_handler_id =
 		g_signal_connect (nautilus_clipboard_monitor_get (),
-		                  "clipboard_info",
+		                  "clipboard-info",
 		                  G_CALLBACK (list_view_notify_clipboard_info), list_view);
 }
 
diff --git a/src/nautilus-location-entry.c b/src/nautilus-location-entry.c
index e3ff04aef..8dc7db7f8 100644
--- a/src/nautilus-location-entry.c
+++ b/src/nautilus-location-entry.c
@@ -718,7 +718,7 @@ nautilus_location_entry_init (NautilusLocationEntry *entry)
 
 	nautilus_entry_set_special_tab_handling (NAUTILUS_ENTRY (entry), TRUE);
 
-	g_signal_connect (entry, "event_after",
+	g_signal_connect (entry, "event-after",
 		          G_CALLBACK (editable_event_after_callback), entry);
 
 	g_signal_connect (entry, "notify::text",
@@ -727,11 +727,11 @@ nautilus_location_entry_init (NautilusLocationEntry *entry)
 	g_signal_connect (entry, "icon-release",
 			  G_CALLBACK (nautilus_location_entry_icon_release), NULL);
 
-	g_signal_connect (entry->details->completer, "got_completion_data",
+	g_signal_connect (entry->details->completer, "got-completion-data",
 		          G_CALLBACK (got_completion_data_callback), entry);
 
 	/* Drag source */
-	g_signal_connect_object (entry, "drag_data_get",
+	g_signal_connect_object (entry, "drag-data-get",
 				 G_CALLBACK (drag_data_get_callback), entry, 0);
 
 	/* Drag dest. */
@@ -739,7 +739,7 @@ nautilus_location_entry_init (NautilusLocationEntry *entry)
 			   GTK_DEST_DEFAULT_ALL,
 			   drop_types, G_N_ELEMENTS (drop_types),
 			   GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK);
-	g_signal_connect (entry, "drag_data_received",
+	g_signal_connect (entry, "drag-data-received",
 			  G_CALLBACK (drag_data_received_callback), NULL);
 
 	g_signal_connect_object (entry, "activate",
diff --git a/src/nautilus-mime-actions.c b/src/nautilus-mime-actions.c
index 538bb6b2d..a31047adb 100644
--- a/src/nautilus-mime-actions.c
+++ b/src/nautilus-mime-actions.c
@@ -1150,7 +1150,7 @@ open_with_response_cb (GtkDialog *dialog,
 
 	gtk_widget_destroy (GTK_WIDGET (dialog));
 
-	g_signal_emit_by_name (nautilus_signaller_get_current (), "mime_data_changed");
+	g_signal_emit_by_name (nautilus_signaller_get_current (), "mime-data-changed");
 
 	files.next = NULL;
 	files.prev = NULL;
diff --git a/src/nautilus-pathbar.c b/src/nautilus-pathbar.c
index 58020015b..ee60b5846 100644
--- a/src/nautilus-pathbar.c
+++ b/src/nautilus-pathbar.c
@@ -213,10 +213,10 @@ nautilus_path_bar_init (NautilusPathBar *path_bar)
         g_signal_connect_swapped (path_bar->priv->up_slider_button, "clicked", G_CALLBACK (nautilus_path_bar_scroll_up), path_bar);
         g_signal_connect_swapped (path_bar->priv->down_slider_button, "clicked", G_CALLBACK (nautilus_path_bar_scroll_down), path_bar);
 
-        g_signal_connect (path_bar->priv->up_slider_button, "button_press_event", G_CALLBACK (nautilus_path_bar_slider_button_press), path_bar);
-        g_signal_connect (path_bar->priv->up_slider_button, "button_release_event", G_CALLBACK (nautilus_path_bar_slider_button_release), path_bar);
-        g_signal_connect (path_bar->priv->down_slider_button, "button_press_event", G_CALLBACK (nautilus_path_bar_slider_button_press), path_bar);
-        g_signal_connect (path_bar->priv->down_slider_button, "button_release_event", G_CALLBACK (nautilus_path_bar_slider_button_release), path_bar);
+        g_signal_connect (path_bar->priv->up_slider_button, "button-press-event", G_CALLBACK (nautilus_path_bar_slider_button_press), path_bar);
+        g_signal_connect (path_bar->priv->up_slider_button, "button-release-event", G_CALLBACK (nautilus_path_bar_slider_button_release), path_bar);
+        g_signal_connect (path_bar->priv->down_slider_button, "button-press-event", G_CALLBACK (nautilus_path_bar_slider_button_press), path_bar);
+        g_signal_connect (path_bar->priv->down_slider_button, "button-release-event", G_CALLBACK (nautilus_path_bar_slider_button_release), path_bar);
 
 	gtk_drag_dest_set (GTK_WIDGET (path_bar->priv->up_slider_button),
 			   0, NULL, 0, 0);
diff --git a/src/nautilus-places-sidebar.c b/src/nautilus-places-sidebar.c
index 8830fe05b..79c7f0d45 100644
--- a/src/nautilus-places-sidebar.c
+++ b/src/nautilus-places-sidebar.c
@@ -3344,7 +3344,7 @@ nautilus_places_sidebar_init (NautilusPlacesSidebar *sidebar)
 				  sidebar);
 
 	g_signal_connect_object (nautilus_trash_monitor_get (),
-				 "trash_state_changed",
+				 "trash-state-changed",
 				 G_CALLBACK (trash_state_changed_cb),
 				 sidebar, 0);
 }
@@ -3447,23 +3447,23 @@ nautilus_places_sidebar_set_parent_window (NautilusPlacesSidebar *sidebar,
 					  G_CALLBACK (update_places),
 					  sidebar);
 
-	g_signal_connect_object (sidebar->volume_monitor, "volume_added",
+	g_signal_connect_object (sidebar->volume_monitor, "volume-added",
 				 G_CALLBACK (volume_added_callback), sidebar, 0);
-	g_signal_connect_object (sidebar->volume_monitor, "volume_removed",
+	g_signal_connect_object (sidebar->volume_monitor, "volume-removed",
 				 G_CALLBACK (volume_removed_callback), sidebar, 0);
-	g_signal_connect_object (sidebar->volume_monitor, "volume_changed",
+	g_signal_connect_object (sidebar->volume_monitor, "volume-changed",
 				 G_CALLBACK (volume_changed_callback), sidebar, 0);
-	g_signal_connect_object (sidebar->volume_monitor, "mount_added",
+	g_signal_connect_object (sidebar->volume_monitor, "mount-added",
 				 G_CALLBACK (mount_added_callback), sidebar, 0);
-	g_signal_connect_object (sidebar->volume_monitor, "mount_removed",
+	g_signal_connect_object (sidebar->volume_monitor, "mount-removed",
 				 G_CALLBACK (mount_removed_callback), sidebar, 0);
-	g_signal_connect_object (sidebar->volume_monitor, "mount_changed",
+	g_signal_connect_object (sidebar->volume_monitor, "mount-changed",
 				 G_CALLBACK (mount_changed_callback), sidebar, 0);
-	g_signal_connect_object (sidebar->volume_monitor, "drive_disconnected",
+	g_signal_connect_object (sidebar->volume_monitor, "drive-disconnected",
 				 G_CALLBACK (drive_disconnected_callback), sidebar, 0);
-	g_signal_connect_object (sidebar->volume_monitor, "drive_connected",
+	g_signal_connect_object (sidebar->volume_monitor, "drive-connected",
 				 G_CALLBACK (drive_connected_callback), sidebar, 0);
-	g_signal_connect_object (sidebar->volume_monitor, "drive_changed",
+	g_signal_connect_object (sidebar->volume_monitor, "drive-changed",
 				 G_CALLBACK (drive_changed_callback), sidebar, 0);
 
 	update_places (sidebar);
diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c
index e3697a738..6793b7af1 100644
--- a/src/nautilus-properties-window.c
+++ b/src/nautilus-properties-window.c
@@ -539,7 +539,7 @@ create_image_widget (NautilusPropertiesWindow *window,
 				   target_table, G_N_ELEMENTS (target_table),
 				   GDK_ACTION_COPY | GDK_ACTION_MOVE);
 
-		g_signal_connect (image, "drag_data_received",
+		g_signal_connect (image, "drag-data-received",
 				  G_CALLBACK (nautilus_properties_window_drag_data_received), NULL);
 		g_signal_connect (button, "clicked",
 				  G_CALLBACK (select_image_button_callback), window);
@@ -594,7 +594,7 @@ set_name_field (NautilusPropertiesWindow *window,
 						 GTK_POS_RIGHT, 1, 1);
 			gtk_label_set_mnemonic_widget (GTK_LABEL (window->details->name_label), window->details->name_field);
 
-			g_signal_connect_object (window->details->name_field, "focus_out_event",
+			g_signal_connect_object (window->details->name_field, "focus-out-event",
 						 G_CALLBACK (name_field_focus_out), window, 0);
 			g_signal_connect_object (window->details->name_field, "activate",
 						 G_CALLBACK (name_field_activate), window, 0);
@@ -1001,7 +1001,7 @@ start_deep_count_for_file (NautilusPropertiesWindow *window,
 		nautilus_file_recompute_deep_counts (file);
 		if (!window->details->deep_count_finished) {
 			g_signal_connect_object (file,
-						 "updated_deep_count_in_progress",
+						 "updated-deep-count-in-progress",
 						 G_CALLBACK (schedule_directory_contents_update),
 						 window, G_CONNECT_SWAPPED);
 			schedule_start_spinner (window);
diff --git a/src/nautilus-trash-bar.c b/src/nautilus-trash-bar.c
index c41f48bc5..cf6e2fc1a 100644
--- a/src/nautilus-trash-bar.c
+++ b/src/nautilus-trash-bar.c
@@ -213,7 +213,7 @@ nautilus_trash_bar_init (NautilusTrashBar *bar)
 				     _("Delete all items in the Trash"));
 
 	g_signal_connect_object (nautilus_trash_monitor_get (),
-				 "trash_state_changed",
+				 "trash-state-changed",
 				 G_CALLBACK (nautilus_trash_bar_trash_state_changed),
 				 bar,
 				 0);
diff --git a/src/nautilus-view.c b/src/nautilus-view.c
index 144c642f6..074a153b7 100644
--- a/src/nautilus-view.c
+++ b/src/nautilus-view.c
@@ -1188,7 +1188,7 @@ app_chooser_dialog_response_cb (GtkDialog *dialog,
 	info = gtk_app_chooser_get_app_info (GTK_APP_CHOOSER (dialog));
 	file = g_object_get_data (G_OBJECT (dialog), "directory-view:file");
 
-	g_signal_emit_by_name (nautilus_signaller_get_current (), "mime_data_changed");
+	g_signal_emit_by_name (nautilus_signaller_get_current (), "mime-data-changed");
 
 	files.next = NULL;
 	files.prev = NULL;
@@ -1883,7 +1883,7 @@ new_folder_done (GFile *new_folder,
 		target_uri = nautilus_file_get_uri (file);
 
 		g_signal_connect_data (directory_view,
-				       "remove_file",
+				       "remove-file",
 				       G_CALLBACK (rename_newly_added_folder),
 				       sdata,
 				       (GClosureNotify)NULL,
@@ -1907,7 +1907,7 @@ new_folder_done (GFile *new_folder,
 			 * must use connect_after.
 			 */
 			g_signal_connect_data (directory_view,
-					       "add_file",
+					       "add-file",
 					       G_CALLBACK (reveal_newly_added_folder),
 					       g_object_ref (new_folder),
 					       (GClosureNotify)g_object_unref,
@@ -1978,7 +1978,7 @@ nautilus_view_new_folder (NautilusView *directory_view,
 	data = new_folder_data_new (directory_view, with_selection);
 
 	g_signal_connect_data (directory_view,
-			       "add_file",
+			       "add-file",
 			       G_CALLBACK (track_newly_added_locations),
 			       data,
 			       (GClosureNotify)NULL,
@@ -2002,7 +2002,7 @@ setup_new_folder_data (NautilusView *directory_view)
 	data = new_folder_data_new (directory_view, FALSE);
 
 	g_signal_connect_data (directory_view,
-			       "add_file",
+			       "add-file",
 			       G_CALLBACK (track_newly_added_locations),
 			       data,
 			       (GClosureNotify)NULL,
@@ -2344,9 +2344,9 @@ add_directory_to_directory_list (NautilusView *view,
 						     FALSE, attributes,
 						     (NautilusDirectoryCallback)changed_callback, view);
 
-		g_signal_connect_object (directory, "files_added",
+		g_signal_connect_object (directory, "files-added",
 					 G_CALLBACK (changed_callback), view, 0);
-		g_signal_connect_object (directory, "files_changed",
+		g_signal_connect_object (directory, "files-changed",
 					 G_CALLBACK (changed_callback), view, 0);
 
 		*directory_list = g_list_append	(*directory_list, directory);
@@ -2643,7 +2643,7 @@ nautilus_view_init (NautilusView *view)
 	}
 	update_templates_directory (view);
 	g_signal_connect_object (nautilus_signaller_get_current (),
-				 "user_dirs_changed",
+				 "user-dirs-changed",
 				 G_CALLBACK (user_dirs_changed),
 				 view, G_CONNECT_SWAPPED);
 
@@ -2652,15 +2652,15 @@ nautilus_view_init (NautilusView *view)
 	view->details->show_hidden_files =
 		g_settings_get_boolean (gtk_filechooser_preferences, NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES);
 
-	g_signal_connect_object (nautilus_trash_monitor_get (), "trash_state_changed",
+	g_signal_connect_object (nautilus_trash_monitor_get (), "trash-state-changed",
 				 G_CALLBACK (nautilus_view_trash_state_changed_callback), view, 0);
 
 	/* React to clipboard changes */
-	g_signal_connect_object (nautilus_clipboard_monitor_get (), "clipboard_changed",
+	g_signal_connect_object (nautilus_clipboard_monitor_get (), "clipboard-changed",
 				 G_CALLBACK (clipboard_changed_callback), view, 0);
 
 	/* Register to menu provider extension signal managing menu updates */
-	g_signal_connect_object (nautilus_signaller_get_current (), "popup_menu_changed",
+	g_signal_connect_object (nautilus_signaller_get_current (), "popup-menu-changed",
 				 G_CALLBACK (schedule_update_menus), view, G_CONNECT_SWAPPED);
 
 	gtk_widget_show (GTK_WIDGET (view));
@@ -3184,7 +3184,7 @@ pre_copy_move (NautilusView *directory_view)
 	 * operate on. The ADD_FILE signal is registered as G_SIGNAL_RUN_LAST, so we
 	 * must use connect_after.
 	 */
-	g_signal_connect (directory_view, "add_file",
+	g_signal_connect (directory_view, "add-file",
 			  G_CALLBACK (pre_copy_move_add_file_callback), copy_move_done_data);
 
 	return copy_move_done_data;
@@ -3287,7 +3287,7 @@ copy_move_done_callback (GHashTable *debuting_files,
 			 * must use connect_after.
 			 */
 			g_signal_connect_data (directory_view,
-					       "add_file",
+					       "add-file",
 					       G_CALLBACK (debuting_files_add_file_callback),
 					       debuting_files_data,
 					       (GClosureNotify) debuting_files_data_free,
@@ -3877,10 +3877,10 @@ nautilus_view_add_subdirectory (NautilusView  *view,
 					     files_added_callback, view);
 	
 	g_signal_connect
-		(directory, "files_added",
+		(directory, "files-added",
 		 G_CALLBACK (files_added_callback), view);
 	g_signal_connect
-		(directory, "files_changed",
+		(directory, "files-changed",
 		 G_CALLBACK (files_changed_callback), view);
 	
 	view->details->subdirectory_list = g_list_prepend (
@@ -9159,10 +9159,10 @@ finish_loading (NautilusView *view)
 
 	/* Connect handlers to learn about loading progress. */
 	view->details->done_loading_handler_id = g_signal_connect
-		(view->details->model, "done_loading",
+		(view->details->model, "done-loading",
 		 G_CALLBACK (done_loading_callback), view);
 	view->details->load_error_handler_id = g_signal_connect
-		(view->details->model, "load_error",
+		(view->details->model, "load-error",
 		 G_CALLBACK (load_error_callback), view);
 
 	/* Monitor the things needed to get the right icon. Also
@@ -9185,10 +9185,10 @@ finish_loading (NautilusView *view)
 					     files_added_callback, view);
 
     	view->details->files_added_handler_id = g_signal_connect
-		(view->details->model, "files_added",
+		(view->details->model, "files-added",
 		 G_CALLBACK (files_added_callback), view);
 	view->details->files_changed_handler_id = g_signal_connect
-		(view->details->model, "files_changed",
+		(view->details->model, "files-changed",
 		 G_CALLBACK (files_changed_callback), view);
 
 	nautilus_profile_end (NULL);
@@ -9707,7 +9707,7 @@ nautilus_view_class_init (NautilusViewClass *klass)
 	scrolled_window_class->scrollbar_spacing = 0;
 
 	signals[ADD_FILE] =
-		g_signal_new ("add_file",
+		g_signal_new ("add-file",
 		              G_TYPE_FROM_CLASS (klass),
 		              G_SIGNAL_RUN_LAST,
 		              G_STRUCT_OFFSET (NautilusViewClass, add_file),
@@ -9715,7 +9715,7 @@ nautilus_view_class_init (NautilusViewClass *klass)
 		              g_cclosure_marshal_generic,
 		              G_TYPE_NONE, 2, NAUTILUS_TYPE_FILE, NAUTILUS_TYPE_DIRECTORY);
 	signals[BEGIN_FILE_CHANGES] =
-		g_signal_new ("begin_file_changes",
+		g_signal_new ("begin-file-changes",
 		              G_TYPE_FROM_CLASS (klass),
 		              G_SIGNAL_RUN_LAST,
 		              G_STRUCT_OFFSET (NautilusViewClass, begin_file_changes),
@@ -9723,7 +9723,7 @@ nautilus_view_class_init (NautilusViewClass *klass)
 		              g_cclosure_marshal_VOID__VOID,
 		              G_TYPE_NONE, 0);
 	signals[BEGIN_LOADING] =
-		g_signal_new ("begin_loading",
+		g_signal_new ("begin-loading",
 		              G_TYPE_FROM_CLASS (klass),
 		              G_SIGNAL_RUN_LAST,
 		              G_STRUCT_OFFSET (NautilusViewClass, begin_loading),
@@ -9739,7 +9739,7 @@ nautilus_view_class_init (NautilusViewClass *klass)
 		              g_cclosure_marshal_VOID__VOID,
 		              G_TYPE_NONE, 0);
 	signals[END_FILE_CHANGES] =
-		g_signal_new ("end_file_changes",
+		g_signal_new ("end-file-changes",
 		              G_TYPE_FROM_CLASS (klass),
 		              G_SIGNAL_RUN_LAST,
 		              G_STRUCT_OFFSET (NautilusViewClass, end_file_changes),
@@ -9747,7 +9747,7 @@ nautilus_view_class_init (NautilusViewClass *klass)
 		              g_cclosure_marshal_VOID__VOID,
 		              G_TYPE_NONE, 0);
 	signals[END_LOADING] =
-		g_signal_new ("end_loading",
+		g_signal_new ("end-loading",
 		              G_TYPE_FROM_CLASS (klass),
 		              G_SIGNAL_RUN_LAST,
 		              G_STRUCT_OFFSET (NautilusViewClass, end_loading),
@@ -9755,7 +9755,7 @@ nautilus_view_class_init (NautilusViewClass *klass)
 		              g_cclosure_marshal_VOID__BOOLEAN,
 		              G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
 	signals[FILE_CHANGED] =
-		g_signal_new ("file_changed",
+		g_signal_new ("file-changed",
 		              G_TYPE_FROM_CLASS (klass),
 		              G_SIGNAL_RUN_LAST,
 		              G_STRUCT_OFFSET (NautilusViewClass, file_changed),
@@ -9763,7 +9763,7 @@ nautilus_view_class_init (NautilusViewClass *klass)
 		              g_cclosure_marshal_generic,
 		              G_TYPE_NONE, 2, NAUTILUS_TYPE_FILE, NAUTILUS_TYPE_DIRECTORY);
 	signals[REMOVE_FILE] =
-		g_signal_new ("remove_file",
+		g_signal_new ("remove-file",
 		              G_TYPE_FROM_CLASS (klass),
 		              G_SIGNAL_RUN_LAST,
 		              G_STRUCT_OFFSET (NautilusViewClass, remove_file),
diff --git a/src/nautilus-window-menus.c b/src/nautilus-window-menus.c
index 97a428570..c8242bd42 100644
--- a/src/nautilus-window-menus.c
+++ b/src/nautilus-window-menus.c
@@ -733,7 +733,7 @@ nautilus_window_initialize_menus (NautilusWindow *window)
 	gtk_window_add_accel_group (GTK_WINDOW (window),
 				    gtk_ui_manager_get_accel_group (ui_manager));
 	
-	g_signal_connect (ui_manager, "connect_proxy",
+	g_signal_connect (ui_manager, "connect-proxy",
 			  G_CALLBACK (connect_proxy_cb), window);
 
 	/* add the UI */
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index 8a2b1c62d..6c67f5b32 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -539,7 +539,7 @@ nautilus_window_set_up_sidebar (NautilusWindow *window)
 
 	setup_side_pane_width (window);
 	g_signal_connect (window->details->sidebar, 
-			  "size_allocate",
+			  "size-allocate",
 			  G_CALLBACK (side_pane_size_allocate_callback),
 			  window);
 
@@ -1149,7 +1149,7 @@ nautilus_window_constructed (GObject *self)
 	nautilus_window_initialize_actions (window);
 
 	/* Register to menu provider extension signal managing menu updates */
-	g_signal_connect_object (nautilus_signaller_get_current (), "popup_menu_changed",
+	g_signal_connect_object (nautilus_signaller_get_current (), "popup-menu-changed",
 			 G_CALLBACK (nautilus_window_load_extension_menus), window, G_CONNECT_SWAPPED);
 	window->details->toolbar = create_toolbar (window);
 	gtk_container_add (GTK_CONTAINER (grid), window->details->toolbar);
@@ -1902,7 +1902,7 @@ nautilus_window_class_init (NautilusWindowClass *class)
 				      G_PARAM_STATIC_STRINGS);
 
 	signals[LOADING_URI] =
-		g_signal_new ("loading_uri",
+		g_signal_new ("loading-uri",
 			      G_TYPE_FROM_CLASS (class),
 			      G_SIGNAL_RUN_LAST,
 			      0,