[nautilus] Normalize signal names
- From: William Jon McCann <mccann src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus] Normalize signal names
- Date: Tue, 22 Jan 2013 15:49:29 +0000 (UTC)
commit d721a8f2066d3be044e2c26332cdb6371ad8e9b1
Author: William Jon McCann <jmccann redhat com>
Date: Mon Jan 21 23:13:37 2013 -0500
Normalize signal names
https://bugzilla.gnome.org/show_bug.cgi?id=692234
eel/eel-canvas.c | 12 ++--
eel/eel-editable-label.c | 80 ++++++++++----------
eel/eel-gtk-extensions.c | 2 +-
libnautilus-extension/nautilus-menu-provider.c | 4 +-
libnautilus-private/nautilus-canvas-container.c | 78 ++++++++++----------
libnautilus-private/nautilus-canvas-dnd.c | 28 ++++----
libnautilus-private/nautilus-canvas-item.c | 2 +-
libnautilus-private/nautilus-clipboard-monitor.c | 6 +-
libnautilus-private/nautilus-clipboard.c | 8 +-
libnautilus-private/nautilus-clipboard.h | 2 +-
libnautilus-private/nautilus-column-chooser.c | 4 +-
libnautilus-private/nautilus-desktop-background.c | 2 +-
libnautilus-private/nautilus-desktop-directory.c | 6 +-
.../nautilus-desktop-link-monitor.c | 6 +-
libnautilus-private/nautilus-desktop-link.c | 2 +-
libnautilus-private/nautilus-directory-async.c | 2 +-
libnautilus-private/nautilus-directory.c | 8 +-
libnautilus-private/nautilus-entry.c | 2 +-
libnautilus-private/nautilus-file-utilities.c | 2 +-
libnautilus-private/nautilus-file.c | 4 +-
.../nautilus-mime-application-chooser.c | 8 +-
libnautilus-private/nautilus-signaller.c | 8 +-
libnautilus-private/nautilus-trash-monitor.c | 2 +-
libnautilus-private/nautilus-tree-view-drag-dest.c | 26 +++---
src/nautilus-application.c | 8 +-
src/nautilus-bookmarks-window.c | 4 +-
src/nautilus-canvas-view.c | 58 +++++++-------
src/nautilus-desktop-canvas-view.c | 8 +-
src/nautilus-desktop-item-properties.c | 6 +-
src/nautilus-desktop-window.c | 2 +-
src/nautilus-file-management-properties.c | 2 +-
src/nautilus-image-properties-page.c | 2 +-
src/nautilus-list-model.c | 2 +-
src/nautilus-list-view.c | 46 ++++++------
src/nautilus-location-entry.c | 8 +-
src/nautilus-mime-actions.c | 2 +-
src/nautilus-pathbar.c | 8 +-
src/nautilus-places-sidebar.c | 20 +++---
src/nautilus-properties-window.c | 6 +-
src/nautilus-trash-bar.c | 2 +-
src/nautilus-view.c | 52 +++++++-------
src/nautilus-window-menus.c | 2 +-
src/nautilus-window.c | 6 +-
43 files changed, 274 insertions(+), 274 deletions(-)
---
diff --git a/eel/eel-canvas.c b/eel/eel-canvas.c
index 53c05ab..4fdef13 100644
--- a/eel/eel-canvas.c
+++ b/eel/eel-canvas.c
@@ -1835,7 +1835,7 @@ eel_canvas_accessible_adjustment_changed (GtkAdjustment *adjustment,
/* The scrollbars have changed */
atk_obj = ATK_OBJECT (data);
- g_signal_emit_by_name (atk_obj, "visible_data_changed");
+ g_signal_emit_by_name (atk_obj, "visible-data-changed");
}
static void
@@ -1850,11 +1850,11 @@ eel_canvas_accessible_initialize (AtkObject *obj,
gtk_accessible_set_widget (GTK_ACCESSIBLE (obj), GTK_WIDGET (data));
g_signal_connect (gtk_scrollable_get_hadjustment (GTK_SCROLLABLE (canvas)),
- "value_changed",
+ "value-changed",
G_CALLBACK (eel_canvas_accessible_adjustment_changed),
obj);
g_signal_connect (gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (canvas)),
- "value_changed",
+ "value-changed",
G_CALLBACK (eel_canvas_accessible_adjustment_changed),
obj);
@@ -1972,7 +1972,7 @@ eel_canvas_class_init (EelCanvasClass *klass)
klass->request_update = eel_canvas_request_update_real;
canvas_signals[DRAW_BACKGROUND] =
- g_signal_new ("draw_background",
+ g_signal_new ("draw-background",
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (EelCanvasClass, draw_background),
@@ -2300,9 +2300,9 @@ scroll_to (EelCanvas *canvas, int cx, int cy)
/* Signal GtkLayout that it should do a redraw. */
if (changed_x)
- g_signal_emit_by_name (hadjustment, "value_changed");
+ g_signal_emit_by_name (hadjustment, "value-changed");
if (changed_y)
- g_signal_emit_by_name (vadjustment, "value_changed");
+ g_signal_emit_by_name (vadjustment, "value-changed");
}
/* Size allocation handler for the canvas */
diff --git a/eel/eel-editable-label.c b/eel/eel-editable-label.c
index 62d2d98..17f7e1b 100644
--- a/eel/eel-editable-label.c
+++ b/eel/eel-editable-label.c
@@ -190,14 +190,14 @@ add_move_binding (GtkBindingSet *binding_set,
g_assert ((modmask & GDK_SHIFT_MASK) == 0);
gtk_binding_entry_add_signal (binding_set, keyval, modmask,
- "move_cursor", 3,
+ "move-cursor", 3,
G_TYPE_ENUM, step,
G_TYPE_INT, count,
G_TYPE_BOOLEAN, FALSE);
/* Selection-extending version */
gtk_binding_entry_add_signal (binding_set, keyval, modmask | GDK_SHIFT_MASK,
- "move_cursor", 3,
+ "move-cursor", 3,
G_TYPE_ENUM, step,
G_TYPE_INT, count,
G_TYPE_BOOLEAN, TRUE);
@@ -244,7 +244,7 @@ eel_editable_label_class_init (EelEditableLabelClass *class)
gtk_widget_class_set_accessible_type (widget_class, eel_editable_label_accessible_get_type ());
signals[MOVE_CURSOR] =
- g_signal_new ("move_cursor",
+ g_signal_new ("move-cursor",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (EelEditableLabelClass, move_cursor),
@@ -253,7 +253,7 @@ eel_editable_label_class_init (EelEditableLabelClass *class)
G_TYPE_NONE, 3, GTK_TYPE_MOVEMENT_STEP, G_TYPE_INT, G_TYPE_BOOLEAN);
signals[COPY_CLIPBOARD] =
- g_signal_new ("copy_clipboard",
+ g_signal_new ("copy-clipboard",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (EelEditableLabelClass, copy_clipboard),
@@ -262,7 +262,7 @@ eel_editable_label_class_init (EelEditableLabelClass *class)
G_TYPE_NONE, 0);
signals[POPULATE_POPUP] =
- g_signal_new ("populate_popup",
+ g_signal_new ("populate-popup",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (EelEditableLabelClass, populate_popup),
@@ -271,7 +271,7 @@ eel_editable_label_class_init (EelEditableLabelClass *class)
G_TYPE_NONE, 1, GTK_TYPE_MENU);
signals[DELETE_FROM_CURSOR] =
- g_signal_new ("delete_from_cursor",
+ g_signal_new ("delete-from-cursor",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (EelEditableLabelClass, delete_from_cursor),
@@ -280,7 +280,7 @@ eel_editable_label_class_init (EelEditableLabelClass *class)
G_TYPE_NONE, 2, GTK_TYPE_DELETE_TYPE, G_TYPE_INT);
signals[CUT_CLIPBOARD] =
- g_signal_new ("cut_clipboard",
+ g_signal_new ("cut-clipboard",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (EelEditableLabelClass, cut_clipboard),
@@ -289,7 +289,7 @@ eel_editable_label_class_init (EelEditableLabelClass *class)
G_TYPE_NONE, 0);
signals[PASTE_CLIPBOARD] =
- g_signal_new ("paste_clipboard",
+ g_signal_new ("paste-clipboard",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (EelEditableLabelClass, paste_clipboard),
@@ -298,7 +298,7 @@ eel_editable_label_class_init (EelEditableLabelClass *class)
G_TYPE_NONE, 0);
signals[TOGGLE_OVERWRITE] =
- g_signal_new ("toggle_overwrite",
+ g_signal_new ("toggle-overwrite",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (EelEditableLabelClass, toggle_overwrite),
@@ -439,74 +439,74 @@ eel_editable_label_class_init (EelEditableLabelClass *class)
/* Select all
*/
gtk_binding_entry_add_signal (binding_set, GDK_KEY_a, GDK_CONTROL_MASK,
- "move_cursor", 3,
+ "move-cursor", 3,
GTK_TYPE_MOVEMENT_STEP, GTK_MOVEMENT_BUFFER_ENDS,
G_TYPE_INT, -1,
G_TYPE_BOOLEAN, FALSE);
gtk_binding_entry_add_signal (binding_set, GDK_KEY_a, GDK_CONTROL_MASK,
- "move_cursor", 3,
+ "move-cursor", 3,
GTK_TYPE_MOVEMENT_STEP, GTK_MOVEMENT_BUFFER_ENDS,
G_TYPE_INT, 1,
G_TYPE_BOOLEAN, TRUE);
/* Deleting text */
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Delete, 0,
- "delete_from_cursor", 2,
+ "delete-from-cursor", 2,
G_TYPE_ENUM, GTK_DELETE_CHARS,
G_TYPE_INT, 1);
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Delete, 0,
- "delete_from_cursor", 2,
+ "delete-from-cursor", 2,
G_TYPE_ENUM, GTK_DELETE_CHARS,
G_TYPE_INT, 1);
gtk_binding_entry_add_signal (binding_set, GDK_KEY_BackSpace, 0,
- "delete_from_cursor", 2,
+ "delete-from-cursor", 2,
G_TYPE_ENUM, GTK_DELETE_CHARS,
G_TYPE_INT, -1);
/* Make this do the same as Backspace, to help with mis-typing */
gtk_binding_entry_add_signal (binding_set, GDK_KEY_BackSpace, GDK_SHIFT_MASK,
- "delete_from_cursor", 2,
+ "delete-from-cursor", 2,
G_TYPE_ENUM, GTK_DELETE_CHARS,
G_TYPE_INT, -1);
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Delete, GDK_CONTROL_MASK,
- "delete_from_cursor", 2,
+ "delete-from-cursor", 2,
G_TYPE_ENUM, GTK_DELETE_WORD_ENDS,
G_TYPE_INT, 1);
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Delete, GDK_CONTROL_MASK,
- "delete_from_cursor", 2,
+ "delete-from-cursor", 2,
G_TYPE_ENUM, GTK_DELETE_WORD_ENDS,
G_TYPE_INT, 1);
gtk_binding_entry_add_signal (binding_set, GDK_KEY_BackSpace, GDK_CONTROL_MASK,
- "delete_from_cursor", 2,
+ "delete-from-cursor", 2,
G_TYPE_ENUM, GTK_DELETE_WORD_ENDS,
G_TYPE_INT, -1);
/* Cut/copy/paste */
gtk_binding_entry_add_signal (binding_set, GDK_KEY_x, GDK_CONTROL_MASK,
- "cut_clipboard", 0);
+ "cut-clipboard", 0);
gtk_binding_entry_add_signal (binding_set, GDK_KEY_c, GDK_CONTROL_MASK,
- "copy_clipboard", 0);
+ "copy-clipboard", 0);
gtk_binding_entry_add_signal (binding_set, GDK_KEY_v, GDK_CONTROL_MASK,
- "paste_clipboard", 0);
+ "paste-clipboard", 0);
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Delete, GDK_SHIFT_MASK,
- "cut_clipboard", 0);
+ "cut-clipboard", 0);
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Insert, GDK_CONTROL_MASK,
- "copy_clipboard", 0);
+ "copy-clipboard", 0);
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Insert, GDK_SHIFT_MASK,
- "paste_clipboard", 0);
+ "paste-clipboard", 0);
/* Overwrite */
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Insert, 0,
- "toggle_overwrite", 0);
+ "toggle-overwrite", 0);
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Insert, 0,
- "toggle_overwrite", 0);
+ "toggle-overwrite", 0);
}
static void
@@ -614,11 +614,11 @@ eel_editable_label_init (EelEditableLabel *label)
g_signal_connect (G_OBJECT (label->im_context), "commit",
G_CALLBACK (eel_editable_label_commit_cb), label);
- g_signal_connect (G_OBJECT (label->im_context), "preedit_changed",
+ g_signal_connect (G_OBJECT (label->im_context), "preedit-changed",
G_CALLBACK (eel_editable_label_preedit_changed_cb), label);
- g_signal_connect (G_OBJECT (label->im_context), "retrieve_surrounding",
+ g_signal_connect (G_OBJECT (label->im_context), "retrieve-surrounding",
G_CALLBACK (eel_editable_label_retrieve_surrounding_cb), label);
- g_signal_connect (G_OBJECT (label->im_context), "delete_surrounding",
+ g_signal_connect (G_OBJECT (label->im_context), "delete-surrounding",
G_CALLBACK (eel_editable_label_delete_surrounding_cb), label);
}
@@ -2207,7 +2207,7 @@ eel_editable_label_focus_in (GtkWidget *widget,
gtk_im_context_focus_in (label->im_context);
g_signal_connect (gdk_keymap_get_default (),
- "direction_changed",
+ "direction-changed",
G_CALLBACK (eel_editable_label_keymap_direction_changed), label);
eel_editable_label_check_cursor_blink (label);
@@ -3078,11 +3078,11 @@ popup_targets_received (GtkClipboard *clipboard,
clipboard_contains_text = gtk_selection_data_targets_include_text (data);
- append_action_signal (label, label->popup_menu, GTK_STOCK_CUT, "cut_clipboard",
+ append_action_signal (label, label->popup_menu, GTK_STOCK_CUT, "cut-clipboard",
have_selection);
- append_action_signal (label, label->popup_menu, GTK_STOCK_COPY, "copy_clipboard",
+ append_action_signal (label, label->popup_menu, GTK_STOCK_COPY, "copy-clipboard",
have_selection);
- append_action_signal (label, label->popup_menu, GTK_STOCK_PASTE, "paste_clipboard",
+ append_action_signal (label, label->popup_menu, GTK_STOCK_PASTE, "paste-clipboard",
clipboard_contains_text);
menuitem = gtk_menu_item_new_with_label (_("Select All"));
@@ -3184,7 +3184,7 @@ editable_insert_text_emit (GtkEditable *editable,
text[new_text_length] = '\0';
strncpy (text, new_text, new_text_length);
- g_signal_emit_by_name (editable, "insert_text", text, new_text_length, position);
+ g_signal_emit_by_name (editable, "insert-text", text, new_text_length, position);
if (new_text_length > 63)
g_free (text);
@@ -3211,7 +3211,7 @@ editable_delete_text_emit (GtkEditable *editable,
g_object_ref (G_OBJECT (editable));
- g_signal_emit_by_name (editable, "delete_text", start_pos, end_pos);
+ g_signal_emit_by_name (editable, "delete-text", start_pos, end_pos);
g_object_unref (G_OBJECT (editable));
}
@@ -4036,7 +4036,7 @@ eel_editable_label_accessible_insert_text_cb (EelEditableLabel *label,
if (!priv->signal_name)
{
- priv->signal_name = "text_changed::insert";
+ priv->signal_name = "text-changed::insert";
priv->position = *position;
priv->length = arg2;
}
@@ -4065,7 +4065,7 @@ eel_editable_label_accessible_delete_text_cb (EelEditableLabel *label,
if (arg2 - arg1 == 0)
return;
- g_signal_emit_by_name (accessible, "text_changed::delete", arg1, arg2 - arg1);
+ g_signal_emit_by_name (accessible, "text-changed::delete", arg1, arg2 - arg1);
}
static void
@@ -4127,11 +4127,11 @@ eel_editable_label_accessible_notify_gtk (GObject *obj,
{
eel_editable_label_accessible_notify_insert (accessible);
if (check_for_selection_change (accessible, widget))
- g_signal_emit_by_name (accessible, "text_selection_changed");
+ g_signal_emit_by_name (accessible, "text-selection-changed");
/*
* The label cursor position has moved so generate the signal.
*/
- g_signal_emit_by_name (accessible, "text_caret_moved",
+ g_signal_emit_by_name (accessible, "text-caret-moved",
g_utf8_pointer_to_offset (label->text,
label->text + label->selection_anchor));
}
@@ -4140,7 +4140,7 @@ eel_editable_label_accessible_notify_gtk (GObject *obj,
eel_editable_label_accessible_notify_insert (accessible);
if (check_for_selection_change (accessible, widget))
- g_signal_emit_by_name (accessible, "text_selection_changed");
+ g_signal_emit_by_name (accessible, "text-selection-changed");
}
}
diff --git a/eel/eel-gtk-extensions.c b/eel/eel-gtk-extensions.c
index 24ea05e..3a590f1 100644
--- a/eel/eel-gtk-extensions.c
+++ b/eel/eel-gtk-extensions.c
@@ -359,7 +359,7 @@ eel_gtk_tree_view_set_activate_on_single_click (GtkTreeView *tree_view,
} else if (!button_press_id && should_activate) {
button_press_id = g_signal_connect
(tree_view,
- "button_press_event",
+ "button-press-event",
G_CALLBACK (tree_view_button_press_callback),
NULL);
g_object_set_data (G_OBJECT (tree_view),
diff --git a/libnautilus-extension/nautilus-menu-provider.c b/libnautilus-extension/nautilus-menu-provider.c
index 3b89c75..a2c367b 100644
--- a/libnautilus-extension/nautilus-menu-provider.c
+++ b/libnautilus-extension/nautilus-menu-provider.c
@@ -36,7 +36,7 @@ nautilus_menu_provider_base_init (gpointer g_class)
if (!initialized)
{
/* This signal should be emited each time the extension modify the list of menu items */
- g_signal_new ("items_updated",
+ g_signal_new ("items-updated",
NAUTILUS_TYPE_MENU_PROVIDER,
G_SIGNAL_RUN_LAST,
0,
@@ -127,6 +127,6 @@ nautilus_menu_provider_emit_items_updated_signal (NautilusMenuProvider* provider
{
g_return_if_fail (NAUTILUS_IS_MENU_PROVIDER (provider));
- g_signal_emit_by_name (provider, "items_updated");
+ g_signal_emit_by_name (provider, "items-updated");
}
diff --git a/libnautilus-private/nautilus-canvas-container.c b/libnautilus-private/nautilus-canvas-container.c
index 8024962..aa0863f 100644
--- a/libnautilus-private/nautilus-canvas-container.c
+++ b/libnautilus-private/nautilus-canvas-container.c
@@ -3872,11 +3872,11 @@ realize (GtkWidget *widget)
nautilus_canvas_dnd_init (container);
hadj = gtk_scrollable_get_hadjustment (GTK_SCROLLABLE (widget));
- g_signal_connect (hadj, "value_changed",
+ g_signal_connect (hadj, "value-changed",
G_CALLBACK (handle_hadjustment_changed), widget);
vadj = gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (widget));
- g_signal_connect (vadj, "value_changed",
+ g_signal_connect (vadj, "value-changed",
G_CALLBACK (handle_vadjustment_changed), widget);
}
@@ -4713,7 +4713,7 @@ nautilus_canvas_container_class_init (NautilusCanvasContainerClass *class)
/* Signals. */
signals[SELECTION_CHANGED]
- = g_signal_new ("selection_changed",
+ = g_signal_new ("selection-changed",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusCanvasContainerClass,
@@ -4722,7 +4722,7 @@ nautilus_canvas_container_class_init (NautilusCanvasContainerClass *class)
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
signals[BUTTON_PRESS]
- = g_signal_new ("button_press",
+ = g_signal_new ("button-press",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusCanvasContainerClass,
@@ -4742,7 +4742,7 @@ nautilus_canvas_container_class_init (NautilusCanvasContainerClass *class)
G_TYPE_NONE, 1,
G_TYPE_POINTER);
signals[ACTIVATE_ALTERNATE]
- = g_signal_new ("activate_alternate",
+ = g_signal_new ("activate-alternate",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusCanvasContainerClass,
@@ -4752,7 +4752,7 @@ nautilus_canvas_container_class_init (NautilusCanvasContainerClass *class)
G_TYPE_NONE, 1,
G_TYPE_POINTER);
signals[ACTIVATE_PREVIEWER]
- = g_signal_new ("activate_previewer",
+ = g_signal_new ("activate-previewer",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusCanvasContainerClass,
@@ -4762,7 +4762,7 @@ nautilus_canvas_container_class_init (NautilusCanvasContainerClass *class)
G_TYPE_NONE, 2,
G_TYPE_POINTER, G_TYPE_POINTER);
signals[CONTEXT_CLICK_SELECTION]
- = g_signal_new ("context_click_selection",
+ = g_signal_new ("context-click-selection",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusCanvasContainerClass,
@@ -4772,7 +4772,7 @@ nautilus_canvas_container_class_init (NautilusCanvasContainerClass *class)
G_TYPE_NONE, 1,
G_TYPE_POINTER);
signals[CONTEXT_CLICK_BACKGROUND]
- = g_signal_new ("context_click_background",
+ = g_signal_new ("context-click-background",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusCanvasContainerClass,
@@ -4782,7 +4782,7 @@ nautilus_canvas_container_class_init (NautilusCanvasContainerClass *class)
G_TYPE_NONE, 1,
G_TYPE_POINTER);
signals[MIDDLE_CLICK]
- = g_signal_new ("middle_click",
+ = g_signal_new ("middle-click",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusCanvasContainerClass,
@@ -4792,7 +4792,7 @@ nautilus_canvas_container_class_init (NautilusCanvasContainerClass *class)
G_TYPE_NONE, 1,
G_TYPE_POINTER);
signals[ICON_POSITION_CHANGED]
- = g_signal_new ("icon_position_changed",
+ = g_signal_new ("icon-position-changed",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusCanvasContainerClass,
@@ -4803,7 +4803,7 @@ nautilus_canvas_container_class_init (NautilusCanvasContainerClass *class)
G_TYPE_POINTER,
G_TYPE_POINTER);
signals[ICON_STRETCH_STARTED]
- = g_signal_new ("icon_stretch_started",
+ = g_signal_new ("icon-stretch-started",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusCanvasContainerClass,
@@ -4813,7 +4813,7 @@ nautilus_canvas_container_class_init (NautilusCanvasContainerClass *class)
G_TYPE_NONE, 1,
G_TYPE_POINTER);
signals[ICON_STRETCH_ENDED]
- = g_signal_new ("icon_stretch_ended",
+ = g_signal_new ("icon-stretch-ended",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusCanvasContainerClass,
@@ -4823,7 +4823,7 @@ nautilus_canvas_container_class_init (NautilusCanvasContainerClass *class)
G_TYPE_NONE, 1,
G_TYPE_POINTER);
signals[ICON_RENAME_STARTED]
- = g_signal_new ("icon_rename_started",
+ = g_signal_new ("icon-rename-started",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusCanvasContainerClass,
@@ -4833,7 +4833,7 @@ nautilus_canvas_container_class_init (NautilusCanvasContainerClass *class)
G_TYPE_NONE, 1,
G_TYPE_POINTER);
signals[ICON_RENAME_ENDED]
- = g_signal_new ("icon_rename_ended",
+ = g_signal_new ("icon-rename-ended",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusCanvasContainerClass,
@@ -4844,7 +4844,7 @@ nautilus_canvas_container_class_init (NautilusCanvasContainerClass *class)
G_TYPE_POINTER,
G_TYPE_STRING);
signals[GET_ICON_URI]
- = g_signal_new ("get_icon_uri",
+ = g_signal_new ("get-icon-uri",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusCanvasContainerClass,
@@ -4854,7 +4854,7 @@ nautilus_canvas_container_class_init (NautilusCanvasContainerClass *class)
G_TYPE_STRING, 1,
G_TYPE_POINTER);
signals[GET_ICON_DROP_TARGET_URI]
- = g_signal_new ("get_icon_drop_target_uri",
+ = g_signal_new ("get-icon-drop-target-uri",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusCanvasContainerClass,
@@ -4864,7 +4864,7 @@ nautilus_canvas_container_class_init (NautilusCanvasContainerClass *class)
G_TYPE_STRING, 1,
G_TYPE_POINTER);
signals[MOVE_COPY_ITEMS]
- = g_signal_new ("move_copy_items",
+ = g_signal_new ("move-copy-items",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusCanvasContainerClass,
@@ -4879,7 +4879,7 @@ nautilus_canvas_container_class_init (NautilusCanvasContainerClass *class)
G_TYPE_INT,
G_TYPE_INT);
signals[HANDLE_NETSCAPE_URL]
- = g_signal_new ("handle_netscape_url",
+ = g_signal_new ("handle-netscape-url",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusCanvasContainerClass,
@@ -4893,7 +4893,7 @@ nautilus_canvas_container_class_init (NautilusCanvasContainerClass *class)
G_TYPE_INT,
G_TYPE_INT);
signals[HANDLE_URI_LIST]
- = g_signal_new ("handle_uri_list",
+ = g_signal_new ("handle-uri-list",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusCanvasContainerClass,
@@ -4907,7 +4907,7 @@ nautilus_canvas_container_class_init (NautilusCanvasContainerClass *class)
G_TYPE_INT,
G_TYPE_INT);
signals[HANDLE_TEXT]
- = g_signal_new ("handle_text",
+ = g_signal_new ("handle-text",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusCanvasContainerClass,
@@ -4921,7 +4921,7 @@ nautilus_canvas_container_class_init (NautilusCanvasContainerClass *class)
G_TYPE_INT,
G_TYPE_INT);
signals[HANDLE_RAW]
- = g_signal_new ("handle_raw",
+ = g_signal_new ("handle-raw",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusCanvasContainerClass,
@@ -4937,7 +4937,7 @@ nautilus_canvas_container_class_init (NautilusCanvasContainerClass *class)
G_TYPE_INT,
G_TYPE_INT);
signals[HANDLE_HOVER] =
- g_signal_new ("handle_hover",
+ g_signal_new ("handle-hover",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusCanvasContainerClass,
@@ -4947,7 +4947,7 @@ nautilus_canvas_container_class_init (NautilusCanvasContainerClass *class)
G_TYPE_NONE, 1,
G_TYPE_STRING);
signals[GET_CONTAINER_URI]
- = g_signal_new ("get_container_uri",
+ = g_signal_new ("get-container-uri",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusCanvasContainerClass,
@@ -4956,7 +4956,7 @@ nautilus_canvas_container_class_init (NautilusCanvasContainerClass *class)
g_cclosure_marshal_generic,
G_TYPE_STRING, 0);
signals[CAN_ACCEPT_ITEM]
- = g_signal_new ("can_accept_item",
+ = g_signal_new ("can-accept-item",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusCanvasContainerClass,
@@ -4967,7 +4967,7 @@ nautilus_canvas_container_class_init (NautilusCanvasContainerClass *class)
G_TYPE_POINTER,
G_TYPE_STRING);
signals[GET_STORED_ICON_POSITION]
- = g_signal_new ("get_stored_icon_position",
+ = g_signal_new ("get-stored-icon-position",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusCanvasContainerClass,
@@ -4978,7 +4978,7 @@ nautilus_canvas_container_class_init (NautilusCanvasContainerClass *class)
G_TYPE_POINTER,
G_TYPE_POINTER);
signals[GET_STORED_LAYOUT_TIMESTAMP]
- = g_signal_new ("get_stored_layout_timestamp",
+ = g_signal_new ("get-stored-layout-timestamp",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusCanvasContainerClass,
@@ -4989,7 +4989,7 @@ nautilus_canvas_container_class_init (NautilusCanvasContainerClass *class)
G_TYPE_POINTER,
G_TYPE_POINTER);
signals[STORE_LAYOUT_TIMESTAMP]
- = g_signal_new ("store_layout_timestamp",
+ = g_signal_new ("store-layout-timestamp",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusCanvasContainerClass,
@@ -5000,7 +5000,7 @@ nautilus_canvas_container_class_init (NautilusCanvasContainerClass *class)
G_TYPE_POINTER,
G_TYPE_POINTER);
signals[LAYOUT_CHANGED]
- = g_signal_new ("layout_changed",
+ = g_signal_new ("layout-changed",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusCanvasContainerClass,
@@ -5009,7 +5009,7 @@ nautilus_canvas_container_class_init (NautilusCanvasContainerClass *class)
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
signals[BAND_SELECT_STARTED]
- = g_signal_new ("band_select_started",
+ = g_signal_new ("band-select-started",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusCanvasContainerClass,
@@ -5018,7 +5018,7 @@ nautilus_canvas_container_class_init (NautilusCanvasContainerClass *class)
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
signals[BAND_SELECT_ENDED]
- = g_signal_new ("band_select_ended",
+ = g_signal_new ("band-select-ended",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusCanvasContainerClass,
@@ -5027,7 +5027,7 @@ nautilus_canvas_container_class_init (NautilusCanvasContainerClass *class)
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
signals[ICON_ADDED]
- = g_signal_new ("icon_added",
+ = g_signal_new ("icon-added",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusCanvasContainerClass,
@@ -5036,7 +5036,7 @@ nautilus_canvas_container_class_init (NautilusCanvasContainerClass *class)
g_cclosure_marshal_VOID__POINTER,
G_TYPE_NONE, 1, G_TYPE_POINTER);
signals[ICON_REMOVED]
- = g_signal_new ("icon_removed",
+ = g_signal_new ("icon-removed",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusCanvasContainerClass,
@@ -7727,7 +7727,7 @@ static void
nautilus_canvas_container_accessible_selection_changed_cb (NautilusCanvasContainer *container,
gpointer data)
{
- g_signal_emit_by_name (data, "selection_changed");
+ g_signal_emit_by_name (data, "selection-changed");
}
static void
@@ -7747,7 +7747,7 @@ nautilus_canvas_container_accessible_icon_added_cb (NautilusCanvasContainer *con
(G_OBJECT (icon->item));
index = g_list_index (container->details->icons, icon);
- g_signal_emit_by_name (atk_parent, "children_changed::add",
+ g_signal_emit_by_name (atk_parent, "children-changed::add",
index, atk_child, NULL);
}
}
@@ -7769,7 +7769,7 @@ nautilus_canvas_container_accessible_icon_removed_cb (NautilusCanvasContainer *c
(G_OBJECT (icon->item));
index = g_list_index (container->details->icons, icon);
- g_signal_emit_by_name (atk_parent, "children_changed::remove",
+ g_signal_emit_by_name (atk_parent, "children-changed::remove",
index, atk_child, NULL);
}
}
@@ -7778,7 +7778,7 @@ static void
nautilus_canvas_container_accessible_cleared_cb (NautilusCanvasContainer *container,
gpointer data)
{
- g_signal_emit_by_name (data, "children_changed", 0, NULL, NULL);
+ g_signal_emit_by_name (data, "children-changed", 0, NULL, NULL);
}
static gboolean
@@ -8063,13 +8063,13 @@ nautilus_canvas_container_accessible_initialize (AtkObject *accessible,
(ATK_OBJECT (accessible));
container = NAUTILUS_CANVAS_CONTAINER (gtk_accessible_get_widget (GTK_ACCESSIBLE (accessible)));
- g_signal_connect (container, "selection_changed",
+ g_signal_connect (container, "selection-changed",
G_CALLBACK (nautilus_canvas_container_accessible_selection_changed_cb),
accessible);
- g_signal_connect (container, "icon_added",
+ g_signal_connect (container, "icon-added",
G_CALLBACK (nautilus_canvas_container_accessible_icon_added_cb),
accessible);
- g_signal_connect (container, "icon_removed",
+ g_signal_connect (container, "icon-removed",
G_CALLBACK (nautilus_canvas_container_accessible_icon_removed_cb),
accessible);
g_signal_connect (container, "cleared",
diff --git a/libnautilus-private/nautilus-canvas-dnd.c b/libnautilus-private/nautilus-canvas-dnd.c
index 8e7501b..2d1ae24 100644
--- a/libnautilus-private/nautilus-canvas-dnd.c
+++ b/libnautilus-private/nautilus-canvas-dnd.c
@@ -575,7 +575,7 @@ get_container_uri (NautilusCanvasContainer *container)
/* get the URI associated with the container */
uri = NULL;
- g_signal_emit_by_name (container, "get_container_uri", &uri);
+ g_signal_emit_by_name (container, "get-container-uri", &uri);
return uri;
}
@@ -614,7 +614,7 @@ receive_dropped_netscape_url (NautilusCanvasContainer *container, const char *en
drop_target = nautilus_canvas_container_find_drop_target (container, context, x, y, NULL, TRUE);
- g_signal_emit_by_name (container, "handle_netscape_url",
+ g_signal_emit_by_name (container, "handle-netscape-url",
encoded_url,
drop_target,
gdk_drag_context_get_selected_action (context),
@@ -635,7 +635,7 @@ receive_dropped_uri_list (NautilusCanvasContainer *container, const char *uri_li
drop_target = nautilus_canvas_container_find_drop_target (container, context, x, y, NULL, TRUE);
- g_signal_emit_by_name (container, "handle_uri_list",
+ g_signal_emit_by_name (container, "handle-uri-list",
uri_list,
drop_target,
gdk_drag_context_get_selected_action (context),
@@ -656,7 +656,7 @@ receive_dropped_text (NautilusCanvasContainer *container, const char *text, GdkD
drop_target = nautilus_canvas_container_find_drop_target (container, context, x, y, NULL, TRUE);
- g_signal_emit_by_name (container, "handle_text",
+ g_signal_emit_by_name (container, "handle-text",
text,
drop_target,
gdk_drag_context_get_selected_action (context),
@@ -677,7 +677,7 @@ receive_dropped_raw (NautilusCanvasContainer *container, const char *raw_data, i
drop_target = nautilus_canvas_container_find_drop_target (container, context, x, y, NULL, TRUE);
- g_signal_emit_by_name (container, "handle_raw",
+ g_signal_emit_by_name (container, "handle-raw",
raw_data,
length,
drop_target,
@@ -904,7 +904,7 @@ handle_nonlocal_move (NautilusCanvasContainer *container,
}
/* start the copy */
- g_signal_emit_by_name (container, "move_copy_items",
+ g_signal_emit_by_name (container, "move-copy-items",
source_uris,
source_item_locations,
target_uri,
@@ -1488,7 +1488,7 @@ hover_timer (gpointer user_data)
dnd_info->hover_id = 0;
- g_signal_emit_by_name (container, "handle_hover", dnd_info->target_uri);
+ g_signal_emit_by_name (container, "handle-hover", dnd_info->target_uri);
return FALSE;
}
@@ -1782,21 +1782,21 @@ nautilus_canvas_dnd_init (NautilusCanvasContainer *container)
/* Messages for outgoing drag. */
- g_signal_connect (container, "drag_begin",
+ g_signal_connect (container, "drag-begin",
G_CALLBACK (drag_begin_callback), NULL);
- g_signal_connect (container, "drag_data_get",
+ g_signal_connect (container, "drag-data-get",
G_CALLBACK (drag_data_get_callback), NULL);
- g_signal_connect (container, "drag_end",
+ g_signal_connect (container, "drag-end",
G_CALLBACK (drag_end_callback), NULL);
/* Messages for incoming drag. */
- g_signal_connect (container, "drag_data_received",
+ g_signal_connect (container, "drag-data-received",
G_CALLBACK (drag_data_received_callback), NULL);
- g_signal_connect (container, "drag_motion",
+ g_signal_connect (container, "drag-motion",
G_CALLBACK (drag_motion_callback), NULL);
- g_signal_connect (container, "drag_drop",
+ g_signal_connect (container, "drag-drop",
G_CALLBACK (drag_drop_callback), NULL);
- g_signal_connect (container, "drag_leave",
+ g_signal_connect (container, "drag-leave",
G_CALLBACK (drag_leave_callback), NULL);
}
diff --git a/libnautilus-private/nautilus-canvas-item.c b/libnautilus-private/nautilus-canvas-item.c
index c564663..0f4a312 100644
--- a/libnautilus-private/nautilus-canvas-item.c
+++ b/libnautilus-private/nautilus-canvas-item.c
@@ -2160,7 +2160,7 @@ nautilus_canvas_item_accessible_idle_do_action (gpointer data)
return FALSE;
}
g_list_free (selection);
- g_signal_emit_by_name (container, "context_click_selection", &button_event);
+ g_signal_emit_by_name (container, "context-click-selection", &button_event);
break;
default :
g_assert_not_reached ();
diff --git a/libnautilus-private/nautilus-clipboard-monitor.c b/libnautilus-private/nautilus-clipboard-monitor.c
index d919dbf..1db98d2 100644
--- a/libnautilus-private/nautilus-clipboard-monitor.c
+++ b/libnautilus-private/nautilus-clipboard-monitor.c
@@ -79,7 +79,7 @@ nautilus_clipboard_monitor_get (void)
eel_debug_call_at_shutdown (destroy_clipboard_monitor);
clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
- g_signal_connect (clipboard, "owner_change",
+ g_signal_connect (clipboard, "owner-change",
G_CALLBACK (nautilus_clipboard_monitor_emit_changed), NULL);
}
return clipboard_monitor;
@@ -165,7 +165,7 @@ nautilus_clipboard_monitor_class_init (NautilusClipboardMonitorClass *klass)
copied_files_atom = gdk_atom_intern ("x-special/gnome-copied-files", FALSE);
signals[CLIPBOARD_CHANGED] =
- g_signal_new ("clipboard_changed",
+ g_signal_new ("clipboard-changed",
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusClipboardMonitorClass, clipboard_changed),
@@ -173,7 +173,7 @@ nautilus_clipboard_monitor_class_init (NautilusClipboardMonitorClass *klass)
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
signals[CLIPBOARD_INFO] =
- g_signal_new ("clipboard_info",
+ g_signal_new ("clipboard-info",
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusClipboardMonitorClass, clipboard_info),
diff --git a/libnautilus-private/nautilus-clipboard.c b/libnautilus-private/nautilus-clipboard.c
index e120a11..1d528e3 100644
--- a/libnautilus-private/nautilus-clipboard.c
+++ b/libnautilus-private/nautilus-clipboard.c
@@ -212,7 +212,7 @@ static void
editable_connect_callbacks (GObject *object,
TargetCallbackData *target_data)
{
- g_signal_connect_after (object, "selection_changed",
+ g_signal_connect_after (object, "selection-changed",
G_CALLBACK (selection_changed_callback), target_data);
selection_changed_callback (GTK_WIDGET (object),
target_data);
@@ -244,7 +244,7 @@ merge_in_clipboard_menu_items (GObject *widget_as_object,
set_paste_sensitive_if_clipboard_contains_data (target_data->action_group);
- g_signal_connect (gtk_clipboard_get (GDK_SELECTION_CLIPBOARD), "owner_change",
+ g_signal_connect (gtk_clipboard_get (GDK_SELECTION_CLIPBOARD), "owner-change",
G_CALLBACK (owner_change_callback), target_data);
if (add_selection_callback) {
@@ -426,9 +426,9 @@ nautilus_clipboard_real_set_up (gpointer target,
connect_callbacks,
disconnect_callbacks);
- g_signal_connect (target, "focus_in_event",
+ g_signal_connect (target, "focus-in-event",
G_CALLBACK (focus_changed_callback), target_data);
- g_signal_connect (target, "focus_out_event",
+ g_signal_connect (target, "focus-out-event",
G_CALLBACK (focus_changed_callback), target_data);
g_signal_connect (target, "destroy",
G_CALLBACK (target_destroy_callback), target_data);
diff --git a/libnautilus-private/nautilus-clipboard.h b/libnautilus-private/nautilus-clipboard.h
index 3a75ff9..84441e3 100644
--- a/libnautilus-private/nautilus-clipboard.h
+++ b/libnautilus-private/nautilus-clipboard.h
@@ -33,7 +33,7 @@
* Callers in Nautilus normally get the UI manager from
* nautilus_window_get_ui_manager. */
/* The shares selection changes argument should be set to true if the
- * widget uses the signal "selection_changed" to tell others about
+ * widget uses the signal "selection-changed" to tell others about
* text selection changes. The NautilusEntry widget
* is currently the only editable in nautilus that shares selection
* changes. */
diff --git a/libnautilus-private/nautilus-column-chooser.c b/libnautilus-private/nautilus-column-chooser.c
index 49f85b6..5b338a4 100644
--- a/libnautilus-private/nautilus-column-chooser.c
+++ b/libnautilus-private/nautilus-column-chooser.c
@@ -109,7 +109,7 @@ nautilus_column_chooser_class_init (NautilusColumnChooserClass *chooser_class)
G_TYPE_NONE, 0);
signals[USE_DEFAULT] = g_signal_new
- ("use_default",
+ ("use-default",
G_TYPE_FROM_CLASS (chooser_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusColumnChooserClass,
@@ -455,7 +455,7 @@ nautilus_column_chooser_constructed (GObject *object)
populate_tree (chooser);
- g_signal_connect (chooser->details->store, "row_deleted",
+ g_signal_connect (chooser->details->store, "row-deleted",
G_CALLBACK (row_deleted_callback), chooser);
}
diff --git a/libnautilus-private/nautilus-desktop-background.c b/libnautilus-private/nautilus-desktop-background.c
index 6c1033d..3a8d799 100644
--- a/libnautilus-private/nautilus-desktop-background.c
+++ b/libnautilus-private/nautilus-desktop-background.c
@@ -384,7 +384,7 @@ widget_realize_cb (GtkWidget *widget,
self->details->screen_size_handler);
}
self->details->screen_size_handler =
- g_signal_connect (screen, "size_changed",
+ g_signal_connect (screen, "size-changed",
G_CALLBACK (screen_size_changed), self);
if (self->details->screen_monitors_handler > 0) {
diff --git a/libnautilus-private/nautilus-desktop-directory.c b/libnautilus-private/nautilus-desktop-directory.c
index 625431e..0be4df5 100644
--- a/libnautilus-private/nautilus-desktop-directory.c
+++ b/libnautilus-private/nautilus-desktop-directory.c
@@ -477,11 +477,11 @@ update_desktop_directory (NautilusDesktopDirectory *desktop)
g_free (desktop_uri);
g_free (desktop_path);
- g_signal_connect_object (real_directory, "done_loading",
+ g_signal_connect_object (real_directory, "done-loading",
G_CALLBACK (done_loading_callback), desktop, 0);
- g_signal_connect_object (real_directory, "files_added",
+ g_signal_connect_object (real_directory, "files-added",
G_CALLBACK (forward_files_added_cover), desktop, 0);
- g_signal_connect_object (real_directory, "files_changed",
+ g_signal_connect_object (real_directory, "files-changed",
G_CALLBACK (forward_files_changed_cover), desktop, 0);
desktop->details->real_directory = real_directory;
diff --git a/libnautilus-private/nautilus-desktop-link-monitor.c b/libnautilus-private/nautilus-desktop-link-monitor.c
index 07beba6..8bc82fb 100644
--- a/libnautilus-private/nautilus-desktop-link-monitor.c
+++ b/libnautilus-private/nautilus-desktop-link-monitor.c
@@ -419,13 +419,13 @@ nautilus_desktop_link_monitor_init (NautilusDesktopLinkMonitor *monitor)
monitor);
monitor->details->mount_id =
- g_signal_connect_object (monitor->details->volume_monitor, "mount_added",
+ g_signal_connect_object (monitor->details->volume_monitor, "mount-added",
G_CALLBACK (mount_added_callback), monitor, 0);
monitor->details->unmount_id =
- g_signal_connect_object (monitor->details->volume_monitor, "mount_removed",
+ g_signal_connect_object (monitor->details->volume_monitor, "mount-removed",
G_CALLBACK (mount_removed_callback), monitor, 0);
monitor->details->changed_id =
- g_signal_connect_object (monitor->details->volume_monitor, "mount_changed",
+ g_signal_connect_object (monitor->details->volume_monitor, "mount-changed",
G_CALLBACK (mount_changed_callback), monitor, 0);
}
diff --git a/libnautilus-private/nautilus-desktop-link.c b/libnautilus-private/nautilus-desktop-link.c
index 9f18ea9..07300c0 100644
--- a/libnautilus-private/nautilus-desktop-link.c
+++ b/libnautilus-private/nautilus-desktop-link.c
@@ -200,7 +200,7 @@ nautilus_desktop_link_new (NautilusDesktopLinkType type)
link);
link->details->signal_handler_obj = G_OBJECT (nautilus_trash_monitor_get ());
link->details->signal_handler =
- g_signal_connect_object (nautilus_trash_monitor_get (), "trash_state_changed",
+ g_signal_connect_object (nautilus_trash_monitor_get (), "trash-state-changed",
G_CALLBACK (trash_state_changed_callback), link, 0);
break;
diff --git a/libnautilus-private/nautilus-directory-async.c b/libnautilus-private/nautilus-directory-async.c
index 6961ae0..2e316a7 100644
--- a/libnautilus-private/nautilus-directory-async.c
+++ b/libnautilus-private/nautilus-directory-async.c
@@ -786,7 +786,7 @@ nautilus_directory_monitor_add_internal (NautilusDirectory *directory,
directory->details->mime_db_monitor == 0) {
directory->details->mime_db_monitor =
g_signal_connect_object (nautilus_signaller_get_current (),
- "mime_data_changed",
+ "mime-data-changed",
G_CALLBACK (mime_db_changed_callback), directory, 0);
}
diff --git a/libnautilus-private/nautilus-directory.c b/libnautilus-private/nautilus-directory.c
index 645224d..ada6e63 100644
--- a/libnautilus-private/nautilus-directory.c
+++ b/libnautilus-private/nautilus-directory.c
@@ -116,7 +116,7 @@ nautilus_directory_class_init (NautilusDirectoryClass *klass)
object_class->get_property = nautilus_directory_get_property;
signals[FILES_ADDED] =
- g_signal_new ("files_added",
+ g_signal_new ("files-added",
G_TYPE_FROM_CLASS (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusDirectoryClass, files_added),
@@ -124,7 +124,7 @@ nautilus_directory_class_init (NautilusDirectoryClass *klass)
g_cclosure_marshal_VOID__POINTER,
G_TYPE_NONE, 1, G_TYPE_POINTER);
signals[FILES_CHANGED] =
- g_signal_new ("files_changed",
+ g_signal_new ("files-changed",
G_TYPE_FROM_CLASS (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusDirectoryClass, files_changed),
@@ -132,7 +132,7 @@ nautilus_directory_class_init (NautilusDirectoryClass *klass)
g_cclosure_marshal_VOID__POINTER,
G_TYPE_NONE, 1, G_TYPE_POINTER);
signals[DONE_LOADING] =
- g_signal_new ("done_loading",
+ g_signal_new ("done-loading",
G_TYPE_FROM_CLASS (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusDirectoryClass, done_loading),
@@ -140,7 +140,7 @@ nautilus_directory_class_init (NautilusDirectoryClass *klass)
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
signals[LOAD_ERROR] =
- g_signal_new ("load_error",
+ g_signal_new ("load-error",
G_TYPE_FROM_CLASS (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusDirectoryClass, load_error),
diff --git a/libnautilus-private/nautilus-entry.c b/libnautilus-private/nautilus-entry.c
index 9e1e3cf..73b58fd 100644
--- a/libnautilus-private/nautilus-entry.c
+++ b/libnautilus-private/nautilus-entry.c
@@ -358,7 +358,7 @@ nautilus_entry_class_init (NautilusEntryClass *class)
/* Set up signals */
signals[SELECTION_CHANGED] = g_signal_new
- ("selection_changed",
+ ("selection-changed",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusEntryClass, selection_changed),
diff --git a/libnautilus-private/nautilus-file-utilities.c b/libnautilus-private/nautilus-file-utilities.c
index d0e31c2..8f02c2d 100644
--- a/libnautilus-private/nautilus-file-utilities.c
+++ b/libnautilus-private/nautilus-file-utilities.c
@@ -523,7 +523,7 @@ static gboolean
emit_user_dirs_changed_idle (gpointer data)
{
g_signal_emit_by_name (nautilus_signaller_get_current (),
- "user_dirs_changed");
+ "user-dirs-changed");
user_dirs_changed_tag = 0;
return FALSE;
}
diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c
index fa38545..a604eee 100644
--- a/libnautilus-private/nautilus-file.c
+++ b/libnautilus-private/nautilus-file.c
@@ -8083,7 +8083,7 @@ nautilus_file_class_init (NautilusFileClass *class)
G_TYPE_NONE, 0);
signals[UPDATED_DEEP_COUNT_IN_PROGRESS] =
- g_signal_new ("updated_deep_count_in_progress",
+ g_signal_new ("updated-deep-count-in-progress",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusFileClass, updated_deep_count_in_progress),
@@ -8116,7 +8116,7 @@ nautilus_file_class_init (NautilusFileClass *class)
NULL, 0);
g_signal_connect (nautilus_signaller_get_current (),
- "mime_data_changed",
+ "mime-data-changed",
G_CALLBACK (mime_type_data_changed_callback),
NULL);
}
diff --git a/libnautilus-private/nautilus-mime-application-chooser.c b/libnautilus-private/nautilus-mime-application-chooser.c
index 53f736c..541f3e3 100644
--- a/libnautilus-private/nautilus-mime-application-chooser.c
+++ b/libnautilus-private/nautilus-mime-application-chooser.c
@@ -87,7 +87,7 @@ add_clicked_cb (GtkButton *button,
g_free (message);
} else {
gtk_app_chooser_refresh (GTK_APP_CHOOSER (chooser->details->open_with_widget));
- g_signal_emit_by_name (nautilus_signaller_get_current (), "mime_data_changed");
+ g_signal_emit_by_name (nautilus_signaller_get_current (), "mime-data-changed");
}
g_object_unref (info);
@@ -119,7 +119,7 @@ remove_clicked_cb (GtkMenuItem *item,
g_object_unref (info);
}
- g_signal_emit_by_name (nautilus_signaller_get_current (), "mime_data_changed");
+ g_signal_emit_by_name (nautilus_signaller_get_current (), "mime-data-changed");
}
static void
@@ -152,7 +152,7 @@ reset_clicked_cb (GtkButton *button,
g_app_info_reset_type_associations (chooser->details->content_type);
gtk_app_chooser_refresh (GTK_APP_CHOOSER (chooser->details->open_with_widget));
- g_signal_emit_by_name (nautilus_signaller_get_current (), "mime_data_changed");
+ g_signal_emit_by_name (nautilus_signaller_get_current (), "mime-data-changed");
}
static void
@@ -180,7 +180,7 @@ set_as_default_clicked_cb (GtkButton *button,
g_object_unref (info);
gtk_app_chooser_refresh (GTK_APP_CHOOSER (chooser->details->open_with_widget));
- g_signal_emit_by_name (nautilus_signaller_get_current (), "mime_data_changed");
+ g_signal_emit_by_name (nautilus_signaller_get_current (), "mime-data-changed");
}
static gint
diff --git a/libnautilus-private/nautilus-signaller.c b/libnautilus-private/nautilus-signaller.c
index a26600d..1eaabc1 100644
--- a/libnautilus-private/nautilus-signaller.c
+++ b/libnautilus-private/nautilus-signaller.c
@@ -69,7 +69,7 @@ static void
nautilus_signaller_class_init (NautilusSignallerClass *class)
{
signals[HISTORY_LIST_CHANGED] =
- g_signal_new ("history_list_changed",
+ g_signal_new ("history-list-changed",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_LAST,
0,
@@ -77,7 +77,7 @@ nautilus_signaller_class_init (NautilusSignallerClass *class)
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
signals[POPUP_MENU_CHANGED] =
- g_signal_new ("popup_menu_changed",
+ g_signal_new ("popup-menu-changed",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_LAST,
0,
@@ -85,7 +85,7 @@ nautilus_signaller_class_init (NautilusSignallerClass *class)
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
signals[USER_DIRS_CHANGED] =
- g_signal_new ("user_dirs_changed",
+ g_signal_new ("user-dirs-changed",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_LAST,
0,
@@ -93,7 +93,7 @@ nautilus_signaller_class_init (NautilusSignallerClass *class)
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
signals[MIME_DATA_CHANGED] =
- g_signal_new ("mime_data_changed",
+ g_signal_new ("mime-data-changed",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_LAST,
0,
diff --git a/libnautilus-private/nautilus-trash-monitor.c b/libnautilus-private/nautilus-trash-monitor.c
index 433d6a5..89713f8 100644
--- a/libnautilus-private/nautilus-trash-monitor.c
+++ b/libnautilus-private/nautilus-trash-monitor.c
@@ -77,7 +77,7 @@ nautilus_trash_monitor_class_init (NautilusTrashMonitorClass *klass)
object_class->finalize = nautilus_trash_monitor_finalize;
signals[TRASH_STATE_CHANGED] = g_signal_new
- ("trash_state_changed",
+ ("trash-state-changed",
G_TYPE_FROM_CLASS (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusTrashMonitorClass, trash_state_changed),
diff --git a/libnautilus-private/nautilus-tree-view-drag-dest.c b/libnautilus-private/nautilus-tree-view-drag-dest.c
index df37464..67d36ff 100644
--- a/libnautilus-private/nautilus-tree-view-drag-dest.c
+++ b/libnautilus-private/nautilus-tree-view-drag-dest.c
@@ -866,7 +866,7 @@ drag_data_received_callback (GtkWidget *widget,
/* appease GtkTreeView by preventing its drag_data_receive
* from being called */
g_signal_stop_emission_by_name (dest->details->tree_view,
- "drag_data_received");
+ "drag-data-received");
return TRUE;
}
@@ -1045,7 +1045,7 @@ nautilus_tree_view_drag_dest_class_init (NautilusTreeViewDragDestClass *class)
g_type_class_add_private (class, sizeof (NautilusTreeViewDragDestDetails));
signals[GET_ROOT_URI] =
- g_signal_new ("get_root_uri",
+ g_signal_new ("get-root-uri",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusTreeViewDragDestClass,
@@ -1054,7 +1054,7 @@ nautilus_tree_view_drag_dest_class_init (NautilusTreeViewDragDestClass *class)
g_cclosure_marshal_generic,
G_TYPE_STRING, 0);
signals[GET_FILE_FOR_PATH] =
- g_signal_new ("get_file_for_path",
+ g_signal_new ("get-file-for-path",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusTreeViewDragDestClass,
@@ -1064,7 +1064,7 @@ nautilus_tree_view_drag_dest_class_init (NautilusTreeViewDragDestClass *class)
NAUTILUS_TYPE_FILE, 1,
GTK_TYPE_TREE_PATH);
signals[MOVE_COPY_ITEMS] =
- g_signal_new ("move_copy_items",
+ g_signal_new ("move-copy-items",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusTreeViewDragDestClass,
@@ -1079,7 +1079,7 @@ nautilus_tree_view_drag_dest_class_init (NautilusTreeViewDragDestClass *class)
G_TYPE_INT,
G_TYPE_INT);
signals[HANDLE_NETSCAPE_URL] =
- g_signal_new ("handle_netscape_url",
+ g_signal_new ("handle-netscape-url",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusTreeViewDragDestClass,
@@ -1093,7 +1093,7 @@ nautilus_tree_view_drag_dest_class_init (NautilusTreeViewDragDestClass *class)
G_TYPE_INT,
G_TYPE_INT);
signals[HANDLE_URI_LIST] =
- g_signal_new ("handle_uri_list",
+ g_signal_new ("handle-uri-list",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusTreeViewDragDestClass,
@@ -1107,7 +1107,7 @@ nautilus_tree_view_drag_dest_class_init (NautilusTreeViewDragDestClass *class)
G_TYPE_INT,
G_TYPE_INT);
signals[HANDLE_TEXT] =
- g_signal_new ("handle_text",
+ g_signal_new ("handle-text",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusTreeViewDragDestClass,
@@ -1121,7 +1121,7 @@ nautilus_tree_view_drag_dest_class_init (NautilusTreeViewDragDestClass *class)
G_TYPE_INT,
G_TYPE_INT);
signals[HANDLE_RAW] =
- g_signal_new ("handle_raw",
+ g_signal_new ("handle-raw",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusTreeViewDragDestClass,
@@ -1137,7 +1137,7 @@ nautilus_tree_view_drag_dest_class_init (NautilusTreeViewDragDestClass *class)
G_TYPE_INT,
G_TYPE_INT);
signals[HANDLE_HOVER] =
- g_signal_new ("handle_hover",
+ g_signal_new ("handle-hover",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusTreeViewDragDestClass,
@@ -1170,19 +1170,19 @@ nautilus_tree_view_drag_dest_new (GtkTreeView *tree_view)
gtk_target_list_add_text_targets (targets, NAUTILUS_ICON_DND_TEXT);
g_signal_connect_object (tree_view,
- "drag_motion",
+ "drag-motion",
G_CALLBACK (drag_motion_callback),
dest, 0);
g_signal_connect_object (tree_view,
- "drag_leave",
+ "drag-leave",
G_CALLBACK (drag_leave_callback),
dest, 0);
g_signal_connect_object (tree_view,
- "drag_drop",
+ "drag-drop",
G_CALLBACK (drag_drop_callback),
dest, 0);
g_signal_connect_object (tree_view,
- "drag_data_received",
+ "drag-data-received",
G_CALLBACK (drag_data_received_callback),
dest, 0);
diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index 0470901..e9cfcc5 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 7032fbf..8b15c6c 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 e25d327..2cfe145 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 0f1ec38..4d7c362 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 529e1e9..18537ca 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 6fabf81..8b64d55 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 da18bba..2e20cfa 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 ba032a0..dd67ab9 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 ba8cb59..6ddcac6 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 90f3c50..9d31ba6 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 e3ff04a..8dc7db7 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 538bb6b..a31047a 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 5802001..ee60b58 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 8830fe0..79c7f0d 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 e3697a7..6793b7a 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 c41f48b..cf6e2fc 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 144c642..074a153 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 97a4285..c8242bd 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 8a2b1c6..6c67f5b 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,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
