diff --git a/ChangeLog b/ChangeLog index 7231991114..630e974c89 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,6 @@ 2005-05-27 Sven Neumann - * (lots of files): Use the canonical form for signal names in lots - of places (but by far not all). + * (lots of files): Use the canonical form for signal names. 2005-05-27 Sven Neumann diff --git a/app/actions/edit-actions.c b/app/actions/edit-actions.c index bf7de1df6f..37f69818b6 100644 --- a/app/actions/edit-actions.c +++ b/app/actions/edit-actions.c @@ -165,13 +165,13 @@ edit_actions_setup (GimpActionGroup *group) G_N_ELEMENTS (edit_fill_actions), G_CALLBACK (edit_fill_cmd_callback)); - g_signal_connect_object (context, "foreground_changed", + g_signal_connect_object (context, "foreground-changed", G_CALLBACK (edit_actions_foreground_changed), group, 0); - g_signal_connect_object (context, "background_changed", + g_signal_connect_object (context, "background-changed", G_CALLBACK (edit_actions_background_changed), group, 0); - g_signal_connect_object (context, "pattern_changed", + g_signal_connect_object (context, "pattern-changed", G_CALLBACK (edit_actions_pattern_changed), group, 0); diff --git a/app/actions/error-console-commands.c b/app/actions/error-console-commands.c index 183766c3f0..8b75d48f68 100644 --- a/app/actions/error-console-commands.c +++ b/app/actions/error-console-commands.c @@ -106,7 +106,7 @@ error_console_save_cmd_callback (GtkAction *action, g_signal_connect (chooser, "response", G_CALLBACK (error_console_save_response), console); - g_signal_connect (chooser, "delete_event", + g_signal_connect (chooser, "delete-event", G_CALLBACK (gtk_true), NULL); diff --git a/app/actions/gradient-editor-commands.c b/app/actions/gradient-editor-commands.c index a9321c730c..f4ad0c9063 100644 --- a/app/actions/gradient-editor-commands.c +++ b/app/actions/gradient-editor-commands.c @@ -412,7 +412,7 @@ gradient_editor_replicate_cmd_callback (GtkAction *action, gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, TRUE, 4); gtk_widget_show (scale); - g_signal_connect (scale_data, "value_changed", + g_signal_connect (scale_data, "value-changed", G_CALLBACK (gimp_int_adjustment_update), &editor->replicate_times); @@ -507,7 +507,7 @@ gradient_editor_split_uniformly_cmd_callback (GtkAction *action, gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 4); gtk_widget_show (scale); - g_signal_connect (scale_data, "value_changed", + g_signal_connect (scale_data, "value-changed", G_CALLBACK (gimp_int_adjustment_update), &editor->split_parts); diff --git a/app/actions/gradients-commands.c b/app/actions/gradients-commands.c index 93c1f31c6d..815e0e2475 100644 --- a/app/actions/gradients-commands.c +++ b/app/actions/gradients-commands.c @@ -90,7 +90,7 @@ gradients_save_as_pov_ray_cmd_callback (GtkAction *action, g_signal_connect (chooser, "response", G_CALLBACK (gradients_save_as_pov_ray_response), gradient); - g_signal_connect (chooser, "delete_event", + g_signal_connect (chooser, "delete-event", G_CALLBACK (gtk_true), NULL); diff --git a/app/actions/text-editor-commands.c b/app/actions/text-editor-commands.c index 0355c8d6e2..9e5fa46404 100644 --- a/app/actions/text-editor-commands.c +++ b/app/actions/text-editor-commands.c @@ -83,7 +83,7 @@ text_editor_load_cmd_callback (GtkAction *action, g_signal_connect (chooser, "response", G_CALLBACK (text_editor_load_response), editor); - g_signal_connect (chooser, "delete_event", + g_signal_connect (chooser, "delete-event", G_CALLBACK (gtk_true), NULL); diff --git a/app/core/gimp-gradients.c b/app/core/gimp-gradients.c index 9df4bfca05..313cf1cae3 100644 --- a/app/core/gimp-gradients.c +++ b/app/core/gimp-gradients.c @@ -90,10 +90,10 @@ gimp_gradients_init (Gimp *gimp) gradient->segments->left_color.b, 0.0); - g_signal_connect (gimp->user_context, "foreground_changed", + g_signal_connect (gimp->user_context, "foreground-changed", G_CALLBACK (gimp_gradients_foreground_changed), gimp); - g_signal_connect (gimp->user_context, "background_changed", + g_signal_connect (gimp->user_context, "background-changed", G_CALLBACK (gimp_gradients_background_changed), gimp); } diff --git a/app/core/gimpbrush.c b/app/core/gimpbrush.c index 3f9b89c7a7..f3e4da678e 100644 --- a/app/core/gimpbrush.c +++ b/app/core/gimpbrush.c @@ -114,7 +114,7 @@ gimp_brush_class_init (GimpBrushClass *klass) parent_class = g_type_class_peek_parent (klass); brush_signals[SPACING_CHANGED] = - g_signal_new ("spacing_changed", + g_signal_new ("spacing-changed", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpBrushClass, spacing_changed), diff --git a/app/core/gimpcontext.c b/app/core/gimpcontext.c index 356069a2f9..f26ca803cc 100644 --- a/app/core/gimpcontext.c +++ b/app/core/gimpcontext.c @@ -1895,7 +1895,7 @@ gimp_context_real_set_tool (GimpContext *context, { g_object_ref (tool_info); - g_signal_connect_object (tool_info, "name_changed", + g_signal_connect_object (tool_info, "name-changed", G_CALLBACK (gimp_context_tool_dirty), context, 0); @@ -2265,7 +2265,7 @@ gimp_context_real_set_brush (GimpContext *context, { g_object_ref (brush); - g_signal_connect_object (brush, "name_changed", + g_signal_connect_object (brush, "name-changed", G_CALLBACK (gimp_context_brush_dirty), context, 0); @@ -2407,7 +2407,7 @@ gimp_context_real_set_pattern (GimpContext *context, { g_object_ref (pattern); - g_signal_connect_object (pattern, "name_changed", + g_signal_connect_object (pattern, "name-changed", G_CALLBACK (gimp_context_pattern_dirty), context, 0); @@ -2537,7 +2537,7 @@ gimp_context_real_set_gradient (GimpContext *context, { g_object_ref (gradient); - g_signal_connect_object (gradient, "name_changed", + g_signal_connect_object (gradient, "name-changed", G_CALLBACK (gimp_context_gradient_dirty), context, 0); @@ -2659,7 +2659,7 @@ gimp_context_real_set_palette (GimpContext *context, { g_object_ref (palette); - g_signal_connect_object (palette, "name_changed", + g_signal_connect_object (palette, "name-changed", G_CALLBACK (gimp_context_palette_dirty), context, 0); @@ -2803,7 +2803,7 @@ gimp_context_real_set_font (GimpContext *context, { g_object_ref (font); - g_signal_connect_object (font, "name_changed", + g_signal_connect_object (font, "name-changed", G_CALLBACK (gimp_context_font_dirty), context, 0); @@ -2941,7 +2941,7 @@ gimp_context_real_set_buffer (GimpContext *context, { g_object_ref (buffer); - g_signal_connect_object (buffer, "name_changed", + g_signal_connect_object (buffer, "name-changed", G_CALLBACK (gimp_context_buffer_dirty), context, 0); @@ -3081,7 +3081,7 @@ gimp_context_real_set_imagefile (GimpContext *context, { g_object_ref (imagefile); - g_signal_connect_object (imagefile, "name_changed", + g_signal_connect_object (imagefile, "name-changed", G_CALLBACK (gimp_context_imagefile_dirty), context, 0); @@ -3221,7 +3221,7 @@ gimp_context_real_set_template (GimpContext *context, { g_object_ref (template); - g_signal_connect_object (template, "name_changed", + g_signal_connect_object (template, "name-changed", G_CALLBACK (gimp_context_template_dirty), context, 0); diff --git a/app/core/gimpdrawable.c b/app/core/gimpdrawable.c index 3746937a64..b54c674bbd 100644 --- a/app/core/gimpdrawable.c +++ b/app/core/gimpdrawable.c @@ -221,7 +221,7 @@ gimp_drawable_class_init (GimpDrawableClass *klass) G_TYPE_INT); gimp_drawable_signals[ALPHA_CHANGED] = - g_signal_new ("alpha_changed", + g_signal_new ("alpha-changed", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpDrawableClass, alpha_changed), diff --git a/app/core/gimpprojection.c b/app/core/gimpprojection.c index 74ad41a267..738624c101 100644 --- a/app/core/gimpprojection.c +++ b/app/core/gimpprojection.c @@ -271,10 +271,10 @@ gimp_projection_new (GimpImage *gimage) g_signal_connect_object (gimage, "update", G_CALLBACK (gimp_projection_image_update), proj, 0); - g_signal_connect_object (gimage, "size_changed", + g_signal_connect_object (gimage, "size-changed", G_CALLBACK (gimp_projection_image_size_changed), proj, 0); - g_signal_connect_object (gimage, "mode_changed", + g_signal_connect_object (gimage, "mode-changed", G_CALLBACK (gimp_projection_image_mode_changed), proj, 0); g_signal_connect_object (gimage, "flush", diff --git a/app/dialogs/about-dialog.c b/app/dialogs/about-dialog.c index de26fac098..c4a6c912fa 100644 --- a/app/dialogs/about-dialog.c +++ b/app/dialogs/about-dialog.c @@ -165,10 +165,10 @@ about_dialog_create (void) g_signal_connect (widget, "unmap", G_CALLBACK (about_dialog_unmap), NULL); - g_signal_connect (widget, "button_press_event", + g_signal_connect (widget, "button-press-event", G_CALLBACK (about_dialog_button), NULL); - g_signal_connect (widget, "key_press_event", + g_signal_connect (widget, "key-press-event", G_CALLBACK (about_dialog_key), NULL); diff --git a/app/dialogs/channel-options-dialog.c b/app/dialogs/channel-options-dialog.c index 07fde40a21..2972515d5b 100644 --- a/app/dialogs/channel-options-dialog.c +++ b/app/dialogs/channel-options-dialog.c @@ -155,7 +155,7 @@ channel_options_dialog_new (GimpImage *gimage, TRUE, 0.0, 0.0, NULL, NULL); - g_signal_connect (opacity_adj, "value_changed", + g_signal_connect (opacity_adj, "value-changed", G_CALLBACK (channel_options_opacity_update), options->color_panel); @@ -163,7 +163,7 @@ channel_options_dialog_new (GimpImage *gimage, TRUE, TRUE, 0); gtk_widget_show (options->color_panel); - g_signal_connect (options->color_panel, "color_changed", + g_signal_connect (options->color_panel, "color-changed", G_CALLBACK (channel_options_color_changed), opacity_adj); diff --git a/app/dialogs/convert-dialog.c b/app/dialogs/convert-dialog.c index 3657e9f3d2..16e7d6cf6d 100644 --- a/app/dialogs/convert-dialog.c +++ b/app/dialogs/convert-dialog.c @@ -186,7 +186,7 @@ convert_dialog_new (GimpImage *gimage, gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0); gtk_widget_show (spinbutton); - g_signal_connect (adjustment, "value_changed", + g_signal_connect (adjustment, "value-changed", G_CALLBACK (gimp_int_adjustment_update), &dialog->num_colors); diff --git a/app/dialogs/info-dialog.c b/app/dialogs/info-dialog.c index 0ba47dc8d6..36978eaef6 100644 --- a/app/dialogs/info-dialog.c +++ b/app/dialogs/info-dialog.c @@ -229,7 +229,7 @@ info_dialog_add_scale (InfoDialog *idialog, gtk_scale_set_draw_value (GTK_SCALE (scale), FALSE); if (callback) - g_signal_connect (adjustment, "value_changed", + g_signal_connect (adjustment, "value-changed", callback, callback_data); @@ -270,7 +270,7 @@ info_dialog_add_spinbutton (InfoDialog *idialog, gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), SB_WIDTH); if (callback) - g_signal_connect (adjustment, "value_changed", + g_signal_connect (adjustment, "value-changed", callback, callback_data); @@ -316,7 +316,7 @@ info_dialog_add_sizeentry (InfoDialog *idialog, gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (sizeentry), i, value_ptr[i]); if (callback) - g_signal_connect (sizeentry, "value_changed", + g_signal_connect (sizeentry, "value-changed", callback, callback_data); diff --git a/app/dialogs/palette-import-dialog.c b/app/dialogs/palette-import-dialog.c index 8c0f8c0963..aff39a13c9 100644 --- a/app/dialogs/palette-import-dialog.c +++ b/app/dialogs/palette-import-dialog.c @@ -335,7 +335,7 @@ palette_import_dialog_new (Gimp *gimp) NULL, NULL)); g_signal_connect_swapped (import_dialog->num_colors, - "value_changed", + "value-changed", G_CALLBACK (palette_import_make_palette), import_dialog); @@ -347,7 +347,7 @@ palette_import_dialog_new (Gimp *gimp) TRUE, 0.0, 0.0, NULL, NULL)); - g_signal_connect (import_dialog->columns, "value_changed", + g_signal_connect (import_dialog->columns, "value-changed", G_CALLBACK (palette_import_columns_changed), import_dialog); @@ -360,7 +360,7 @@ palette_import_dialog_new (Gimp *gimp) NULL, NULL)); gimp_scale_entry_set_sensitive (GTK_OBJECT (import_dialog->threshold), FALSE); - g_signal_connect_swapped (import_dialog->threshold, "value_changed", + g_signal_connect_swapped (import_dialog->threshold, "value-changed", G_CALLBACK (palette_import_make_palette), import_dialog); @@ -390,13 +390,13 @@ palette_import_dialog_new (Gimp *gimp) G_CALLBACK (palette_import_image_remove), import_dialog); - g_signal_connect (import_dialog->context, "gradient_changed", + g_signal_connect (import_dialog->context, "gradient-changed", G_CALLBACK (palette_import_gradient_changed), import_dialog); - g_signal_connect (import_dialog->context, "image_changed", + g_signal_connect (import_dialog->context, "image-changed", G_CALLBACK (palette_import_image_changed), import_dialog); - g_signal_connect (import_dialog->filename_entry, "filename_changed", + g_signal_connect (import_dialog->filename_entry, "filename-changed", G_CALLBACK (palette_import_filename_changed), import_dialog); diff --git a/app/dialogs/preferences-dialog.c b/app/dialogs/preferences-dialog.c index 0b3daac87b..51dd4efc9c 100644 --- a/app/dialogs/preferences-dialog.c +++ b/app/dialogs/preferences-dialog.c @@ -1151,7 +1151,7 @@ prefs_display_options_frame_add (Gimp *gimp, gimp_color_panel_set_context (GIMP_COLOR_PANEL (button), gimp_get_user_context (gimp)); - g_signal_connect (button, "color_changed", + g_signal_connect (button, "color-changed", G_CALLBACK (prefs_canvas_padding_color_changed), gtk_bin_get_child (GTK_BIN (combo))); } diff --git a/app/dialogs/print-size-dialog.c b/app/dialogs/print-size-dialog.c index 30ef5fb7f4..5112c600e8 100644 --- a/app/dialogs/print-size-dialog.c +++ b/app/dialogs/print-size-dialog.c @@ -278,10 +278,10 @@ print_size_dialog_new (GimpImage *image, gtk_container_set_focus_chain (GTK_CONTAINER (entry), focus_chain); g_list_free (focus_chain); - g_signal_connect (private->size_entry, "value_changed", + g_signal_connect (private->size_entry, "value-changed", G_CALLBACK (print_size_dialog_size_changed), private); - g_signal_connect (private->resolution_entry, "value_changed", + g_signal_connect (private->resolution_entry, "value-changed", G_CALLBACK (print_size_dialog_resolution_changed), private); diff --git a/app/dialogs/resize-dialog.c b/app/dialogs/resize-dialog.c index 8415da0258..f618336ff7 100644 --- a/app/dialogs/resize-dialog.c +++ b/app/dialogs/resize-dialog.c @@ -233,7 +233,7 @@ resize_dialog_new (GimpViewable *viewable, gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (entry), 0, 0); gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (entry), 1, 0); - g_signal_connect (entry, "value_changed", + g_signal_connect (entry, "value-changed", G_CALLBACK (offset_update), private); @@ -264,7 +264,7 @@ resize_dialog_new (GimpViewable *viewable, if (pixbuf) gimp_offset_area_set_pixbuf (GIMP_OFFSET_AREA (private->area), pixbuf); - g_signal_connect (private->area, "offsets_changed", + g_signal_connect (private->area, "offsets-changed", G_CALLBACK (offsets_changed), private); @@ -441,5 +441,5 @@ offset_center_clicked (GtkWidget *widget, gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (private->offset), 0, off_x); gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (private->offset), 1, off_y); - g_signal_emit_by_name (private->offset, "value_changed", 0); + g_signal_emit_by_name (private->offset, "value-changed", 0); } diff --git a/app/dialogs/tips-dialog.c b/app/dialogs/tips-dialog.c index 4405ce755e..27e6e0ea23 100644 --- a/app/dialogs/tips-dialog.c +++ b/app/dialogs/tips-dialog.c @@ -131,7 +131,7 @@ tips_dialog_create (Gimp *gimp) gtk_window_set_position (GTK_WINDOW (tips_dialog), GTK_WIN_POS_CENTER); gtk_window_set_resizable (GTK_WINDOW (tips_dialog), TRUE); - g_signal_connect (tips_dialog, "delete_event", + g_signal_connect (tips_dialog, "delete-event", G_CALLBACK (gtk_widget_destroy), NULL); diff --git a/app/dialogs/user-install-dialog.c b/app/dialogs/user-install-dialog.c index 066e8bfc0c..a4c57199a1 100644 --- a/app/dialogs/user-install-dialog.c +++ b/app/dialogs/user-install-dialog.c @@ -743,7 +743,7 @@ user_install_dialog_run (const gchar *alternate_system_gimprc, darea = gtk_drawing_area_new (); TITLE_STYLE (darea); gtk_widget_set_size_request (darea, 16, 16); - g_signal_connect (darea, "expose_event", + g_signal_connect (darea, "expose-event", G_CALLBACK (user_install_corner_expose), GINT_TO_POINTER (GTK_CORNER_TOP_LEFT)); gtk_table_attach (GTK_TABLE (table), darea, 0, 1, 0, 1, @@ -753,7 +753,7 @@ user_install_dialog_run (const gchar *alternate_system_gimprc, darea = gtk_drawing_area_new (); TITLE_STYLE (darea); gtk_widget_set_size_request (darea, 16, 16); - g_signal_connect (darea, "expose_event", + g_signal_connect (darea, "expose-event", G_CALLBACK (user_install_corner_expose), GINT_TO_POINTER (GTK_CORNER_BOTTOM_LEFT)); gtk_table_attach (GTK_TABLE (table), darea, 0, 1, 2, 3, @@ -994,7 +994,7 @@ user_install_dialog_run (const gchar *alternate_system_gimprc, gtk_tree_view_expand_all (GTK_TREE_VIEW (tv)); - g_signal_connect (tv, "size_allocate", + g_signal_connect (tv, "size-allocate", G_CALLBACK (user_install_tv_fix_size_request), NULL); diff --git a/app/dialogs/vectors-export-dialog.c b/app/dialogs/vectors-export-dialog.c index 1f7e6b4b7e..42381c2bca 100644 --- a/app/dialogs/vectors-export-dialog.c +++ b/app/dialogs/vectors-export-dialog.c @@ -76,7 +76,7 @@ vectors_export_dialog_new (GimpImage *image, G_CALLBACK (gtk_widget_destroy), dialog->dialog, 0); - g_signal_connect (dialog->dialog, "delete_event", + g_signal_connect (dialog->dialog, "delete-event", G_CALLBACK (gtk_true), NULL); diff --git a/app/dialogs/vectors-import-dialog.c b/app/dialogs/vectors-import-dialog.c index 63430e409a..c9ebf7d373 100644 --- a/app/dialogs/vectors-import-dialog.c +++ b/app/dialogs/vectors-import-dialog.c @@ -80,7 +80,7 @@ vectors_import_dialog_new (GimpImage *image, G_CALLBACK (gtk_widget_destroy), dialog->dialog, 0); - g_signal_connect (dialog->dialog, "delete_event", + g_signal_connect (dialog->dialog, "delete-event", G_CALLBACK (gtk_true), NULL); diff --git a/app/display/gimpdisplayshell-callbacks.c b/app/display/gimpdisplayshell-callbacks.c index 9d59a359c3..c7668c6f02 100644 --- a/app/display/gimpdisplayshell-callbacks.c +++ b/app/display/gimpdisplayshell-callbacks.c @@ -284,10 +284,10 @@ gimp_display_shell_canvas_realize (GtkWidget *canvas, shell->disp_height = canvas->allocation.height; /* set up the scrollbar observers */ - g_signal_connect (shell->hsbdata, "value_changed", + g_signal_connect (shell->hsbdata, "value-changed", G_CALLBACK (gimp_display_shell_hscrollbar_update), shell); - g_signal_connect (shell->vsbdata, "value_changed", + g_signal_connect (shell->vsbdata, "value-changed", G_CALLBACK (gimp_display_shell_vscrollbar_update), shell); diff --git a/app/display/gimpdisplayshell-close.c b/app/display/gimpdisplayshell-close.c index ba9f56f6f2..5785ceb0a4 100644 --- a/app/display/gimpdisplayshell-close.c +++ b/app/display/gimpdisplayshell-close.c @@ -160,7 +160,7 @@ gimp_display_shell_close_dialog (GimpDisplayShell *shell, box = GIMP_MESSAGE_DIALOG (dialog)->box; - g_signal_connect_object (gimage, "name_changed", + g_signal_connect_object (gimage, "name-changed", G_CALLBACK (gimp_display_shell_close_name_changed), box, 0); diff --git a/app/display/gimpdisplayshell.c b/app/display/gimpdisplayshell.c index 185d620964..b9cd829c3e 100644 --- a/app/display/gimpdisplayshell.c +++ b/app/display/gimpdisplayshell.c @@ -331,16 +331,16 @@ gimp_display_shell_init (GimpDisplayShell *shell) GDK_SCROLL_MASK)); /* active display callback */ - g_signal_connect (shell, "button_press_event", + g_signal_connect (shell, "button-press-event", G_CALLBACK (gimp_display_shell_events), shell); - g_signal_connect (shell, "button_release_event", + g_signal_connect (shell, "button-release-event", G_CALLBACK (gimp_display_shell_events), shell); - g_signal_connect (shell, "key_press_event", + g_signal_connect (shell, "key-press-event", G_CALLBACK (gimp_display_shell_events), shell); - g_signal_connect (shell, "window_state_event", + g_signal_connect (shell, "window-state-event", G_CALLBACK (gimp_display_shell_events), shell); @@ -743,13 +743,13 @@ gimp_display_shell_new (GimpDisplay *gdisp, NULL); /* active display callback */ - g_signal_connect (shell->menubar, "button_press_event", + g_signal_connect (shell->menubar, "button-press-event", G_CALLBACK (gimp_display_shell_events), shell); - g_signal_connect (shell->menubar, "button_release_event", + g_signal_connect (shell->menubar, "button-release-event", G_CALLBACK (gimp_display_shell_events), shell); - g_signal_connect (shell->menubar, "key_press_event", + g_signal_connect (shell->menubar, "key-press-event", G_CALLBACK (gimp_display_shell_events), shell); } @@ -805,7 +805,7 @@ gimp_display_shell_new (GimpDisplay *gdisp, gtk_container_add (GTK_CONTAINER (shell->origin_button), image); gtk_widget_show (image); - g_signal_connect (shell->origin_button, "button_press_event", + g_signal_connect (shell->origin_button, "button-press-event", G_CALLBACK (gimp_display_shell_origin_button_press), shell); @@ -821,10 +821,10 @@ gimp_display_shell_new (GimpDisplay *gdisp, gtk_widget_set_events (GTK_WIDGET (shell->hrule), GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK); - g_signal_connect_swapped (shell->canvas, "motion_notify_event", + g_signal_connect_swapped (shell->canvas, "motion-notify-event", G_CALLBACK (GTK_WIDGET_GET_CLASS (shell->hrule)->motion_notify_event), shell->hrule); - g_signal_connect (shell->hrule, "button_press_event", + g_signal_connect (shell->hrule, "button-press-event", G_CALLBACK (gimp_display_shell_hruler_button_press), shell); @@ -835,10 +835,10 @@ gimp_display_shell_new (GimpDisplay *gdisp, gtk_widget_set_events (GTK_WIDGET (shell->vrule), GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK); - g_signal_connect_swapped (shell->canvas, "motion_notify_event", + g_signal_connect_swapped (shell->canvas, "motion-notify-event", G_CALLBACK (GTK_WIDGET_GET_CLASS (shell->vrule)->motion_notify_event), shell->vrule); - g_signal_connect (shell->vrule, "button_press_event", + g_signal_connect (shell->vrule, "button-press-event", G_CALLBACK (gimp_display_shell_vruler_button_press), shell); @@ -853,47 +853,47 @@ gimp_display_shell_new (GimpDisplay *gdisp, g_signal_connect (shell->canvas, "realize", G_CALLBACK (gimp_display_shell_canvas_realize), shell); - g_signal_connect (shell->canvas, "size_allocate", + g_signal_connect (shell->canvas, "size-allocate", G_CALLBACK (gimp_display_shell_canvas_size_allocate), shell); - g_signal_connect (shell->canvas, "expose_event", + g_signal_connect (shell->canvas, "expose-event", G_CALLBACK (gimp_display_shell_canvas_expose), shell); - g_signal_connect (shell->canvas, "enter_notify_event", + g_signal_connect (shell->canvas, "enter-notify-event", G_CALLBACK (gimp_display_shell_canvas_tool_events), shell); - g_signal_connect (shell->canvas, "leave_notify_event", + g_signal_connect (shell->canvas, "leave-notify-event", G_CALLBACK (gimp_display_shell_canvas_tool_events), shell); - g_signal_connect (shell->canvas, "proximity_in_event", + g_signal_connect (shell->canvas, "proximity-in-event", G_CALLBACK (gimp_display_shell_canvas_tool_events), shell); - g_signal_connect (shell->canvas, "proximity_out_event", + g_signal_connect (shell->canvas, "proximity-out-event", G_CALLBACK (gimp_display_shell_canvas_tool_events), shell); - g_signal_connect (shell->canvas, "focus_in_event", + g_signal_connect (shell->canvas, "focus-in-event", G_CALLBACK (gimp_display_shell_canvas_tool_events), shell); - g_signal_connect (shell->canvas, "focus_out_event", + g_signal_connect (shell->canvas, "focus-out-event", G_CALLBACK (gimp_display_shell_canvas_tool_events), shell); - g_signal_connect (shell->canvas, "button_press_event", + g_signal_connect (shell->canvas, "button-press-event", G_CALLBACK (gimp_display_shell_canvas_tool_events), shell); - g_signal_connect (shell->canvas, "button_release_event", + g_signal_connect (shell->canvas, "button-release-event", G_CALLBACK (gimp_display_shell_canvas_tool_events), shell); - g_signal_connect (shell->canvas, "scroll_event", + g_signal_connect (shell->canvas, "scroll-event", G_CALLBACK (gimp_display_shell_canvas_tool_events), shell); - g_signal_connect (shell->canvas, "motion_notify_event", + g_signal_connect (shell->canvas, "motion-notify-event", G_CALLBACK (gimp_display_shell_canvas_tool_events), shell); - g_signal_connect (shell->canvas, "key_press_event", + g_signal_connect (shell->canvas, "key-press-event", G_CALLBACK (gimp_display_shell_canvas_tool_events), shell); - g_signal_connect (shell->canvas, "key_release_event", + g_signal_connect (shell->canvas, "key-release-event", G_CALLBACK (gimp_display_shell_canvas_tool_events), shell); @@ -935,7 +935,7 @@ gimp_display_shell_new (GimpDisplay *gdisp, g_signal_connect (shell->qmask_button, "toggled", G_CALLBACK (gimp_display_shell_qmask_toggled), shell); - g_signal_connect (shell->qmask_button, "button_press_event", + g_signal_connect (shell->qmask_button, "button-press-event", G_CALLBACK (gimp_display_shell_qmask_button_press), shell); @@ -946,7 +946,7 @@ gimp_display_shell_new (GimpDisplay *gdisp, gtk_container_add (GTK_CONTAINER (shell->nav_ebox), image); gtk_widget_show (image); - g_signal_connect (shell->nav_ebox, "button_press_event", + g_signal_connect (shell->nav_ebox, "button-press-event", G_CALLBACK (gimp_display_shell_nav_button_press), shell); diff --git a/app/display/gimpnavigationeditor.c b/app/display/gimpnavigationeditor.c index ff6de3ce1b..240c63535c 100644 --- a/app/display/gimpnavigationeditor.c +++ b/app/display/gimpnavigationeditor.c @@ -163,7 +163,7 @@ gimp_navigation_editor_init (GimpNavigationEditor *editor) gtk_container_add (GTK_CONTAINER (frame), editor->view); gtk_widget_show (editor->view); - g_signal_connect (editor->view, "marker_changed", + g_signal_connect (editor->view, "marker-changed", G_CALLBACK (gimp_navigation_editor_marker_changed), editor); g_signal_connect (editor->view, "zoom", @@ -214,7 +214,7 @@ gimp_navigation_editor_set_context (GimpDocked *docked, if (context) { - g_signal_connect (context, "display_changed", + g_signal_connect (context, "display-changed", G_CALLBACK (gimp_navigation_editor_context_changed), editor); @@ -279,7 +279,7 @@ gimp_navigation_editor_popup (GimpDisplayShell *shell, gtk_container_add (GTK_CONTAINER (frame), GTK_WIDGET (editor)); gtk_widget_show (GTK_WIDGET (editor)); - g_signal_connect (editor->view, "button_release_event", + g_signal_connect (editor->view, "button-release-event", G_CALLBACK (gimp_navigation_editor_button_release), shell); } @@ -415,7 +415,7 @@ gimp_navigation_editor_new_private (GimpMenuFactory *menu_factory, editor->zoom_adjustment = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, -8.0, 8.0, 0.5, 1.0, 0.0)); - g_signal_connect (editor->zoom_adjustment, "value_changed", + g_signal_connect (editor->zoom_adjustment, "value-changed", G_CALLBACK (gimp_navigation_editor_zoom_adj_changed), editor); diff --git a/app/gui/gui.c b/app/gui/gui.c index 06985f4933..11f8d58ee3 100644 --- a/app/gui/gui.c +++ b/app/gui/gui.c @@ -370,7 +370,7 @@ gui_restore_callback (Gimp *gimp, G_CALLBACK (gui_show_help_button_notify), gimp); - g_signal_connect (gimp_get_user_context (gimp), "display_changed", + g_signal_connect (gimp_get_user_context (gimp), "display-changed", G_CALLBACK (gui_display_changed), gimp); diff --git a/app/gui/splash.c b/app/gui/splash.c index 0477246911..397f817167 100644 --- a/app/gui/splash.c +++ b/app/gui/splash.c @@ -114,14 +114,14 @@ splash_create (void) splash->window = g_object_new (GTK_TYPE_WINDOW, "type", GTK_WINDOW_TOPLEVEL, - "type_hint", GDK_WINDOW_TYPE_HINT_SPLASHSCREEN, + "type-hint", GDK_WINDOW_TYPE_HINT_SPLASHSCREEN, "title", _("GIMP Startup"), "role", "gimp-startup", - "window_position", GTK_WIN_POS_CENTER, + "window-position", GTK_WIN_POS_CENTER, "resizable", FALSE, NULL); - g_signal_connect_swapped (splash->window, "delete_event", + g_signal_connect_swapped (splash->window, "delete-event", G_CALLBACK (exit), GINT_TO_POINTER (0)); @@ -167,7 +167,7 @@ splash_create (void) GDK_RGB_DITHER_NORMAL, 0, 0); g_object_unref (pixbuf); - g_signal_connect (splash->area, "expose_event", + g_signal_connect (splash->area, "expose-event", G_CALLBACK (splash_area_expose), splash); diff --git a/app/tools/gimpbrightnesscontrasttool.c b/app/tools/gimpbrightnesscontrasttool.c index 721d3dc8c3..f45ad2d2fa 100644 --- a/app/tools/gimpbrightnesscontrasttool.c +++ b/app/tools/gimpbrightnesscontrasttool.c @@ -242,7 +242,7 @@ gimp_brightness_contrast_tool_dialog (GimpImageMapTool *image_map_tool) slider = GIMP_SCALE_ENTRY_SCALE (data); gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED); - g_signal_connect (data, "value_changed", + g_signal_connect (data, "value-changed", G_CALLBACK (brightness_contrast_brightness_adjustment_update), bc_tool); @@ -257,7 +257,7 @@ gimp_brightness_contrast_tool_dialog (GimpImageMapTool *image_map_tool) slider = GIMP_SCALE_ENTRY_SCALE (data); gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED); - g_signal_connect (data, "value_changed", + g_signal_connect (data, "value-changed", G_CALLBACK (brightness_contrast_contrast_adjustment_update), bc_tool); } diff --git a/app/tools/gimpcolorbalancetool.c b/app/tools/gimpcolorbalancetool.c index 9d5cff9357..ee89e313ba 100644 --- a/app/tools/gimpcolorbalancetool.c +++ b/app/tools/gimpcolorbalancetool.c @@ -299,21 +299,21 @@ gimp_color_balance_tool_dialog (GimpImageMapTool *image_map_tool) cb_tool->cyan_red_adj = create_levels_scale (_("Cyan"), _("Red"), table, 0); - g_signal_connect (cb_tool->cyan_red_adj, "value_changed", + g_signal_connect (cb_tool->cyan_red_adj, "value-changed", G_CALLBACK (color_balance_cr_adjustment_update), cb_tool); cb_tool->magenta_green_adj = create_levels_scale (_("Magenta"), _("Green"), table, 1); - g_signal_connect (cb_tool->magenta_green_adj, "value_changed", + g_signal_connect (cb_tool->magenta_green_adj, "value-changed", G_CALLBACK (color_balance_mg_adjustment_update), cb_tool); cb_tool->yellow_blue_adj = create_levels_scale (_("Yellow"), _("Blue"), table, 2); - g_signal_connect (cb_tool->yellow_blue_adj, "value_changed", + g_signal_connect (cb_tool->yellow_blue_adj, "value-changed", G_CALLBACK (color_balance_yb_adjustment_update), cb_tool); diff --git a/app/tools/gimpcolorizetool.c b/app/tools/gimpcolorizetool.c index d5ab1c0e97..7d906f511f 100644 --- a/app/tools/gimpcolorizetool.c +++ b/app/tools/gimpcolorizetool.c @@ -258,7 +258,7 @@ gimp_colorize_tool_dialog (GimpImageMapTool *image_map_tool) slider = GIMP_SCALE_ENTRY_SCALE (data); gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED); - g_signal_connect (data, "value_changed", + g_signal_connect (data, "value-changed", G_CALLBACK (colorize_hue_adj_update), col_tool); @@ -272,7 +272,7 @@ gimp_colorize_tool_dialog (GimpImageMapTool *image_map_tool) slider = GIMP_SCALE_ENTRY_SCALE (data); gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED); - g_signal_connect (col_tool->saturation_data, "value_changed", + g_signal_connect (col_tool->saturation_data, "value-changed", G_CALLBACK (colorize_saturation_adj_update), col_tool); @@ -286,7 +286,7 @@ gimp_colorize_tool_dialog (GimpImageMapTool *image_map_tool) slider = GIMP_SCALE_ENTRY_SCALE (data); gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED); - g_signal_connect (data, "value_changed", + g_signal_connect (data, "value-changed", G_CALLBACK (colorize_lightness_adj_update), col_tool); } diff --git a/app/tools/gimpcurvestool.c b/app/tools/gimpcurvestool.c index 8fc87f125c..b941e8a1ca 100644 --- a/app/tools/gimpcurvestool.c +++ b/app/tools/gimpcurvestool.c @@ -554,7 +554,7 @@ gimp_curves_tool_dialog (GimpImageMapTool *image_map_tool) g_signal_connect (tool->graph, "event", G_CALLBACK (curves_graph_events), tool); - g_signal_connect_after (tool->graph, "expose_event", + g_signal_connect_after (tool->graph, "expose-event", G_CALLBACK (curves_graph_expose), tool); diff --git a/app/tools/gimphuesaturationtool.c b/app/tools/gimphuesaturationtool.c index 0b2c61df11..9122468093 100644 --- a/app/tools/gimphuesaturationtool.c +++ b/app/tools/gimphuesaturationtool.c @@ -377,7 +377,7 @@ gimp_hue_saturation_tool_dialog (GimpImageMapTool *image_map_tool) slider = GIMP_SCALE_ENTRY_SCALE (data); gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED); - g_signal_connect (data, "value_changed", + g_signal_connect (data, "value-changed", G_CALLBACK (hue_saturation_overlap_adjustment_update), hs_tool); @@ -411,7 +411,7 @@ gimp_hue_saturation_tool_dialog (GimpImageMapTool *image_map_tool) slider = GIMP_SCALE_ENTRY_SCALE (data); gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED); - g_signal_connect (data, "value_changed", + g_signal_connect (data, "value-changed", G_CALLBACK (hue_saturation_hue_adjustment_update), hs_tool); @@ -429,7 +429,7 @@ gimp_hue_saturation_tool_dialog (GimpImageMapTool *image_map_tool) slider = GIMP_SCALE_ENTRY_SCALE (data); gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED); - g_signal_connect (data, "value_changed", + g_signal_connect (data, "value-changed", G_CALLBACK (hue_saturation_lightness_adjustment_update), hs_tool); @@ -447,7 +447,7 @@ gimp_hue_saturation_tool_dialog (GimpImageMapTool *image_map_tool) slider = GIMP_SCALE_ENTRY_SCALE (data); gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED); - g_signal_connect (hs_tool->saturation_data, "value_changed", + g_signal_connect (hs_tool->saturation_data, "value-changed", G_CALLBACK (hue_saturation_saturation_adjustment_update), hs_tool); diff --git a/app/tools/gimpimagemaptool.c b/app/tools/gimpimagemaptool.c index 59e6d2bd8c..0693eeb578 100644 --- a/app/tools/gimpimagemaptool.c +++ b/app/tools/gimpimagemaptool.c @@ -783,7 +783,7 @@ gimp_image_map_tool_settings_dialog (GimpImageMapTool *tool, g_signal_connect (chooser, "response", G_CALLBACK (settings_dialog_response), tool); - g_signal_connect (chooser, "delete_event", + g_signal_connect (chooser, "delete-event", G_CALLBACK (gtk_true), NULL); diff --git a/app/tools/gimplevelstool.c b/app/tools/gimplevelstool.c index 07181b7571..fd037d8d3e 100644 --- a/app/tools/gimplevelstool.c +++ b/app/tools/gimplevelstool.c @@ -480,7 +480,7 @@ gimp_levels_tool_dialog (GimpImageMapTool *image_map_tool) g_signal_connect (tool->input_area, "event", G_CALLBACK (levels_input_area_event), tool); - g_signal_connect_after (tool->input_area, "expose_event", + g_signal_connect_after (tool->input_area, "expose-event", G_CALLBACK (levels_input_area_expose), tool); @@ -523,7 +523,7 @@ gimp_levels_tool_dialog (GimpImageMapTool *image_map_tool) gtk_widget_show (spinbutton); tool->low_input = GTK_ADJUSTMENT (data); - g_signal_connect (tool->low_input, "value_changed", + g_signal_connect (tool->low_input, "value-changed", G_CALLBACK (levels_low_input_adjustment_update), tool); @@ -534,7 +534,7 @@ gimp_levels_tool_dialog (GimpImageMapTool *image_map_tool) gtk_widget_show (spinbutton); tool->gamma = GTK_ADJUSTMENT (data); - g_signal_connect (tool->gamma, "value_changed", + g_signal_connect (tool->gamma, "value-changed", G_CALLBACK (levels_gamma_adjustment_update), tool); @@ -552,7 +552,7 @@ gimp_levels_tool_dialog (GimpImageMapTool *image_map_tool) gtk_widget_show (spinbutton); tool->high_input = GTK_ADJUSTMENT (data); - g_signal_connect (tool->high_input, "value_changed", + g_signal_connect (tool->high_input, "value-changed", G_CALLBACK (levels_high_input_adjustment_update), tool); @@ -580,7 +580,7 @@ gimp_levels_tool_dialog (GimpImageMapTool *image_map_tool) g_signal_connect (tool->output_area, "event", G_CALLBACK (levels_output_area_event), tool); - g_signal_connect_after (tool->output_area, "expose_event", + g_signal_connect_after (tool->output_area, "expose-event", G_CALLBACK (levels_output_area_expose), tool); @@ -607,7 +607,7 @@ gimp_levels_tool_dialog (GimpImageMapTool *image_map_tool) gtk_widget_show (spinbutton); tool->low_output = GTK_ADJUSTMENT (data); - g_signal_connect (tool->low_output, "value_changed", + g_signal_connect (tool->low_output, "value-changed", G_CALLBACK (levels_low_output_adjustment_update), tool); @@ -617,7 +617,7 @@ gimp_levels_tool_dialog (GimpImageMapTool *image_map_tool) gtk_widget_show (spinbutton); tool->high_output = GTK_ADJUSTMENT (data); - g_signal_connect (tool->high_output, "value_changed", + g_signal_connect (tool->high_output, "value-changed", G_CALLBACK (levels_high_output_adjustment_update), tool); diff --git a/app/tools/gimpposterizetool.c b/app/tools/gimpposterizetool.c index f8b4ae6ac2..bc28b1a6d7 100644 --- a/app/tools/gimpposterizetool.c +++ b/app/tools/gimpposterizetool.c @@ -229,7 +229,7 @@ gimp_posterize_tool_dialog (GimpImageMapTool *image_map_tool) slider = GIMP_SCALE_ENTRY_SCALE (data); gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED); - g_signal_connect (posterize_tool->levels_data, "value_changed", + g_signal_connect (posterize_tool->levels_data, "value-changed", G_CALLBACK (posterize_levels_adjustment_update), posterize_tool); } diff --git a/app/tools/gimpscaletool.c b/app/tools/gimpscaletool.c index 60d8d5f52f..d886cbd633 100644 --- a/app/tools/gimpscaletool.c +++ b/app/tools/gimpscaletool.c @@ -178,7 +178,7 @@ gimp_scale_tool_dialog (GimpTransformTool *tr_tool) GIMP_SIZE_ENTRY_UPDATE_SIZE, G_CALLBACK (gimp_scale_tool_size_changed), tr_tool); - g_signal_connect (scale->sizeentry, "unit_changed", + g_signal_connect (scale->sizeentry, "unit-changed", G_CALLBACK (gimp_scale_tool_unit_changed), tr_tool); diff --git a/app/tools/gimptextoptions.c b/app/tools/gimptextoptions.c index 4018bb916b..ef68123ef5 100644 --- a/app/tools/gimptextoptions.c +++ b/app/tools/gimptextoptions.c @@ -551,7 +551,7 @@ gimp_text_options_editor_new (GimpTextOptions *options, gimp_text_editor_set_direction (GIMP_TEXT_EDITOR (editor), options->base_dir); - g_signal_connect_object (editor, "dir_changed", + g_signal_connect_object (editor, "dir-changed", G_CALLBACK (gimp_text_options_dir_changed), options, 0); g_signal_connect_object (options, "notify::base-direction", diff --git a/app/tools/gimptexttool.c b/app/tools/gimptexttool.c index 0265792240..e6b2bff85d 100644 --- a/app/tools/gimptexttool.c +++ b/app/tools/gimptexttool.c @@ -804,7 +804,7 @@ gimp_text_tool_editor (GimpTextTool *text_tool) gimp_text_editor_set_text (GIMP_TEXT_EDITOR (text_tool->editor), text_tool->text->text, -1); - g_signal_connect_object (text_tool->editor, "text_changed", + g_signal_connect_object (text_tool->editor, "text-changed", G_CALLBACK (gimp_text_tool_text_changed), text_tool, 0); @@ -986,7 +986,7 @@ gimp_text_tool_set_image (GimpTextTool *text_tool, g_object_add_weak_pointer (G_OBJECT (text_tool->image), (gpointer *) &text_tool->image); - g_signal_connect_object (text_tool->image, "active_layer_changed", + g_signal_connect_object (text_tool->image, "active-layer-changed", G_CALLBACK (gimp_text_tool_layer_changed), text_tool, 0); diff --git a/app/tools/gimpthresholdtool.c b/app/tools/gimpthresholdtool.c index d1cf9463f2..1f9f29ae4a 100644 --- a/app/tools/gimpthresholdtool.c +++ b/app/tools/gimpthresholdtool.c @@ -270,7 +270,7 @@ gimp_threshold_tool_dialog (GimpImageMapTool *image_map_tool) t_tool->histogram_box = GIMP_HISTOGRAM_BOX (box); - g_signal_connect (t_tool->histogram_box->view, "range_changed", + g_signal_connect (t_tool->histogram_box->view, "range-changed", G_CALLBACK (gimp_threshold_tool_histogram_range), t_tool); diff --git a/app/tools/gimpvectortool.c b/app/tools/gimpvectortool.c index cc99a2d73f..5fbbe2d4c0 100644 --- a/app/tools/gimpvectortool.c +++ b/app/tools/gimpvectortool.c @@ -1590,13 +1590,13 @@ gimp_vector_tool_set_vectors (GimpVectorTool *vector_tool, g_object_ref (vectors); - g_signal_connect_object (item->gimage, "active_vectors_changed", + g_signal_connect_object (item->gimage, "active-vectors-changed", G_CALLBACK (gimp_vector_tool_vectors_changed), vector_tool, 0); g_signal_connect_object (vectors, "removed", G_CALLBACK (gimp_vector_tool_vectors_removed), vector_tool, 0); - g_signal_connect_object (vectors, "visibility_changed", + g_signal_connect_object (vectors, "visibility-changed", G_CALLBACK (gimp_vector_tool_vectors_visible), vector_tool, 0); g_signal_connect_object (vectors, "freeze", diff --git a/app/tools/tool_manager.c b/app/tools/tool_manager.c index 7959334c66..4039e67c2a 100644 --- a/app/tools/tool_manager.c +++ b/app/tools/tool_manager.c @@ -98,7 +98,7 @@ tool_manager_init (Gimp *gimp) user_context = gimp_get_user_context (gimp); - g_signal_connect (user_context, "tool_changed", + g_signal_connect (user_context, "tool-changed", G_CALLBACK (tool_manager_tool_changed), tool_manager); } @@ -460,10 +460,10 @@ tool_manager_tool_changed (GimpContext *user_context, /* FIXME: gimp_busy HACK */ if (user_context->gimp->busy) { - /* there may be contexts waiting for the user_context's "tool_changed" + /* there may be contexts waiting for the user_context's "tool-changed" * signal, so stop emitting it. */ - g_signal_stop_emission_by_name (user_context, "tool_changed"); + g_signal_stop_emission_by_name (user_context, "tool-changed"); if (G_TYPE_FROM_INSTANCE (tool_manager->active_tool) != tool_info->tool_type) diff --git a/app/widgets/gimpactionview.c b/app/widgets/gimpactionview.c index 299531f877..5eb28f3b3d 100644 --- a/app/widgets/gimpactionview.c +++ b/app/widgets/gimpactionview.c @@ -185,7 +185,7 @@ gimp_action_view_button_press (GtkWidget *widget, g_object_set_data_full (G_OBJECT (tree_view), "start_editing_path", path, (GDestroyNotify) gtk_tree_path_free); - g_signal_stop_emission_by_name (tree_view, "button_press_event"); + g_signal_stop_emission_by_name (tree_view, "button-press-event"); closure = g_cclosure_new_object (G_CALLBACK (idle_start_editing), G_OBJECT (tree_view)); @@ -345,7 +345,7 @@ gimp_action_view_new (GimpUIManager *manager, if (show_shortcuts) { - g_signal_connect (view, "button_press_event", + g_signal_connect (view, "button-press-event", G_CALLBACK (gimp_action_view_button_press), NULL); diff --git a/app/widgets/gimpbrusheditor.c b/app/widgets/gimpbrusheditor.c index a393bb6f47..634368e628 100644 --- a/app/widgets/gimpbrusheditor.c +++ b/app/widgets/gimpbrusheditor.c @@ -157,7 +157,7 @@ gimp_brush_editor_init (GimpBrushEditor *editor) gimp_scale_entry_set_logarithmic (GTK_OBJECT (editor->radius_data), TRUE); - g_signal_connect (editor->radius_data, "value_changed", + g_signal_connect (editor->radius_data, "value-changed", G_CALLBACK (gimp_brush_editor_update_brush), editor); @@ -170,7 +170,7 @@ gimp_brush_editor_init (GimpBrushEditor *editor) TRUE, 0.0, 0.0, NULL, NULL)); - g_signal_connect (editor->spikes_data, "value_changed", + g_signal_connect (editor->spikes_data, "value-changed", G_CALLBACK (gimp_brush_editor_update_brush), editor); @@ -183,7 +183,7 @@ gimp_brush_editor_init (GimpBrushEditor *editor) TRUE, 0.0, 0.0, NULL, NULL)); - g_signal_connect (editor->hardness_data, "value_changed", + g_signal_connect (editor->hardness_data, "value-changed", G_CALLBACK (gimp_brush_editor_update_brush), editor); @@ -196,7 +196,7 @@ gimp_brush_editor_init (GimpBrushEditor *editor) TRUE, 0.0, 0.0, NULL, NULL)); - g_signal_connect (editor->aspect_ratio_data,"value_changed", + g_signal_connect (editor->aspect_ratio_data,"value-changed", G_CALLBACK (gimp_brush_editor_update_brush), editor); @@ -209,7 +209,7 @@ gimp_brush_editor_init (GimpBrushEditor *editor) TRUE, 0.0, 0.0, NULL, NULL)); - g_signal_connect (editor->angle_data, "value_changed", + g_signal_connect (editor->angle_data, "value-changed", G_CALLBACK (gimp_brush_editor_update_brush), editor); @@ -223,7 +223,7 @@ gimp_brush_editor_init (GimpBrushEditor *editor) _("Percentage of width of brush"), NULL)); - g_signal_connect (editor->spacing_data, "value_changed", + g_signal_connect (editor->spacing_data, "value-changed", G_CALLBACK (gimp_brush_editor_update_brush), editor); } diff --git a/app/widgets/gimpbrushfactoryview.c b/app/widgets/gimpbrushfactoryview.c index 8c8fa76de0..6e264e4bba 100644 --- a/app/widgets/gimpbrushfactoryview.c +++ b/app/widgets/gimpbrushfactoryview.c @@ -119,7 +119,7 @@ gimp_brush_factory_view_init (GimpBrushFactoryView *view) view->spacing_scale = GIMP_SCALE_ENTRY_SCALE (view->spacing_adjustment); - g_signal_connect (view->spacing_adjustment, "value_changed", + g_signal_connect (view->spacing_adjustment, "value-changed", G_CALLBACK (gimp_brush_factory_view_spacing_update), view); @@ -191,7 +191,7 @@ gimp_brush_factory_view_new (GimpViewType view_type, FALSE, FALSE, 0); factory_view->spacing_changed_handler_id = - gimp_container_add_handler (factory->container, "spacing_changed", + gimp_container_add_handler (factory->container, "spacing-changed", G_CALLBACK (gimp_brush_factory_view_spacing_changed), factory_view); diff --git a/app/widgets/gimpbrushselect.c b/app/widgets/gimpbrushselect.c index 9f326932d2..f450ee9621 100644 --- a/app/widgets/gimpbrushselect.c +++ b/app/widgets/gimpbrushselect.c @@ -167,10 +167,10 @@ gimp_brush_select_constructor (GType type, gimp_context_set_opacity (dialog->context, select->initial_opacity); gimp_context_set_paint_mode (dialog->context, select->initial_mode); - g_signal_connect (dialog->context, "opacity_changed", + g_signal_connect (dialog->context, "opacity-changed", G_CALLBACK (gimp_brush_select_opacity_changed), dialog); - g_signal_connect (dialog->context, "paint_mode_changed", + g_signal_connect (dialog->context, "paint-mode-changed", G_CALLBACK (gimp_brush_select_mode_changed), dialog); @@ -204,7 +204,7 @@ gimp_brush_select_constructor (GType type, TRUE, 0.0, 0.0, NULL, NULL)); - g_signal_connect (select->opacity_data, "value_changed", + g_signal_connect (select->opacity_data, "value-changed", G_CALLBACK (gimp_brush_select_opacity_update), select); @@ -225,7 +225,7 @@ gimp_brush_select_constructor (GType type, if (select->spacing >= 0) gtk_adjustment_set_value (spacing_adj, select->spacing); - g_signal_connect (spacing_adj, "value_changed", + g_signal_connect (spacing_adj, "value-changed", G_CALLBACK (gimp_brush_select_spacing_update), select); diff --git a/app/widgets/gimpcellrendereraccel.c b/app/widgets/gimpcellrendereraccel.c index 095b233ef0..05e5519f33 100644 --- a/app/widgets/gimpcellrendereraccel.c +++ b/app/widgets/gimpcellrendereraccel.c @@ -436,7 +436,7 @@ gimp_cell_renderer_accel_start_editing (GtkCellRenderer *cell, accel->grab_widget = widget; - g_signal_connect (widget, "key_press_event", + g_signal_connect (widget, "key-press-event", G_CALLBACK (grab_key_callback), accel); diff --git a/app/widgets/gimpclipboard.c b/app/widgets/gimpclipboard.c index 91115f58d3..d9a0e22131 100644 --- a/app/widgets/gimpclipboard.c +++ b/app/widgets/gimpclipboard.c @@ -84,7 +84,7 @@ gimp_clipboard_init (Gimp *gimp) gimp_clipboard_set_buffer (gimp, gimp->global_buffer); - g_signal_connect_object (gimp, "buffer_changed", + g_signal_connect_object (gimp, "buffer-changed", G_CALLBACK (gimp_clipboard_buffer_changed), NULL, 0); diff --git a/app/widgets/gimpcolordialog.c b/app/widgets/gimpcolordialog.c index f5c365a4bb..efa15ea3e2 100644 --- a/app/widgets/gimpcolordialog.c +++ b/app/widgets/gimpcolordialog.c @@ -150,7 +150,7 @@ gimp_color_dialog_init (GimpColorDialog *dialog) dialog->selection); gtk_widget_show (dialog->selection); - g_signal_connect (dialog->selection, "color_changed", + g_signal_connect (dialog->selection, "color-changed", G_CALLBACK (gimp_color_dialog_color_changed), dialog); @@ -204,7 +204,7 @@ gimp_color_dialog_init (GimpColorDialog *dialog) G_CALLBACK (gimp_color_history_color_clicked), dialog); - g_signal_connect (dialog->history[i], "color_changed", + g_signal_connect (dialog->history[i], "color-changed", G_CALLBACK (gimp_color_history_color_changed), GINT_TO_POINTER (i)); } diff --git a/app/widgets/gimpcoloreditor.c b/app/widgets/gimpcoloreditor.c index 147cba1305..516a8e590a 100644 --- a/app/widgets/gimpcoloreditor.c +++ b/app/widgets/gimpcoloreditor.c @@ -173,7 +173,7 @@ gimp_color_editor_init (GimpColorEditor *editor) TRUE, TRUE, content_spacing); gtk_widget_show (editor->notebook); - g_signal_connect (editor->notebook, "color_changed", + g_signal_connect (editor->notebook, "color-changed", G_CALLBACK (gimp_color_editor_color_changed), editor); @@ -255,7 +255,7 @@ gimp_color_editor_init (GimpColorEditor *editor) gtk_box_pack_end (GTK_BOX (vbox), editor->hex_entry, FALSE, FALSE, 0); gtk_widget_show (editor->hex_entry); - g_signal_connect (editor->hex_entry, "color_changed", + g_signal_connect (editor->hex_entry, "color-changed", G_CALLBACK (gimp_color_editor_entry_changed), editor); } @@ -377,10 +377,10 @@ gimp_color_editor_set_context (GimpDocked *docked, editor->context = g_object_ref (context); - g_signal_connect (editor->context, "foreground_changed", + g_signal_connect (editor->context, "foreground-changed", G_CALLBACK (gimp_color_editor_fg_changed), editor); - g_signal_connect (editor->context, "background_changed", + g_signal_connect (editor->context, "background-changed", G_CALLBACK (gimp_color_editor_bg_changed), editor); diff --git a/app/widgets/gimpcolormapeditor.c b/app/widgets/gimpcolormapeditor.c index 899bbba364..2404a49b71 100644 --- a/app/widgets/gimpcolormapeditor.c +++ b/app/widgets/gimpcolormapeditor.c @@ -219,11 +219,11 @@ gimp_colormap_editor_init (GimpColormapEditor *editor) gtk_container_add (GTK_CONTAINER (frame), editor->palette); gtk_widget_show (editor->palette); - g_signal_connect_after (editor->palette, "size_allocate", + g_signal_connect_after (editor->palette, "size-allocate", G_CALLBACK (gimp_colormap_preview_size_allocate), editor); - g_signal_connect (editor->palette, "button_press_event", + g_signal_connect (editor->palette, "button-press-event", G_CALLBACK (gimp_colormap_preview_button_press), editor); @@ -246,7 +246,7 @@ gimp_colormap_editor_init (GimpColormapEditor *editor) _("Color index:"), 0.0, 0.5, editor->index_spinbutton, 1, TRUE); - g_signal_connect (editor->index_adjustment, "value_changed", + g_signal_connect (editor->index_adjustment, "value-changed", G_CALLBACK (gimp_colormap_adjustment_changed), editor); @@ -256,7 +256,7 @@ gimp_colormap_editor_init (GimpColormapEditor *editor) _("HTML notation:"), 0.0, 0.5, editor->color_entry, 1, TRUE); - g_signal_connect (editor->color_entry, "color_changed", + g_signal_connect (editor->color_entry, "color-changed", G_CALLBACK (gimp_colormap_hex_entry_changed), editor); } @@ -348,10 +348,10 @@ gimp_colormap_editor_set_image (GimpImageEditor *image_editor, if (gimage) { - g_signal_connect (gimage, "mode_changed", + g_signal_connect (gimage, "mode-changed", G_CALLBACK (gimp_colormap_image_mode_changed), editor); - g_signal_connect (gimage, "colormap_changed", + g_signal_connect (gimage, "colormap-changed", G_CALLBACK (gimp_colormap_image_colormap_changed), editor); diff --git a/app/widgets/gimpcomponenteditor.c b/app/widgets/gimpcomponenteditor.c index 7b6a592059..3295591c48 100644 --- a/app/widgets/gimpcomponenteditor.c +++ b/app/widgets/gimpcomponenteditor.c @@ -187,7 +187,7 @@ gimp_component_editor_init (GimpComponentEditor *editor) gtk_container_add (GTK_CONTAINER (frame), GTK_WIDGET (editor->view)); gtk_widget_show (GTK_WIDGET (editor->view)); - g_signal_connect (editor->view, "button_press_event", + g_signal_connect (editor->view, "button-press-event", G_CALLBACK (gimp_component_editor_button_press), editor); @@ -259,16 +259,16 @@ gimp_component_editor_set_image (GimpImageEditor *editor, { gimp_component_editor_create_components (component_editor); - g_signal_connect (editor->gimage, "mode_changed", + g_signal_connect (editor->gimage, "mode-changed", G_CALLBACK (gimp_component_editor_mode_changed), component_editor); - g_signal_connect (editor->gimage, "alpha_changed", + g_signal_connect (editor->gimage, "alpha-changed", G_CALLBACK (gimp_component_editor_alpha_changed), component_editor); - g_signal_connect (editor->gimage, "component_visibility_changed", + g_signal_connect (editor->gimage, "component-visibility-changed", G_CALLBACK (gimp_component_editor_visibility_changed), component_editor); - g_signal_connect (editor->gimage, "component_active_changed", + g_signal_connect (editor->gimage, "component-active-changed", G_CALLBACK (gimp_component_editor_active_changed), component_editor); } diff --git a/app/widgets/gimpcontainertreeview.c b/app/widgets/gimpcontainertreeview.c index 4de26084de..d733b2a7d1 100644 --- a/app/widgets/gimpcontainertreeview.c +++ b/app/widgets/gimpcontainertreeview.c @@ -510,7 +510,7 @@ gimp_container_tree_view_set_container (GimpContainerView *view, /* connect button_press_event after DND so we can keep the list from * selecting the item on button2 */ - g_signal_connect (tree_view->view, "button_press_event", + g_signal_connect (tree_view->view, "button-press-event", G_CALLBACK (gimp_container_tree_view_button_press), tree_view); } diff --git a/app/widgets/gimpdataeditor.c b/app/widgets/gimpdataeditor.c index 9207ea2e69..d25053958b 100644 --- a/app/widgets/gimpdataeditor.c +++ b/app/widgets/gimpdataeditor.c @@ -177,7 +177,7 @@ gimp_data_editor_init (GimpDataEditor *editor) g_signal_connect (editor->name_entry, "activate", G_CALLBACK (gimp_data_editor_name_activate), editor); - g_signal_connect (editor->name_entry, "focus_out_event", + g_signal_connect (editor->name_entry, "focus-out-event", G_CALLBACK (gimp_data_editor_name_focus_out), editor); } @@ -365,7 +365,7 @@ gimp_data_editor_real_set_data (GimpDataEditor *editor, { g_object_ref (editor->data); - g_signal_connect (editor->data, "name_changed", + g_signal_connect (editor->data, "name-changed", G_CALLBACK (gimp_data_editor_data_name_changed), editor); diff --git a/app/widgets/gimpdeviceinfo.c b/app/widgets/gimpdeviceinfo.c index c34329fff5..67d4a4b441 100644 --- a/app/widgets/gimpdeviceinfo.c +++ b/app/widgets/gimpdeviceinfo.c @@ -189,22 +189,22 @@ gimp_device_info_constructor (GType type, /* FIXME: this is ugly and needs to be done via "notify" once * the contexts' properties are dynamic. */ - g_signal_connect (object, "foreground_changed", + g_signal_connect (object, "foreground-changed", G_CALLBACK (gimp_device_info_changed), NULL); - g_signal_connect (object, "background_changed", + g_signal_connect (object, "background-changed", G_CALLBACK (gimp_device_info_changed), NULL); - g_signal_connect (object, "tool_changed", + g_signal_connect (object, "tool-changed", G_CALLBACK (gimp_device_info_changed), NULL); - g_signal_connect (object, "brush_changed", + g_signal_connect (object, "brush-changed", G_CALLBACK (gimp_device_info_changed), NULL); - g_signal_connect (object, "pattern_changed", + g_signal_connect (object, "pattern-changed", G_CALLBACK (gimp_device_info_changed), NULL); - g_signal_connect (object, "gradient_changed", + g_signal_connect (object, "gradient-changed", G_CALLBACK (gimp_device_info_changed), NULL); diff --git a/app/widgets/gimpdialogfactory.c b/app/widgets/gimpdialogfactory.c index f3db686a76..b7d023c268 100644 --- a/app/widgets/gimpdialogfactory.c +++ b/app/widgets/gimpdialogfactory.c @@ -852,7 +852,7 @@ gimp_dialog_factory_add_dialog (GimpDialogFactory *factory, * position when hidden/shown within this(!) session. */ if (entry->session_managed) - g_signal_connect (dialog, "configure_event", + g_signal_connect (dialog, "configure-event", G_CALLBACK (gimp_dialog_factory_set_user_pos), NULL); } @@ -904,7 +904,7 @@ gimp_dialog_factory_add_dialog (GimpDialogFactory *factory, * dialog needs GDK_HINT_USER_POS so it keeps its * position when hidden/shown within this(!) session. */ - g_signal_connect (dialog, "configure_event", + g_signal_connect (dialog, "configure-event", G_CALLBACK (gimp_dialog_factory_set_user_pos), NULL); @@ -920,7 +920,7 @@ gimp_dialog_factory_add_dialog (GimpDialogFactory *factory, G_CONNECT_SWAPPED); if (entry && entry->session_managed && toplevel) - g_signal_connect_object (dialog, "configure_event", + g_signal_connect_object (dialog, "configure-event", G_CALLBACK (gimp_dialog_factory_dialog_configure), factory, 0); diff --git a/app/widgets/gimpdockable.c b/app/widgets/gimpdockable.c index ffa3e218e7..af1891a390 100644 --- a/app/widgets/gimpdockable.c +++ b/app/widgets/gimpdockable.c @@ -155,7 +155,7 @@ gimp_dockable_class_init (GimpDockableClass *klass) container_class->forall = gimp_dockable_forall; gtk_widget_class_install_style_property (widget_class, - g_param_spec_int ("content_border", + g_param_spec_int ("content-border", NULL, NULL, 0, G_MAXINT, @@ -195,7 +195,7 @@ gimp_dockable_init (GimpDockable *dockable) gimp_help_set_help_data (dockable->menu_button, _("Configure this tab"), GIMP_HELP_DOCK_TAB_MENU); - g_signal_connect (dockable->menu_button, "button_press_event", + g_signal_connect (dockable->menu_button, "button-press-event", G_CALLBACK (gimp_dockable_menu_button_press), dockable); @@ -208,7 +208,7 @@ gimp_dockable_init (GimpDockable *dockable) over the title area. This keeps events that originate from widgets in the dockable to start a drag. */ - g_signal_connect (dockable, "button_press_event", + g_signal_connect (dockable, "button-press-event", G_CALLBACK (gimp_dockable_drag_event_filter), NULL); } @@ -461,7 +461,7 @@ gimp_dockable_style_set (GtkWidget *widget, gint content_border; gtk_widget_style_get (widget, - "content_border", &content_border, + "content-border", &content_border, NULL); gtk_container_set_border_width (GTK_CONTAINER (widget), content_border); @@ -576,7 +576,7 @@ gimp_dockable_add (GtkContainer *container, GTK_CONTAINER_CLASS (parent_class)->add (container, widget); - g_signal_connect (widget, "title_changed", + g_signal_connect (widget, "title-changed", G_CALLBACK (gimp_dockable_title_changed), container); diff --git a/app/widgets/gimperrorconsole.c b/app/widgets/gimperrorconsole.c index c0393d3c79..90e4256543 100644 --- a/app/widgets/gimperrorconsole.c +++ b/app/widgets/gimperrorconsole.c @@ -128,7 +128,7 @@ gimp_error_console_init (GimpErrorConsole *console) gtk_container_add (GTK_CONTAINER (scrolled_window), console->text_view); gtk_widget_show (console->text_view); - g_signal_connect (console->text_view, "button_press_event", + g_signal_connect (console->text_view, "button-press-event", G_CALLBACK (gimp_error_console_button_press), console); diff --git a/app/widgets/gimpfgbgeditor.c b/app/widgets/gimpfgbgeditor.c index 0e06ed5121..3ea834b39e 100644 --- a/app/widgets/gimpfgbgeditor.c +++ b/app/widgets/gimpfgbgeditor.c @@ -586,10 +586,10 @@ gimp_fg_bg_editor_set_context (GimpFgBgEditor *editor, { g_object_ref (context); - g_signal_connect_swapped (context, "foreground_changed", + g_signal_connect_swapped (context, "foreground-changed", G_CALLBACK (gtk_widget_queue_draw), editor); - g_signal_connect_swapped (context, "background_changed", + g_signal_connect_swapped (context, "background-changed", G_CALLBACK (gtk_widget_queue_draw), editor); } diff --git a/app/widgets/gimpfgbgview.c b/app/widgets/gimpfgbgview.c index 5b5548627e..ae3789d3df 100644 --- a/app/widgets/gimpfgbgview.c +++ b/app/widgets/gimpfgbgview.c @@ -322,10 +322,10 @@ gimp_fg_bg_view_set_context (GimpFgBgView *view, { g_object_ref (context); - g_signal_connect_swapped (context, "foreground_changed", + g_signal_connect_swapped (context, "foreground-changed", G_CALLBACK (gtk_widget_queue_draw), view); - g_signal_connect_swapped (context, "background_changed", + g_signal_connect_swapped (context, "background-changed", G_CALLBACK (gtk_widget_queue_draw), view); } diff --git a/app/widgets/gimpgradienteditor.c b/app/widgets/gimpgradienteditor.c index 3f3f114ffd..b6259a4e6c 100644 --- a/app/widgets/gimpgradienteditor.c +++ b/app/widgets/gimpgradienteditor.c @@ -376,7 +376,7 @@ gimp_gradient_editor_init (GimpGradientEditor *editor) GRAD_SCROLLBAR_PAGE_SIZE, 1.0); - g_signal_connect (editor->scroll_data, "value_changed", + g_signal_connect (editor->scroll_data, "value-changed", G_CALLBACK (gradient_editor_scrollbar_update), editor); g_signal_connect (editor->scroll_data, "changed", diff --git a/app/widgets/gimphistogrambox.c b/app/widgets/gimphistogrambox.c index b54a037337..27ce4716b2 100644 --- a/app/widgets/gimphistogrambox.c +++ b/app/widgets/gimphistogrambox.c @@ -126,7 +126,7 @@ gimp_histogram_box_init (GimpHistogramBox *box) gtk_container_add (GTK_CONTAINER (frame), view); gtk_widget_show (view); - g_signal_connect (view, "range_changed", + g_signal_connect (view, "range-changed", G_CALLBACK (gimp_histogram_box_histogram_range), box); @@ -148,7 +148,7 @@ gimp_histogram_box_init (GimpHistogramBox *box) g_signal_connect (slider_area, "event", G_CALLBACK (gimp_histogram_slider_area_event), box); - g_signal_connect_after (slider_area, "expose_event", + g_signal_connect_after (slider_area, "expose-event", G_CALLBACK (gimp_histogram_slider_area_expose), box); @@ -188,7 +188,7 @@ gimp_histogram_box_init (GimpHistogramBox *box) gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0); gtk_widget_show (spinbutton); - g_signal_connect (adjustment, "value_changed", + g_signal_connect (adjustment, "value-changed", G_CALLBACK (gimp_histogram_box_low_adj_update), box); @@ -200,7 +200,7 @@ gimp_histogram_box_init (GimpHistogramBox *box) gtk_box_pack_end (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0); gtk_widget_show (spinbutton); - g_signal_connect (adjustment, "value_changed", + g_signal_connect (adjustment, "value-changed", G_CALLBACK (gimp_histogram_box_high_adj_update), box); diff --git a/app/widgets/gimphistogrameditor.c b/app/widgets/gimphistogrameditor.c index ff04fd33bd..ee75529a47 100644 --- a/app/widgets/gimphistogrameditor.c +++ b/app/widgets/gimphistogrameditor.c @@ -173,7 +173,7 @@ gimp_histogram_editor_init (GimpHistogramEditor *editor) gtk_box_pack_start (GTK_BOX (editor), editor->box, TRUE, TRUE, 0); gtk_widget_show (GTK_WIDGET (editor->box)); - g_signal_connect_swapped (view, "range_changed", + g_signal_connect_swapped (view, "range-changed", G_CALLBACK (gimp_histogram_editor_info_update), editor); g_signal_connect_swapped (view, "notify::histogram-channel", @@ -293,13 +293,13 @@ gimp_histogram_editor_set_image (GimpImageEditor *image_editor, gimp_histogram_view_set_histogram (view, editor->histogram); - g_signal_connect_object (gimage, "mode_changed", + g_signal_connect_object (gimage, "mode-changed", G_CALLBACK (gimp_histogram_editor_menu_update), editor, G_CONNECT_SWAPPED); - g_signal_connect_object (gimage, "active_layer_changed", + g_signal_connect_object (gimage, "active-layer-changed", G_CALLBACK (gimp_histogram_editor_layer_changed), editor, 0); - g_signal_connect_object (gimage, "mask_changed", + g_signal_connect_object (gimage, "mask-changed", G_CALLBACK (gimp_histogram_editor_update), editor, G_CONNECT_SWAPPED); } diff --git a/app/widgets/gimpimageeditor.c b/app/widgets/gimpimageeditor.c index 5d588755ef..89db97d31d 100644 --- a/app/widgets/gimpimageeditor.c +++ b/app/widgets/gimpimageeditor.c @@ -125,7 +125,7 @@ gimp_image_editor_set_context (GimpDocked *docked, if (context) { - g_signal_connect_swapped (context, "image_changed", + g_signal_connect_swapped (context, "image-changed", G_CALLBACK (gimp_image_editor_set_image), editor); diff --git a/app/widgets/gimpitemtreeview.c b/app/widgets/gimpitemtreeview.c index a8b778b89e..81f28d7cf5 100644 --- a/app/widgets/gimpitemtreeview.c +++ b/app/widgets/gimpitemtreeview.c @@ -329,7 +329,7 @@ gimp_item_tree_view_set_context (GimpDocked *docked, if (! GIMP_CONTAINER_TREE_VIEW (view)->dnd_gimp) GIMP_CONTAINER_TREE_VIEW (view)->dnd_gimp = context->gimp; - g_signal_connect_swapped (context, "image_changed", + g_signal_connect_swapped (context, "image-changed", G_CALLBACK (gimp_item_tree_view_set_image), view); @@ -560,7 +560,7 @@ gimp_item_tree_view_real_set_image (GimpItemTreeView *view, GIMP_ITEM_TREE_VIEW_GET_CLASS (view)->signal_name, G_CALLBACK (gimp_item_tree_view_item_changed), view); - g_signal_connect (view->gimage, "size_changed", + g_signal_connect (view->gimage, "size-changed", G_CALLBACK (gimp_item_tree_view_size_changed), view); @@ -607,11 +607,11 @@ gimp_item_tree_view_set_container (GimpContainerView *view, if (container) { item_view->visible_changed_handler_id = - gimp_container_add_handler (container, "visibility_changed", + gimp_container_add_handler (container, "visibility-changed", G_CALLBACK (gimp_item_tree_view_visible_changed), view); item_view->linked_changed_handler_id = - gimp_container_add_handler (container, "linked_changed", + gimp_container_add_handler (container, "linked-changed", G_CALLBACK (gimp_item_tree_view_linked_changed), view); } diff --git a/app/widgets/gimplayertreeview.c b/app/widgets/gimplayertreeview.c index 5b95da216b..34cdace2ec 100644 --- a/app/widgets/gimplayertreeview.c +++ b/app/widgets/gimplayertreeview.c @@ -340,7 +340,7 @@ gimp_layer_tree_view_init (GimpLayerTreeView *view) NULL, GIMP_HELP_LAYER_DIALOG_OPACITY_SCALE)); - g_signal_connect (view->opacity_adjustment, "value_changed", + g_signal_connect (view->opacity_adjustment, "value-changed", G_CALLBACK (gimp_layer_tree_view_opacity_scale_changed), view); @@ -539,23 +539,23 @@ gimp_layer_tree_view_set_container (GimpContainerView *view, if (container) { layer_view->mode_changed_handler_id = - gimp_container_add_handler (container, "mode_changed", + gimp_container_add_handler (container, "mode-changed", G_CALLBACK (gimp_layer_tree_view_layer_signal_handler), view); layer_view->opacity_changed_handler_id = - gimp_container_add_handler (container, "opacity_changed", + gimp_container_add_handler (container, "opacity-changed", G_CALLBACK (gimp_layer_tree_view_layer_signal_handler), view); layer_view->preserve_trans_changed_handler_id = - gimp_container_add_handler (container, "preserve_trans_changed", + gimp_container_add_handler (container, "preserve-trans-changed", G_CALLBACK (gimp_layer_tree_view_layer_signal_handler), view); layer_view->mask_changed_handler_id = - gimp_container_add_handler (container, "mask_changed", + gimp_container_add_handler (container, "mask-changed", G_CALLBACK (gimp_layer_tree_view_mask_changed), view); layer_view->alpha_changed_handler_id = - gimp_container_add_handler (container, "alpha_changed", + gimp_container_add_handler (container, "alpha-changed", G_CALLBACK (gimp_layer_tree_view_alpha_changed), view); } @@ -858,7 +858,7 @@ gimp_layer_tree_view_set_image (GimpItemTreeView *view, if (view->gimage) g_signal_connect (view->gimage, - "floating_selection_changed", + "floating-selection-changed", G_CALLBACK (gimp_layer_tree_view_floating_selection_changed), view); } @@ -1196,9 +1196,9 @@ gimp_layer_tree_view_mask_update (GimpLayerTreeView *layer_view, closure = g_cclosure_new (G_CALLBACK (gimp_layer_tree_view_mask_callback), layer_view, NULL); g_object_watch_closure (G_OBJECT (renderer), closure); - g_signal_connect_closure (mask, "apply_changed", closure, FALSE); - g_signal_connect_closure (mask, "edit_changed", closure, FALSE); - g_signal_connect_closure (mask, "show_changed", closure, FALSE); + g_signal_connect_closure (mask, "apply-changed", closure, FALSE); + g_signal_connect_closure (mask, "edit-changed", closure, FALSE); + g_signal_connect_closure (mask, "show-changed", closure, FALSE); } gtk_list_store_set (GTK_LIST_STORE (tree_view->model), iter, diff --git a/app/widgets/gimpmenudock.c b/app/widgets/gimpmenudock.c index e8e94ce1fe..9350ec86c0 100644 --- a/app/widgets/gimpmenudock.c +++ b/app/widgets/gimpmenudock.c @@ -444,16 +444,16 @@ gimp_menu_dock_new (GimpDialogFactory *dialog_factory, GIMP_CONTEXT_PROP_IMAGE); } - g_signal_connect_object (dialog_factory->context, "display_changed", + g_signal_connect_object (dialog_factory->context, "display-changed", G_CALLBACK (gimp_menu_dock_factory_display_changed), menu_dock, 0); - g_signal_connect_object (dialog_factory->context, "image_changed", + g_signal_connect_object (dialog_factory->context, "image-changed", G_CALLBACK (gimp_menu_dock_factory_image_changed), menu_dock, 0); - g_signal_connect_object (context, "image_changed", + g_signal_connect_object (context, "image-changed", G_CALLBACK (gimp_menu_dock_image_changed), menu_dock, 0); @@ -605,7 +605,7 @@ gimp_menu_dock_image_changed (GimpContext *context, /* stop the emission of the original signal (the emission of * the recursive signal is finished) */ - g_signal_stop_emission_by_name (context, "image_changed"); + g_signal_stop_emission_by_name (context, "image-changed"); } } else if (gimage != NULL && ! gimp_container_is_empty (display_container)) diff --git a/app/widgets/gimppaletteeditor.c b/app/widgets/gimppaletteeditor.c index d6428e6a9a..a8a0e93ee1 100644 --- a/app/widgets/gimppaletteeditor.c +++ b/app/widgets/gimppaletteeditor.c @@ -224,10 +224,10 @@ gimp_palette_editor_init (GimpPaletteEditor *editor) eventbox); gtk_widget_show (eventbox); - g_signal_connect (eventbox, "button_press_event", + g_signal_connect (eventbox, "button-press-event", G_CALLBACK (palette_editor_eventbox_button_press), editor); - g_signal_connect (eventbox->parent, "size_allocate", + g_signal_connect (eventbox->parent, "size-allocate", G_CALLBACK (palette_editor_viewport_resized), editor); g_signal_connect (eventbox->parent, "realize", @@ -246,7 +246,7 @@ gimp_palette_editor_init (GimpPaletteEditor *editor) gtk_container_add (GTK_CONTAINER (alignment), editor->color_area); gtk_widget_show (editor->color_area); - g_signal_connect (editor->color_area, "button_press_event", + g_signal_connect (editor->color_area, "button-press-event", G_CALLBACK (palette_editor_color_area_button_press), editor); @@ -283,7 +283,7 @@ gimp_palette_editor_init (GimpPaletteEditor *editor) gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0); gtk_widget_show (spinbutton); - g_signal_connect (editor->columns_data, "value_changed", + g_signal_connect (editor->columns_data, "value-changed", G_CALLBACK (palette_editor_columns_changed), editor); } diff --git a/app/widgets/gimppropwidgets.c b/app/widgets/gimppropwidgets.c index b04b37d682..c294f15626 100644 --- a/app/widgets/gimppropwidgets.c +++ b/app/widgets/gimppropwidgets.c @@ -219,7 +219,7 @@ gimp_prop_color_button_new (GObject *config, set_param_spec (G_OBJECT (button), button, param_spec); - g_signal_connect (button, "color_changed", + g_signal_connect (button, "color-changed", G_CALLBACK (gimp_prop_color_button_callback), config); diff --git a/app/widgets/gimpselectioneditor.c b/app/widgets/gimpselectioneditor.c index 9bcac72583..ae4edbcfc9 100644 --- a/app/widgets/gimpselectioneditor.c +++ b/app/widgets/gimpselectioneditor.c @@ -141,7 +141,7 @@ gimp_selection_editor_init (GimpSelectionEditor *editor) gtk_container_add (GTK_CONTAINER (frame), editor->preview); gtk_widget_show (editor->preview); - g_signal_connect (editor->preview, "button_press_event", + g_signal_connect (editor->preview, "button-press-event", G_CALLBACK (gimp_selection_preview_button_press), editor); @@ -214,7 +214,7 @@ gimp_selection_editor_set_image (GimpImageEditor *image_editor, if (gimage) { - g_signal_connect (gimage, "mask_changed", + g_signal_connect (gimage, "mask-changed", G_CALLBACK (gimp_selection_editor_mask_changed), editor); diff --git a/app/widgets/gimpstrokeeditor.c b/app/widgets/gimpstrokeeditor.c index 43301e24e3..4c247432fe 100644 --- a/app/widgets/gimpstrokeeditor.c +++ b/app/widgets/gimpstrokeeditor.c @@ -303,7 +303,7 @@ gimp_stroke_editor_constructor (GType type, g_signal_connect (box, "changed", G_CALLBACK (gimp_stroke_editor_dash_preset), editor->options); - g_signal_connect_object (editor->options, "dash_info_changed", + g_signal_connect_object (editor->options, "dash-info-changed", G_CALLBACK (gimp_int_combo_box_set_active), box, G_CONNECT_SWAPPED); diff --git a/app/widgets/gimptemplateeditor.c b/app/widgets/gimptemplateeditor.c index 1428cd981e..90be92bf3d 100644 --- a/app/widgets/gimptemplateeditor.c +++ b/app/widgets/gimptemplateeditor.c @@ -524,7 +524,7 @@ gimp_template_editor_new (GimpTemplate *template, editor->stock_id_container = gimp_list_new (GIMP_TYPE_TEMPLATE, FALSE); editor->stock_id_context = gimp_context_new (gimp, "foo", NULL); - g_signal_connect (editor->stock_id_context, "template_changed", + g_signal_connect (editor->stock_id_context, "template-changed", G_CALLBACK (gimp_template_editor_icon_changed), editor); diff --git a/app/widgets/gimpthumbbox.c b/app/widgets/gimpthumbbox.c index 3d77533754..b209c0e17e 100644 --- a/app/widgets/gimpthumbbox.c +++ b/app/widgets/gimpthumbbox.c @@ -344,7 +344,7 @@ gimp_thumb_box_new (Gimp *gimp) gtk_container_add (GTK_CONTAINER (box), ebox); gtk_widget_show (ebox); - g_signal_connect (ebox, "button_press_event", + g_signal_connect (ebox, "button-press-event", G_CALLBACK (gimp_thumb_box_ebox_button_press), box); @@ -370,16 +370,16 @@ gimp_thumb_box_new (Gimp *gimp) gtk_container_add (GTK_CONTAINER (button), label); gtk_widget_show (label); - g_signal_connect (button, "button_press_event", + g_signal_connect (button, "button-press-event", G_CALLBACK (gtk_true), NULL); - g_signal_connect (button, "button_release_event", + g_signal_connect (button, "button-release-event", G_CALLBACK (gtk_true), NULL); - g_signal_connect (button, "enter_notify_event", + g_signal_connect (button, "enter-notify-event", G_CALLBACK (gtk_true), NULL); - g_signal_connect (button, "leave_notify_event", + g_signal_connect (button, "leave-notify-event", G_CALLBACK (gtk_true), NULL); @@ -394,7 +394,7 @@ gimp_thumb_box_new (Gimp *gimp) box->imagefile = gimp_imagefile_new (gimp, NULL); - g_signal_connect (box->imagefile, "info_changed", + g_signal_connect (box->imagefile, "info-changed", G_CALLBACK (gimp_thumb_box_imagefile_info_changed), box); diff --git a/app/widgets/gimptoolbox-image-area.c b/app/widgets/gimptoolbox-image-area.c index adb299a77b..b31079b3b0 100644 --- a/app/widgets/gimptoolbox-image-area.c +++ b/app/widgets/gimptoolbox-image-area.c @@ -124,7 +124,7 @@ gimp_toolbox_image_area_create (GimpToolbox *toolbox, gimp_help_set_help_data (image_view, tooltip, NULL); g_free (tooltip); - g_signal_connect_object (context, "image_changed", + g_signal_connect_object (context, "image-changed", G_CALLBACK (gimp_view_set_viewable), image_view, G_CONNECT_SWAPPED); diff --git a/app/widgets/gimptoolbox-indicator-area.c b/app/widgets/gimptoolbox-indicator-area.c index b106353282..90b26a739e 100644 --- a/app/widgets/gimptoolbox-indicator-area.c +++ b/app/widgets/gimptoolbox-indicator-area.c @@ -149,7 +149,7 @@ gimp_toolbox_indicator_area_create (GimpToolbox *toolbox) _("The active brush.\n" "Click to open the Brush Dialog."), NULL); - g_signal_connect_object (context, "brush_changed", + g_signal_connect_object (context, "brush-changed", G_CALLBACK (gimp_view_set_viewable), brush_view, G_CONNECT_SWAPPED); @@ -180,7 +180,7 @@ gimp_toolbox_indicator_area_create (GimpToolbox *toolbox) _("The active pattern.\n" "Click to open the Pattern Dialog."), NULL); - g_signal_connect_object (context, "pattern_changed", + g_signal_connect_object (context, "pattern-changed", G_CALLBACK (gimp_view_set_viewable), pattern_view, G_CONNECT_SWAPPED); @@ -211,7 +211,7 @@ gimp_toolbox_indicator_area_create (GimpToolbox *toolbox) _("The active gradient.\n" "Click to open the Gradient Dialog."), NULL); - g_signal_connect_object (context, "gradient_changed", + g_signal_connect_object (context, "gradient-changed", G_CALLBACK (gimp_view_set_viewable), gradient_view, G_CONNECT_SWAPPED); diff --git a/app/widgets/gimptoolbox.c b/app/widgets/gimptoolbox.c index e428976e3c..82c7644e42 100644 --- a/app/widgets/gimptoolbox.c +++ b/app/widgets/gimptoolbox.c @@ -272,7 +272,7 @@ gimp_toolbox_constructor (GType type, if (! list) /* all devices have cursor */ { - g_signal_connect (toolbox, "motion_notify_event", + g_signal_connect (toolbox, "motion-notify-event", G_CALLBACK (toolbox_check_device), context->gimp); @@ -746,7 +746,7 @@ toolbox_create_tools (GimpToolbox *toolbox, G_CALLBACK (toolbox_tool_button_toggled), tool_info); - g_signal_connect (button, "button_press_event", + g_signal_connect (button, "button-press-event", G_CALLBACK (toolbox_tool_button_press), toolbox); @@ -782,7 +782,7 @@ toolbox_create_tools (GimpToolbox *toolbox, accel_group = gtk_accel_group_from_accel_closure (accel_closure); - g_signal_connect_object (accel_group, "accel_changed", + g_signal_connect_object (accel_group, "accel-changed", G_CALLBACK (gimp_toolbox_button_accel_changed), button, 0); diff --git a/app/widgets/gimptooloptionseditor.c b/app/widgets/gimptooloptionseditor.c index 8964142de6..d0fb19afa3 100644 --- a/app/widgets/gimptooloptionseditor.c +++ b/app/widgets/gimptooloptionseditor.c @@ -302,7 +302,7 @@ gimp_tool_options_editor_new (Gimp *gimp, user_context = gimp_get_user_context (gimp); - g_signal_connect_object (user_context, "tool_changed", + g_signal_connect_object (user_context, "tool-changed", G_CALLBACK (gimp_tool_options_editor_tool_changed), editor, 0); diff --git a/app/widgets/gimpuimanager.c b/app/widgets/gimpuimanager.c index 6ca02f2da6..302f0ce092 100644 --- a/app/widgets/gimpuimanager.c +++ b/app/widgets/gimpuimanager.c @@ -840,7 +840,7 @@ gimp_ui_manager_item_realize (GtkWidget *widget, if (! GPOINTER_TO_INT (g_object_get_qdata (G_OBJECT (widget->parent), quark_key_press_connected))) { - g_signal_connect (widget->parent, "key_press_event", + g_signal_connect (widget->parent, "key-press-event", G_CALLBACK (gimp_ui_manager_item_key_press), manager); diff --git a/app/widgets/gimpundoeditor.c b/app/widgets/gimpundoeditor.c index 0aec2e09c9..57e7aea81f 100644 --- a/app/widgets/gimpundoeditor.c +++ b/app/widgets/gimpundoeditor.c @@ -213,7 +213,7 @@ gimp_undo_editor_set_image (GimpImageEditor *image_editor, if (gimp_image_undo_is_enabled (image_editor->gimage)) gimp_undo_editor_fill (editor); - g_signal_connect (image_editor->gimage, "undo_event", + g_signal_connect (image_editor->gimage, "undo-event", G_CALLBACK (gimp_undo_editor_undo_event), editor); } diff --git a/app/widgets/gimpview-popup.c b/app/widgets/gimpview-popup.c index 6bf289a8ac..7b0ccbc08e 100644 --- a/app/widgets/gimpview-popup.c +++ b/app/widgets/gimpview-popup.c @@ -110,7 +110,7 @@ gimp_view_popup_show (GtkWidget *widget, popup->button_y += widget->allocation.y; } - g_signal_connect (widget, "button_release_event", + g_signal_connect (widget, "button-release-event", G_CALLBACK (gimp_view_popup_button_release), popup); g_signal_connect (widget, "unmap", diff --git a/libgimpwidgets/gimpscrolledpreview.c b/libgimpwidgets/gimpscrolledpreview.c index b411ac1d47..2e5bcdf5b4 100644 --- a/libgimpwidgets/gimpscrolledpreview.c +++ b/libgimpwidgets/gimpscrolledpreview.c @@ -132,7 +132,7 @@ gimp_scrolled_preview_init (GimpScrolledPreview *preview) GIMP_PREVIEW (preview)->width, GIMP_PREVIEW (preview)->width); - g_signal_connect (adj, "value_changed", + g_signal_connect (adj, "value-changed", G_CALLBACK (gimp_scrolled_preview_h_scroll), preview); @@ -147,7 +147,7 @@ gimp_scrolled_preview_init (GimpScrolledPreview *preview) GIMP_PREVIEW (preview)->height, GIMP_PREVIEW (preview)->height); - g_signal_connect (adj, "value_changed", + g_signal_connect (adj, "value-changed", G_CALLBACK (gimp_scrolled_preview_v_scroll), preview); @@ -463,7 +463,7 @@ gimp_scrolled_preview_nav_button_press (GtkWidget *widget, g_signal_connect (area, "event", G_CALLBACK (gimp_scrolled_preview_nav_popup_event), preview); - g_signal_connect_after (area, "expose_event", + g_signal_connect_after (area, "expose-event", G_CALLBACK (gimp_scrolled_preview_nav_popup_expose), preview); diff --git a/modules/colorsel_cmyk.c b/modules/colorsel_cmyk.c index 05d3b80ecf..fcba6060ff 100644 --- a/modules/colorsel_cmyk.c +++ b/modules/colorsel_cmyk.c @@ -181,7 +181,7 @@ colorsel_cmyk_init (ColorselCmyk *module) gettext (cmyk_tips[i]), NULL); - g_signal_connect (adj, "value_changed", + g_signal_connect (adj, "value-changed", G_CALLBACK (colorsel_cmyk_adj_update), module); @@ -209,7 +209,7 @@ colorsel_cmyk_init (ColorselCmyk *module) "of the colored inks."), NULL); gtk_label_set_mnemonic_widget (GTK_LABEL (label), spinbutton); - g_signal_connect (adj, "value_changed", + g_signal_connect (adj, "value-changed", G_CALLBACK (colorsel_cmyk_pullout_update), module); diff --git a/modules/colorsel_triangle.c b/modules/colorsel_triangle.c index 73f007400d..be8b778442 100644 --- a/modules/colorsel_triangle.c +++ b/modules/colorsel_triangle.c @@ -210,17 +210,17 @@ colorsel_triangle_create_preview (ColorselTriangle *triangle) gtk_widget_add_events (preview, PREVIEW_MASK); - g_signal_connect (preview, "motion_notify_event", + g_signal_connect (preview, "motion-notify-event", G_CALLBACK (colorsel_triangle_event), triangle); - g_signal_connect (preview, "button_press_event", + g_signal_connect (preview, "button-press-event", G_CALLBACK (colorsel_triangle_event), triangle); - g_signal_connect (preview, "button_release_event", + g_signal_connect (preview, "button-release-event", G_CALLBACK (colorsel_triangle_event), triangle); - g_signal_connect (preview, "size_allocate", + g_signal_connect (preview, "size-allocate", G_CALLBACK (colorsel_triangle_size_allocate), triangle); diff --git a/modules/colorsel_water.c b/modules/colorsel_water.c index 219796d04e..d4dd47d9bd 100644 --- a/modules/colorsel_water.c +++ b/modules/colorsel_water.c @@ -176,21 +176,21 @@ colorsel_water_init (ColorselWater *water) area = gtk_drawing_area_new (); gtk_container_add (GTK_CONTAINER (frame), area); - g_signal_connect (area, "expose_event", + g_signal_connect (area, "expose-event", G_CALLBACK (select_area_expose), NULL); /* Event signals */ - g_signal_connect (area, "motion_notify_event", + g_signal_connect (area, "motion-notify-event", G_CALLBACK (motion_notify_event), water); - g_signal_connect (area, "button_press_event", + g_signal_connect (area, "button-press-event", G_CALLBACK (button_press_event), water); - g_signal_connect (area, "button_release_event", + g_signal_connect (area, "button-release-event", G_CALLBACK (button_release_event), water); - g_signal_connect (area, "proximity_out_event", + g_signal_connect (area, "proximity-out-event", G_CALLBACK (proximity_out_event), water); @@ -210,7 +210,7 @@ colorsel_water_init (ColorselWater *water) adj = gtk_adjustment_new (200.0 - water->pressure_adjust * 100.0, 0.0, 200.0, 1.0, 1.0, 0.0); - g_signal_connect (adj, "value_changed", + g_signal_connect (adj, "value-changed", G_CALLBACK (pressure_adjust_update), water);