diff options
Diffstat (limited to 'mate-panel')
-rw-r--r-- | mate-panel/applet.c | 4 | ||||
-rw-r--r-- | mate-panel/drawer.c | 16 | ||||
-rw-r--r-- | mate-panel/launcher.c | 16 | ||||
-rw-r--r-- | mate-panel/mate-desktop-item-edit.c | 2 | ||||
-rw-r--r-- | mate-panel/menu.c | 28 | ||||
-rw-r--r-- | mate-panel/panel-addto.c | 2 | ||||
-rw-r--r-- | mate-panel/panel-ditem-editor.c | 4 | ||||
-rw-r--r-- | mate-panel/panel-menu-items.c | 10 | ||||
-rw-r--r-- | mate-panel/panel-properties-dialog.c | 2 | ||||
-rw-r--r-- | mate-panel/panel-recent.c | 2 | ||||
-rw-r--r-- | mate-panel/panel-run-dialog.c | 4 | ||||
-rw-r--r-- | mate-panel/panel-toplevel.c | 6 | ||||
-rw-r--r-- | mate-panel/panel.c | 8 |
13 files changed, 52 insertions, 52 deletions
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); |