diff options
25 files changed, 108 insertions, 108 deletions
diff --git a/applets/clock/clock.c b/applets/clock/clock.c index 3aa4b7f5..2123e97e 100644 --- a/applets/clock/clock.c +++ b/applets/clock/clock.c @@ -849,9 +849,9 @@ create_calendar (ClockData *cd) g_signal_connect (window, "edit-locations", G_CALLBACK (edit_locations_cb), cd); - g_signal_connect (window, "delete_event", + g_signal_connect (window, "delete-event", G_CALLBACK (delete_event), cd->panel_button); - g_signal_connect (window, "key_press_event", + g_signal_connect (window, "key-press-event", G_CALLBACK (close_on_escape), cd->panel_button); /*Name this window so the default theme can be overridden in panel theme, @@ -1282,7 +1282,7 @@ do_not_eat_button_press (GtkWidget *widget, GdkEventButton *event) { if (event->button != 1) - g_signal_stop_emission_by_name (widget, "button_press_event"); + g_signal_stop_emission_by_name (widget, "button-press-event"); return FALSE; } @@ -1360,11 +1360,11 @@ create_main_clock_label (ClockData *cd) label = gtk_label_new (NULL); /*Fixme-this is invalid for labels with any recent GTK3 version, maybe all of them*/ /* - g_signal_connect (label, "size_request", + g_signal_connect (label, "size-request", G_CALLBACK (clock_size_request), cd); */ - g_signal_connect_swapped (label, "style_set", + g_signal_connect_swapped (label, "style-set", G_CALLBACK (unfix_size), cd); gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_CENTER); @@ -1410,7 +1410,7 @@ create_clock_widget (ClockData *cd) { /* Main toggle button */ cd->panel_button = create_main_clock_button (); - g_signal_connect (cd->panel_button, "button_press_event", + g_signal_connect (cd->panel_button, "button-press-event", G_CALLBACK (do_not_eat_button_press), NULL); g_signal_connect (cd->panel_button, "toggled", G_CALLBACK (toggle_calendar), cd); @@ -1839,7 +1839,7 @@ ensure_time_settings_window_is_created (ClockData *cd) return; cd->set_time_window = _clock_get_widget (cd, "set-time-window"); - g_signal_connect (cd->set_time_window, "delete_event", + g_signal_connect (cd->set_time_window, "delete-event", G_CALLBACK (delete_time_settings), cd); cd->calendar = _clock_get_widget (cd, "calendar"); @@ -2511,12 +2511,12 @@ fill_clock_applet (MatePanelApplet *applet) since we need to get an initial change_orient signal to set our initial oriantation, and we get that during the _add call */ g_signal_connect (G_OBJECT (cd->applet), - "change_orient", + "change-orient", G_CALLBACK (applet_change_orient), cd); g_signal_connect (G_OBJECT (cd->panel_button), - "size_allocate", + "size-allocate", G_CALLBACK (panel_button_change_pixel_size), cd); @@ -2548,7 +2548,7 @@ fill_clock_applet (MatePanelApplet *applet) /* Make sure the weather icon gets updated when the panel size changes*/ g_signal_connect (cd->applet, - "change_size", + "change-size", G_CALLBACK (weather_icon_updated_cb), cd); @@ -2905,7 +2905,7 @@ run_prefs_locations_add (GtkButton *button, ClockData *cd) if (g_object_get_data (G_OBJECT (edit_window), "delete-handler") == NULL) { g_object_set_data (G_OBJECT (edit_window), "delete-handler", - GINT_TO_POINTER (g_signal_connect (edit_window, "delete_event", G_CALLBACK (edit_delete), cd))); + GINT_TO_POINTER (g_signal_connect (edit_window, "delete-event", G_CALLBACK (edit_delete), cd))); } location_update_ok_sensitivity (cd); @@ -3194,7 +3194,7 @@ ensure_prefs_window_is_created (ClockData *cd) g_signal_connect (G_OBJECT (selection), "changed", G_CALLBACK (prefs_locations_changed), cd); - g_signal_connect (G_OBJECT (cd->prefs_window), "delete_event", + g_signal_connect (G_OBJECT (cd->prefs_window), "delete-event", G_CALLBACK (prefs_hide_event), cd); g_signal_connect (G_OBJECT (prefs_close_button), "clicked", @@ -3223,7 +3223,7 @@ ensure_prefs_window_is_created (ClockData *cd) gtk_window_set_transient_for (GTK_WINDOW (edit_window), GTK_WINDOW (cd->prefs_window)); - g_signal_connect (G_OBJECT (edit_window), "delete_event", + g_signal_connect (G_OBJECT (edit_window), "delete-event", G_CALLBACK (edit_hide_event), cd); edit_cancel_button = _clock_get_widget (cd, "edit-location-cancel-button"); diff --git a/applets/fish/fish.c b/applets/fish/fish.c index cfbdf3fa..45ce9228 100644 --- a/applets/fish/fish.c +++ b/applets/fish/fish.c @@ -501,7 +501,7 @@ static void display_preferences_dialog(GtkAction* action, FishApplet* fish) NULL /* label_post */, FISH_ROTATE_KEY /* key */); - g_signal_connect (fish->preferences_dialog, "delete_event", + g_signal_connect (fish->preferences_dialog, "delete-event", G_CALLBACK (delete_event), fish); g_signal_connect (fish->preferences_dialog, "response", G_CALLBACK (handle_response), fish); @@ -855,7 +855,7 @@ static void display_fortune_dialog(FishApplet* fish) gtk_dialog_set_default_response ( GTK_DIALOG (fish->fortune_dialog), GTK_RESPONSE_CLOSE); - g_signal_connect (fish->fortune_dialog, "delete_event", + g_signal_connect (fish->fortune_dialog, "delete-event", G_CALLBACK (delete_event), fish); g_signal_connect (fish->fortune_dialog, "response", G_CALLBACK (handle_fortune_response), fish); @@ -1660,15 +1660,15 @@ static void setup_fish_widget(FishApplet* fish) GDK_LEAVE_NOTIFY_MASK | GDK_BUTTON_RELEASE_MASK); - g_signal_connect_swapped (widget, "enter_notify_event", + g_signal_connect_swapped (widget, "enter-notify-event", G_CALLBACK (fish_enter_notify), fish); - g_signal_connect_swapped (widget, "leave_notify_event", + g_signal_connect_swapped (widget, "leave-notify-event", G_CALLBACK (fish_leave_notify), fish); - g_signal_connect_swapped (widget, "button_release_event", + g_signal_connect_swapped (widget, "button-release-event", G_CALLBACK (handle_button_release), fish); gtk_widget_add_events (fish->drawing_area, GDK_BUTTON_RELEASE_MASK); - g_signal_connect_swapped (fish->drawing_area, "button_release_event", + g_signal_connect_swapped (fish->drawing_area, "button-release-event", G_CALLBACK (handle_button_release), fish); load_fish_image (fish); @@ -1680,7 +1680,7 @@ static void setup_fish_widget(FishApplet* fish) set_tooltip (fish); set_ally_name_desc (GTK_WIDGET (fish), fish); - g_signal_connect (fish, "key_press_event", + g_signal_connect (fish, "key-press-event", G_CALLBACK (handle_keypress), fish); gtk_widget_show_all (widget); diff --git a/applets/notification_area/main.c b/applets/notification_area/main.c index 7aff4288..c3d4a0be 100644 --- a/applets/notification_area/main.c +++ b/applets/notification_area/main.c @@ -199,7 +199,7 @@ ensure_prefs_window_is_created (NaTrayApplet *applet) g_signal_connect_swapped (applet->priv->dialog->preferences_dialog, "response", G_CALLBACK (na_preferences_dialog_response), applet); - g_signal_connect (G_OBJECT (applet->priv->dialog->preferences_dialog), "delete_event", + g_signal_connect (G_OBJECT (applet->priv->dialog->preferences_dialog), "delete-event", G_CALLBACK (na_preferences_dialog_hide_event), applet); } diff --git a/applets/notification_area/system-tray/fixedtip.c b/applets/notification_area/system-tray/fixedtip.c index 180cbdd7..528e1767 100644 --- a/applets/notification_area/system-tray/fixedtip.c +++ b/applets/notification_area/system-tray/fixedtip.c @@ -128,7 +128,7 @@ na_fixed_tip_init (NaFixedTip *fixedtip) gtk_widget_add_events (GTK_WIDGET (fixedtip), GDK_BUTTON_PRESS_MASK); - g_signal_connect (fixedtip, "button_press_event", + g_signal_connect (fixedtip, "button-press-event", G_CALLBACK (button_press_handler), NULL); fixedtip->priv->orientation = GTK_ORIENTATION_HORIZONTAL; diff --git a/applets/notification_area/system-tray/na-tray-manager.c b/applets/notification_area/system-tray/na-tray-manager.c index f001c653..d4f27ff3 100644 --- a/applets/notification_area/system-tray/na-tray-manager.c +++ b/applets/notification_area/system-tray/na-tray-manager.c @@ -148,7 +148,7 @@ na_tray_manager_class_init (NaTrayManagerClass *klass) G_PARAM_STATIC_BLURB)); manager_signals[TRAY_ICON_ADDED] = - g_signal_new ("tray_icon_added", + g_signal_new ("tray-icon-added", G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (NaTrayManagerClass, tray_icon_added), @@ -158,7 +158,7 @@ na_tray_manager_class_init (NaTrayManagerClass *klass) GTK_TYPE_SOCKET); manager_signals[TRAY_ICON_REMOVED] = - g_signal_new ("tray_icon_removed", + g_signal_new ("tray-icon-removed", G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (NaTrayManagerClass, tray_icon_removed), @@ -167,7 +167,7 @@ na_tray_manager_class_init (NaTrayManagerClass *klass) G_TYPE_NONE, 1, GTK_TYPE_SOCKET); manager_signals[MESSAGE_SENT] = - g_signal_new ("message_sent", + g_signal_new ("message-sent", G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (NaTrayManagerClass, message_sent), @@ -179,7 +179,7 @@ na_tray_manager_class_init (NaTrayManagerClass *klass) G_TYPE_LONG, G_TYPE_LONG); manager_signals[MESSAGE_CANCELLED] = - g_signal_new ("message_cancelled", + g_signal_new ("message-cancelled", G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (NaTrayManagerClass, message_cancelled), @@ -306,7 +306,7 @@ na_tray_manager_handle_dock_request (NaTrayManager *manager, return; } - g_signal_connect (child, "plug_removed", + g_signal_connect (child, "plug-removed", G_CALLBACK (na_tray_manager_plug_removed), manager); gtk_socket_add_id (GTK_SOCKET (child), icon_window); diff --git a/applets/notification_area/system-tray/na-tray.c b/applets/notification_area/system-tray/na-tray.c index df5c6791..8e4c3068 100644 --- a/applets/notification_area/system-tray/na-tray.c +++ b/applets/notification_area/system-tray/na-tray.c @@ -452,16 +452,16 @@ na_tray_constructor (GType type, { trays_screens [screen_number].tray_manager = tray_manager; - g_signal_connect (tray_manager, "tray_icon_added", + g_signal_connect (tray_manager, "tray-icon-added", G_CALLBACK (tray_added), &trays_screens [screen_number]); - g_signal_connect (tray_manager, "tray_icon_removed", + g_signal_connect (tray_manager, "tray-icon-removed", G_CALLBACK (tray_removed), &trays_screens [screen_number]); - g_signal_connect (tray_manager, "message_sent", + g_signal_connect (tray_manager, "message-sent", G_CALLBACK (message_sent), &trays_screens [screen_number]); - g_signal_connect (tray_manager, "message_cancelled", + g_signal_connect (tray_manager, "message-cancelled", G_CALLBACK (message_cancelled), &trays_screens [screen_number]); diff --git a/applets/wncklet/showdesktop.c b/applets/wncklet/showdesktop.c index b3d7a54f..851cd7b0 100644 --- a/applets/wncklet/showdesktop.c +++ b/applets/wncklet/showdesktop.c @@ -315,7 +315,7 @@ static gboolean do_not_eat_button_press(GtkWidget* widget, GdkEventButton* event { if (event->button != 1) { - g_signal_stop_emission_by_name(widget, "button_press_event"); + g_signal_stop_emission_by_name(widget, "button-press-event"); } return FALSE; @@ -441,7 +441,7 @@ gboolean show_desktop_applet_fill(MatePanelApplet* applet) atk_obj = gtk_widget_get_accessible(sdd->button); atk_object_set_name (atk_obj, _("Show Desktop Button")); - g_signal_connect(G_OBJECT(sdd->button), "button_press_event", G_CALLBACK(do_not_eat_button_press), NULL); + g_signal_connect(G_OBJECT(sdd->button), "button-press-event", G_CALLBACK(do_not_eat_button_press), NULL); g_signal_connect(G_OBJECT(sdd->button), "toggled", G_CALLBACK(button_toggled_callback), sdd); @@ -449,13 +449,13 @@ gboolean show_desktop_applet_fill(MatePanelApplet* applet) gtk_container_add(GTK_CONTAINER(sdd->button), sdd->image); gtk_container_add(GTK_CONTAINER(sdd->applet), sdd->button); - g_signal_connect (G_OBJECT(sdd->button), "size_allocate", G_CALLBACK(button_size_allocated), sdd); + g_signal_connect (G_OBJECT(sdd->button), "size-allocate", G_CALLBACK(button_size_allocated), sdd); /* FIXME: Update this comment. */ /* we have to bind change_orient before we do applet_widget_add since we need to get an initial change_orient signal to set our initial oriantation, and we get that during the _add call */ - g_signal_connect(G_OBJECT (sdd->applet), "change_orient", G_CALLBACK (applet_change_orient), sdd); + g_signal_connect(G_OBJECT (sdd->applet), "change-orient", G_CALLBACK (applet_change_orient), sdd); action_group = gtk_action_group_new("ShowDesktop Applet Actions"); gtk_action_group_set_translation_domain(action_group, GETTEXT_PACKAGE); @@ -469,8 +469,8 @@ gboolean show_desktop_applet_fill(MatePanelApplet* applet) gtk_drag_dest_set(GTK_WIDGET(sdd->button), 0, NULL, 0, 0); - g_signal_connect(G_OBJECT(sdd->button), "drag_motion", G_CALLBACK (button_drag_motion), sdd); - g_signal_connect(G_OBJECT(sdd->button), "drag_leave", G_CALLBACK (button_drag_leave), sdd); + g_signal_connect(G_OBJECT(sdd->button), "drag-motion", G_CALLBACK (button_drag_motion), sdd); + g_signal_connect(G_OBJECT(sdd->button), "drag-leave", G_CALLBACK (button_drag_leave), sdd); gtk_widget_show_all(sdd->applet); diff --git a/applets/wncklet/window-list.c b/applets/wncklet/window-list.c index cca13b30..77cce1ce 100644 --- a/applets/wncklet/window-list.c +++ b/applets/wncklet/window-list.c @@ -808,8 +808,8 @@ gboolean window_list_applet_fill(MatePanelApplet* applet) wnck_tasklist_set_icon_loader(WNCK_TASKLIST(tasklist->tasklist), icon_loader_func, tasklist, NULL); #ifdef HAVE_WINDOW_PREVIEWS - g_signal_connect(G_OBJECT(tasklist->tasklist), "task_enter_notify", G_CALLBACK(applet_enter_notify_event), tasklist); - g_signal_connect(G_OBJECT(tasklist->tasklist), "task_leave_notify", G_CALLBACK(applet_leave_notify_event), tasklist); + g_signal_connect(G_OBJECT(tasklist->tasklist), "task-enter-notify", G_CALLBACK(applet_enter_notify_event), tasklist); + g_signal_connect(G_OBJECT(tasklist->tasklist), "task-leave-notify", G_CALLBACK(applet_leave_notify_event), tasklist); #endif /* HAVE_WINDOW_PREVIEWS */ } else @@ -830,14 +830,14 @@ gboolean window_list_applet_fill(MatePanelApplet* applet) tasklist_apply_orientation(tasklist); g_signal_connect(G_OBJECT(tasklist->tasklist), "destroy", G_CALLBACK(destroy_tasklist), tasklist); - g_signal_connect(G_OBJECT(tasklist->applet), "size_allocate", G_CALLBACK(applet_size_allocate), tasklist); + g_signal_connect(G_OBJECT(tasklist->applet), "size-allocate", G_CALLBACK(applet_size_allocate), tasklist); gtk_container_add(GTK_CONTAINER(tasklist->applet), tasklist->tasklist); g_signal_connect(G_OBJECT(tasklist->applet), "realize", G_CALLBACK(applet_realized), tasklist); - g_signal_connect(G_OBJECT(tasklist->applet), "change_orient", G_CALLBACK(applet_change_orient), tasklist); - g_signal_connect(G_OBJECT(tasklist->applet), "change_size", G_CALLBACK(applet_change_pixel_size), tasklist); - g_signal_connect(G_OBJECT(tasklist->applet), "change_background", G_CALLBACK(applet_change_background), tasklist); + g_signal_connect(G_OBJECT(tasklist->applet), "change-orient", G_CALLBACK(applet_change_orient), tasklist); + g_signal_connect(G_OBJECT(tasklist->applet), "change-size", G_CALLBACK(applet_change_pixel_size), tasklist); + g_signal_connect(G_OBJECT(tasklist->applet), "change-background", G_CALLBACK(applet_change_background), tasklist); action_group = gtk_action_group_new("Tasklist Applet Actions"); gtk_action_group_set_translation_domain(action_group, GETTEXT_PACKAGE); diff --git a/applets/wncklet/window-menu.c b/applets/wncklet/window-menu.c index 804898d8..88ab5514 100644 --- a/applets/wncklet/window-menu.c +++ b/applets/wncklet/window-menu.c @@ -218,7 +218,7 @@ static gboolean window_menu_key_press_event(GtkWidget* widget, GdkEventKey* even static gboolean filter_button_press(GtkWidget* widget, GdkEventButton* event, gpointer data) { if (event->button != 1) - g_signal_stop_emission_by_name(widget, "button_press_event"); + g_signal_stop_emission_by_name(widget, "button-press-event"); return FALSE; } @@ -239,7 +239,7 @@ gboolean window_menu_applet_fill(MatePanelApplet* applet) window_menu->orient = mate_panel_applet_get_orient(applet); g_signal_connect(window_menu->applet, "destroy", G_CALLBACK(window_menu_destroy), window_menu); - g_signal_connect(window_menu->applet, "key_press_event", G_CALLBACK(window_menu_key_press_event), window_menu); + g_signal_connect(window_menu->applet, "key-press-event", G_CALLBACK(window_menu_key_press_event), window_menu); action_group = gtk_action_group_new("WindowMenu Applet Actions"); gtk_action_group_set_translation_domain(action_group, GETTEXT_PACKAGE); @@ -277,7 +277,7 @@ gboolean window_menu_applet_fill(MatePanelApplet* applet) g_signal_connect_after(G_OBJECT(window_menu->applet), "focus-out-event", G_CALLBACK(gtk_widget_queue_draw), window_menu); g_signal_connect_after(G_OBJECT(window_menu->selector), "draw", G_CALLBACK(window_menu_on_draw), window_menu); - g_signal_connect(G_OBJECT(window_menu->selector), "button_press_event", G_CALLBACK(filter_button_press), window_menu); + g_signal_connect(G_OBJECT(window_menu->selector), "button-press-event", G_CALLBACK(filter_button_press), window_menu); gtk_widget_show_all(GTK_WIDGET(window_menu->applet)); diff --git a/applets/wncklet/workspace-switcher.c b/applets/wncklet/workspace-switcher.c index 0e6c4afe..e85c9ddb 100644 --- a/applets/wncklet/workspace-switcher.c +++ b/applets/wncklet/workspace-switcher.c @@ -658,8 +658,8 @@ gboolean workspace_switcher_applet_fill(MatePanelApplet* applet) g_signal_connect(G_OBJECT(pager->applet), "realize", G_CALLBACK(applet_realized), pager); g_signal_connect(G_OBJECT(pager->applet), "unrealize", G_CALLBACK(applet_unrealized), pager); - g_signal_connect(G_OBJECT(pager->applet), "change_orient", G_CALLBACK(applet_change_orient), pager); - g_signal_connect(G_OBJECT(pager->applet), "change_background", G_CALLBACK(applet_change_background), pager); + g_signal_connect(G_OBJECT(pager->applet), "change-orient", G_CALLBACK(applet_change_orient), pager); + g_signal_connect(G_OBJECT(pager->applet), "change-background", G_CALLBACK(applet_change_background), pager); g_signal_connect(G_OBJECT(pager->applet), "style-updated", G_CALLBACK(applet_style_updated), context); gtk_widget_show(pager->pager); @@ -1038,7 +1038,7 @@ static void setup_dialog(GtkBuilder* builder, PagerData* pager) gtk_label_set_text(GTK_LABEL(pager->label_row_col), pager->orientation == GTK_ORIENTATION_HORIZONTAL ? _("rows") : _("columns")); g_signal_connect(pager->properties_dialog, "destroy", G_CALLBACK(properties_dialog_destroyed), pager); - g_signal_connect(pager->properties_dialog, "delete_event", G_CALLBACK(delete_event), pager); + g_signal_connect(pager->properties_dialog, "delete-event", G_CALLBACK(delete_event), pager); g_signal_connect(pager->properties_dialog, "response", G_CALLBACK(response_cb), pager); g_signal_connect(WID("done_button"), "clicked", (GCallback) close_dialog, pager); @@ -1062,7 +1062,7 @@ static void setup_dialog(GtkBuilder* builder, PagerData* pager) g_signal_connect (pager->num_workspaces_spin, "value-changed", G_CALLBACK (on_num_workspaces_value_changed), pager); - g_signal_connect(G_OBJECT(pager->workspaces_tree), "focus_out_event", (GCallback) workspaces_tree_focused_out, pager); + g_signal_connect(G_OBJECT(pager->workspaces_tree), "focus-out-event", (GCallback) workspaces_tree_focused_out, pager); pager->workspaces_store = gtk_list_store_new(1, G_TYPE_STRING, NULL); update_workspaces_model(pager); diff --git a/libmate-panel-applet/mate-panel-applet.c b/libmate-panel-applet/mate-panel-applet.c index 1a1751c6..33260611 100644 --- a/libmate-panel-applet/mate-panel-applet.c +++ b/libmate-panel-applet/mate-panel-applet.c @@ -2088,7 +2088,7 @@ mate_panel_applet_class_init (MatePanelAppletClass *klass) G_PARAM_READWRITE)); mate_panel_applet_signals [CHANGE_ORIENT] = - g_signal_new ("change_orient", + g_signal_new ("change-orient", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MatePanelAppletClass, change_orient), @@ -2100,7 +2100,7 @@ mate_panel_applet_class_init (MatePanelAppletClass *klass) G_TYPE_UINT); mate_panel_applet_signals [CHANGE_SIZE] = - g_signal_new ("change_size", + g_signal_new ("change-size", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MatePanelAppletClass, change_size), @@ -2112,7 +2112,7 @@ mate_panel_applet_class_init (MatePanelAppletClass *klass) G_TYPE_INT); mate_panel_applet_signals [CHANGE_BACKGROUND] = - g_signal_new ("change_background", + g_signal_new ("change-background", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MatePanelAppletClass, change_background), diff --git a/libmate-panel-applet/test-dbus-applet.c b/libmate-panel-applet/test-dbus-applet.c index 27c3a308..0da1e3ad 100644 --- a/libmate-panel-applet/test-dbus-applet.c +++ b/libmate-panel-applet/test-dbus-applet.c @@ -172,17 +172,17 @@ test_applet_fill (TestApplet *applet) mate_panel_applet_set_flags (MATE_PANEL_APPLET (applet), MATE_PANEL_APPLET_HAS_HANDLE); g_signal_connect (G_OBJECT (applet), - "change_orient", + "change-orient", G_CALLBACK (test_applet_handle_orient_change), NULL); g_signal_connect (G_OBJECT (applet), - "change_size", + "change-size", G_CALLBACK (test_applet_handle_size_change), NULL); g_signal_connect (G_OBJECT (applet), - "change_background", + "change-background", G_CALLBACK (test_applet_handle_background_change), NULL); diff --git a/mate-panel/applet.c b/mate-panel/applet.c index 160861e7..f796f8f2 100644 --- a/mate-panel/applet.c +++ b/mate-panel/applet.c @@ -1309,11 +1309,11 @@ mate_panel_applet_register (GtkWidget *applet, if (BUTTON_IS_WIDGET (applet) || gtk_widget_get_has_window (applet)) { - g_signal_connect (applet, "button_press_event", + g_signal_connect (applet, "button-press-event", G_CALLBACK (applet_button_press), info); - g_signal_connect (applet, "popup_menu", + g_signal_connect (applet, "popup-menu", G_CALLBACK (applet_popup_menu), info); } diff --git a/mate-panel/drawer.c b/mate-panel/drawer.c index 22d52722..03d6bd5f 100644 --- a/mate-panel/drawer.c +++ b/mate-panel/drawer.c @@ -443,16 +443,16 @@ create_drawer_applet (PanelToplevel *toplevel, set_tooltip_and_name (drawer, tooltip); g_signal_connect (drawer->button, "clicked", G_CALLBACK (drawer_click), drawer); - g_signal_connect (drawer->button, "key_press_event", G_CALLBACK (key_press_drawer), drawer); - g_signal_connect (drawer->toplevel, "key_press_event", G_CALLBACK (key_press_drawer_widget), drawer); + g_signal_connect (drawer->button, "key-press-event", G_CALLBACK (key_press_drawer), drawer); + g_signal_connect (drawer->toplevel, "key-press-event", G_CALLBACK (key_press_drawer_widget), drawer); gtk_drag_dest_set (drawer->button, 0, NULL, 0, 0); - g_signal_connect (drawer->button, "drag_data_get", G_CALLBACK (drag_data_get_cb), drawer); - g_signal_connect (drawer->button, "drag_motion", G_CALLBACK (drag_motion_cb), drawer); - g_signal_connect (drawer->button, "drag_drop", G_CALLBACK (drag_drop_cb), drawer); - g_signal_connect (drawer->button, "drag_data_received", G_CALLBACK (drag_data_received_cb), drawer); - g_signal_connect (drawer->button, "drag_leave", G_CALLBACK (drag_leave_cb), drawer); + g_signal_connect (drawer->button, "drag-data-get", G_CALLBACK (drag_data_get_cb), drawer); + g_signal_connect (drawer->button, "drag-motion", G_CALLBACK (drag_motion_cb), drawer); + g_signal_connect (drawer->button, "drag-drop", G_CALLBACK (drag_drop_cb), drawer); + g_signal_connect (drawer->button, "drag-data-received", G_CALLBACK (drag_data_received_cb), drawer); + g_signal_connect (drawer->button, "drag-leave", G_CALLBACK (drag_leave_cb), drawer); g_signal_connect (drawer->button, "destroy", G_CALLBACK (destroy_drawer), drawer); g_signal_connect (drawer->toplevel, "destroy", G_CALLBACK (toplevel_destroyed), drawer); @@ -534,7 +534,7 @@ load_drawer_applet (char *toplevel_id, return; } - g_signal_connect_after (drawer->button, "size_allocate", G_CALLBACK (drawer_button_size_allocated), drawer); + g_signal_connect_after (drawer->button, "size-allocate", G_CALLBACK (drawer_button_size_allocated), drawer); panel_widget_add_forbidden (panel_toplevel_get_panel_widget (drawer->toplevel)); panel_widget_set_applet_expandable (panel_widget, GTK_WIDGET (drawer->button), FALSE, TRUE); diff --git a/mate-panel/launcher.c b/mate-panel/launcher.c index 0a536c96..b21a813a 100644 --- a/mate-panel/launcher.c +++ b/mate-panel/launcher.c @@ -530,15 +530,15 @@ create_launcher (const char *location) gtk_drag_dest_set (GTK_WIDGET (launcher->button), 0, NULL, 0, 0); - g_signal_connect (launcher->button, "drag_data_get", + g_signal_connect (launcher->button, "drag-data-get", G_CALLBACK (drag_data_get_cb), launcher); - g_signal_connect (launcher->button, "drag_data_received", + g_signal_connect (launcher->button, "drag-data-received", G_CALLBACK (drag_data_received_cb), launcher); - g_signal_connect (launcher->button, "drag_motion", + g_signal_connect (launcher->button, "drag-motion", G_CALLBACK (drag_motion_cb), launcher); - g_signal_connect (launcher->button, "drag_drop", + g_signal_connect (launcher->button, "drag-drop", G_CALLBACK (drag_drop_cb), launcher); - g_signal_connect (launcher->button, "drag_leave", + g_signal_connect (launcher->button, "drag-leave", G_CALLBACK (drag_leave_cb), launcher); g_signal_connect_swapped (launcher->button, "clicked", G_CALLBACK (clicked_cb), launcher); @@ -821,13 +821,13 @@ launcher_properties (Launcher *launcher) g_signal_connect (launcher->prop_dialog, "changed", G_CALLBACK (launcher_changed), launcher); - g_signal_connect (launcher->prop_dialog, "command_changed", + g_signal_connect (launcher->prop_dialog, "command-changed", G_CALLBACK (launcher_command_changed), launcher); g_signal_connect (launcher->prop_dialog, "saved", G_CALLBACK (launcher_saved), launcher); - g_signal_connect (launcher->prop_dialog, "error_reported", + g_signal_connect (launcher->prop_dialog, "error-reported", G_CALLBACK (launcher_error_reported), NULL); g_signal_connect (launcher->prop_dialog, "destroy", @@ -1014,7 +1014,7 @@ ask_about_launcher (const char *file, g_signal_connect (G_OBJECT (dialog), "saved", G_CALLBACK (launcher_new_saved), NULL); - g_signal_connect (G_OBJECT (dialog), "error_reported", + g_signal_connect (G_OBJECT (dialog), "error-reported", G_CALLBACK (launcher_error_reported), NULL); gtk_window_set_screen (GTK_WINDOW (dialog), diff --git a/mate-panel/mate-desktop-item-edit.c b/mate-panel/mate-desktop-item-edit.c index 9f970f1d..69bd4d23 100644 --- a/mate-panel/mate-desktop-item-edit.c +++ b/mate-panel/mate-desktop-item-edit.c @@ -207,7 +207,7 @@ main (int argc, char * argv[]) dialogs ++; g_signal_connect (G_OBJECT (dlg), "destroy", G_CALLBACK (dialog_destroyed), NULL); - g_signal_connect (G_OBJECT (dlg), "error_reported", + g_signal_connect (G_OBJECT (dlg), "error-reported", G_CALLBACK (error_reported), NULL); gtk_widget_show (dlg); } diff --git a/mate-panel/menu.c b/mate-panel/menu.c index d9e750e0..372c922f 100644 --- a/mate-panel/menu.c +++ b/mate-panel/menu.c @@ -168,7 +168,7 @@ panel_create_menu (void) gtk_widget_set_name (retval, "mate-panel-main-menu"); - g_signal_connect (retval, "key_press_event", + g_signal_connect (retval, "key-press-event", G_CALLBACK (panel_menu_key_press_handler), NULL); @@ -186,7 +186,7 @@ create_empty_menu (void) /* intercept all right button clicks makes sure they don't go to the object itself */ - g_signal_connect (retval, "button_press_event", + g_signal_connect (retval, "button-press-event", G_CALLBACK (menu_dummy_button_press_event), NULL); return retval; @@ -807,14 +807,14 @@ setup_uri_drag (GtkWidget *menuitem, if (icon != NULL) gtk_drag_source_set_icon_name (menuitem, icon); - g_signal_connect (G_OBJECT (menuitem), "drag_begin", + g_signal_connect (G_OBJECT (menuitem), "drag-begin", G_CALLBACK (drag_begin_menu_cb), NULL); - g_signal_connect_data (G_OBJECT (menuitem), "drag_data_get", + g_signal_connect_data (G_OBJECT (menuitem), "drag-data-get", G_CALLBACK (drag_data_get_string_cb), g_strdup (uri), (GClosureNotify) G_CALLBACK (g_free), 0 /* connect_flags */); - g_signal_connect (G_OBJECT (menuitem), "drag_end", + g_signal_connect (G_OBJECT (menuitem), "drag-end", G_CALLBACK (drag_end_menu_cb), NULL); } @@ -838,14 +838,14 @@ setup_internal_applet_drag (GtkWidget *menuitem, gtk_drag_source_set_icon_name (menuitem, panel_action_get_icon_name (type)); - g_signal_connect (G_OBJECT (menuitem), "drag_begin", + g_signal_connect (G_OBJECT (menuitem), "drag-begin", G_CALLBACK (drag_begin_menu_cb), NULL); - g_signal_connect_data (G_OBJECT (menuitem), "drag_data_get", + g_signal_connect_data (G_OBJECT (menuitem), "drag-data-get", G_CALLBACK (drag_data_get_string_cb), g_strdup (panel_action_get_drag_id (type)), (GClosureNotify) G_CALLBACK (g_free), 0 /* connect_flags */); - g_signal_connect (G_OBJECT (menuitem), "drag_end", + g_signal_connect (G_OBJECT (menuitem), "drag-end", G_CALLBACK (drag_end_menu_cb), NULL); } @@ -944,7 +944,7 @@ create_fake_menu (MateMenuTreeDirectory *directory) GUINT_TO_POINTER (idle_id), remove_submenu_to_display_idle); - g_signal_connect (menu, "button_press_event", + g_signal_connect (menu, "button-press-event", G_CALLBACK (menu_dummy_button_press_event), NULL); /* Fix any failures of compiz/other wm's to communicate with gtk for transparency */ @@ -1093,7 +1093,7 @@ create_menuitem (GtkWidget *menu, } } - g_signal_connect_after (menuitem, "button_press_event", + g_signal_connect_after (menuitem, "button-press-event", G_CALLBACK (menuitem_button_press_event), NULL); if (!panel_lockdown_get_locked_down ()) { @@ -1117,11 +1117,11 @@ create_menuitem (GtkWidget *menu, } } - g_signal_connect (G_OBJECT (menuitem), "drag_begin", + g_signal_connect (G_OBJECT (menuitem), "drag-begin", G_CALLBACK (drag_begin_menu_cb), NULL); - g_signal_connect (menuitem, "drag_data_get", + g_signal_connect (menuitem, "drag-data-get", G_CALLBACK (drag_data_get_menu_cb), entry); - g_signal_connect (menuitem, "drag_end", + g_signal_connect (menuitem, "drag-end", G_CALLBACK (drag_end_menu_cb), NULL); } @@ -1255,7 +1255,7 @@ create_applications_menu (const char *menu_file, GUINT_TO_POINTER (idle_id), remove_submenu_to_display_idle); - g_signal_connect (menu, "button_press_event", + g_signal_connect (menu, "button-press-event", G_CALLBACK (menu_dummy_button_press_event), NULL); g_signal_connect (tree, "changed", G_CALLBACK (handle_matemenu_tree_changed), menu); diff --git a/mate-panel/panel-addto.c b/mate-panel/panel-addto.c index 8b559b75..eae27735 100644 --- a/mate-panel/panel-addto.c +++ b/mate-panel/panel-addto.c @@ -339,7 +339,7 @@ panel_addto_setup_drag (GtkTreeView *tree_view, GDK_BUTTON1_MASK|GDK_BUTTON2_MASK, target, 1, GDK_ACTION_COPY); - g_signal_connect_data (G_OBJECT (tree_view), "drag_data_get", + g_signal_connect_data (G_OBJECT (tree_view), "drag-data-get", G_CALLBACK (panel_addto_drag_data_get_cb), g_strdup (text), (GClosureNotify) G_CALLBACK (g_free), diff --git a/mate-panel/panel-ditem-editor.c b/mate-panel/panel-ditem-editor.c index 2762ccc1..325c2b47 100644 --- a/mate-panel/panel-ditem-editor.c +++ b/mate-panel/panel-ditem-editor.c @@ -427,7 +427,7 @@ panel_ditem_editor_class_init (PanelDItemEditorClass *klass) G_TYPE_STRING); ditem_edit_signals[COMMAND_CHANGED] = - g_signal_new ("command_changed", + g_signal_new ("command-changed", G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PanelDItemEditorClass, @@ -463,7 +463,7 @@ panel_ditem_editor_class_init (PanelDItemEditorClass *klass) G_TYPE_STRING); ditem_edit_signals[ERROR_REPORTED] = - g_signal_new ("error_reported", + g_signal_new ("error-reported", G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PanelDItemEditorClass, diff --git a/mate-panel/panel-menu-items.c b/mate-panel/panel-menu-items.c index dfa3d7ce..132c4bbd 100644 --- a/mate-panel/panel-menu-items.c +++ b/mate-panel/panel-menu-items.c @@ -244,7 +244,7 @@ panel_menu_items_append_from_desktop (GtkWidget *menu, G_CALLBACK (panel_menu_item_activate_desktop_file), g_strdup (full_path), (GClosureNotify) G_CALLBACK (g_free), 0); - g_signal_connect (G_OBJECT (item), "button_press_event", + g_signal_connect (G_OBJECT (item), "button-press-event", G_CALLBACK (menu_dummy_button_press_event), NULL); uri = g_filename_to_uri (full_path, NULL, NULL); @@ -293,7 +293,7 @@ panel_menu_items_append_place_item (const char *icon_name, g_signal_connect_data (item, "activate", callback, user_data, (GClosureNotify) G_CALLBACK (g_free), 0); - g_signal_connect (G_OBJECT (item), "button_press_event", + g_signal_connect (G_OBJECT (item), "button-press-event", G_CALLBACK (menu_dummy_button_press_event), NULL); if (g_str_has_prefix (uri, "file:")) /*Links only work for local files*/ @@ -324,7 +324,7 @@ panel_menu_items_create_action_item_full (PanelActionButtonType action_type, g_signal_connect (item, "activate", panel_action_get_invoke (action_type), NULL); - g_signal_connect (G_OBJECT (item), "button_press_event", + g_signal_connect (G_OBJECT (item), "button-press-event", G_CALLBACK (menu_dummy_button_press_event), NULL); setup_internal_applet_drag (item, action_type); @@ -608,7 +608,7 @@ panel_menu_item_append_drive (GtkWidget *menu, g_object_ref (drive), (GClosureNotify) G_CALLBACK (g_object_unref), 0); - g_signal_connect (G_OBJECT (item), "button_press_event", + g_signal_connect (G_OBJECT (item), "button-press-event", G_CALLBACK (menu_dummy_button_press_event), NULL); } @@ -708,7 +708,7 @@ panel_menu_item_append_volume (GtkWidget *menu, g_object_ref (volume), (GClosureNotify) G_CALLBACK (g_object_unref), 0); - g_signal_connect (G_OBJECT (item), "button_press_event", + g_signal_connect (G_OBJECT (item), "button-press-event", G_CALLBACK (menu_dummy_button_press_event), NULL); } diff --git a/mate-panel/panel-properties-dialog.c b/mate-panel/panel-properties-dialog.c index 3c1c634c..6c6e3cc2 100644 --- a/mate-panel/panel-properties-dialog.c +++ b/mate-panel/panel-properties-dialog.c @@ -356,7 +356,7 @@ panel_properties_dialog_setup_color_button (PanelPropertiesDialog *dialog, gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (dialog->color_button), &color); - g_signal_connect_swapped (dialog->color_button, "color_set", + g_signal_connect_swapped (dialog->color_button, "color-set", G_CALLBACK (panel_properties_dialog_color_changed), dialog); diff --git a/mate-panel/panel-recent.c b/mate-panel/panel-recent.c index 054430bf..d23095f4 100644 --- a/mate-panel/panel-recent.c +++ b/mate-panel/panel-recent.c @@ -204,7 +204,7 @@ panel_recent_append_documents_menu (GtkWidget *top_menu, gtk_recent_chooser_set_limit (GTK_RECENT_CHOOSER (recent_menu), recent_items_limit); - g_signal_connect (G_OBJECT (recent_menu), "button_press_event", + g_signal_connect (G_OBJECT (recent_menu), "button-press-event", G_CALLBACK (menu_dummy_button_press_event), NULL); gtk_menu_shell_append (GTK_MENU_SHELL (top_menu), menu_item); diff --git a/mate-panel/panel-run-dialog.c b/mate-panel/panel-run-dialog.c index f2fd5c05..24738d3c 100644 --- a/mate-panel/panel-run-dialog.c +++ b/mate-panel/panel-run-dialog.c @@ -1769,7 +1769,7 @@ panel_run_dialog_setup_entry (PanelRunDialog *dialog, GDK_ACTION_COPY); gtk_drag_dest_add_uri_targets (dialog->combobox); - g_signal_connect (dialog->combobox, "drag_data_received", + g_signal_connect (dialog->combobox, "drag-data-received", G_CALLBACK (entry_drag_data_received), dialog); } @@ -1912,7 +1912,7 @@ panel_run_dialog_setup_pixmap (PanelRunDialog *dialog, G_CALLBACK (panel_run_dialog_screen_changed), dialog); - g_signal_connect (dialog->run_dialog, "drag_data_get", + g_signal_connect (dialog->run_dialog, "drag-data-get", G_CALLBACK (pixmap_drag_data_get), dialog); } diff --git a/mate-panel/panel-toplevel.c b/mate-panel/panel-toplevel.c index 4930a3c3..beb39e08 100644 --- a/mate-panel/panel-toplevel.c +++ b/mate-panel/panel-toplevel.c @@ -1218,9 +1218,9 @@ panel_toplevel_add_hide_button (PanelToplevel *toplevel, g_signal_connect_swapped (button, "clicked", G_CALLBACK (panel_toplevel_hide_button_clicked), toplevel); - g_signal_connect_swapped (button, "button_press_event", + g_signal_connect_swapped (button, "button-press-event", G_CALLBACK (panel_toplevel_hide_button_event), toplevel); - g_signal_connect_swapped (button, "button_release_event", + g_signal_connect_swapped (button, "button-release-event", G_CALLBACK (panel_toplevel_hide_button_event), toplevel); gtk_grid_attach (GTK_GRID (toplevel->priv->grid), button, left, top, 1, 1); @@ -2834,7 +2834,7 @@ panel_toplevel_popup_panel_menu (PanelToplevel *toplevel) { gboolean retval = FALSE; - g_signal_emit_by_name (toplevel, "popup_menu", &retval); + g_signal_emit_by_name (toplevel, "popup-menu", &retval); return retval; } diff --git a/mate-panel/panel.c b/mate-panel/panel.c index d9738950..544f2ca2 100644 --- a/mate-panel/panel.c +++ b/mate-panel/panel.c @@ -1368,13 +1368,13 @@ panel_setup (PanelToplevel *toplevel) panel_widget_setup (panel_widget); - g_signal_connect (toplevel, "drag_data_received", + g_signal_connect (toplevel, "drag-data-received", G_CALLBACK (drag_data_recieved_cb), NULL); - g_signal_connect (toplevel, "drag_motion", + g_signal_connect (toplevel, "drag-motion", G_CALLBACK (drag_motion_cb), NULL); - g_signal_connect (toplevel, "drag_leave", + g_signal_connect (toplevel, "drag-leave", G_CALLBACK (drag_leave_cb), NULL); - g_signal_connect (toplevel, "drag_drop", + g_signal_connect (toplevel, "drag-drop", G_CALLBACK (drag_drop_cb), NULL); gtk_drag_dest_set (GTK_WIDGET (toplevel), 0, NULL, 0, 0); |