Commit d721a8f2 authored by William Jon McCann's avatar William Jon McCann
parent 898573b6
......@@ -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 */
......
......@@ -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");
}
}
......
......@@ -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),
......
......@@ -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");
}
......@@ -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",
......
......@@ -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)