diff options
author | rbuj <[email protected]> | 2021-10-27 14:22:58 +0200 |
---|---|---|
committer | Luke from DC <[email protected]> | 2022-02-09 04:42:12 +0000 |
commit | 2a06f17c2ef442bd63cc0463c5ee2d5b6cc84c64 (patch) | |
tree | 0de842f92df7aa496d2867a65f160322687e47a4 /capplets | |
parent | 0bfa4ca16e527fdc333fc1ded8b1d9f5963ccf1e (diff) | |
download | mate-control-center-2a06f17c2ef442bd63cc0463c5ee2d5b6cc84c64.tar.bz2 mate-control-center-2a06f17c2ef442bd63cc0463c5ee2d5b6cc84c64.tar.xz |
Unnecessary G_OBJECT cast when calling signal connect function
Diffstat (limited to 'capplets')
-rw-r--r-- | capplets/about-me/mate-about-me-fingerprint.c | 35 | ||||
-rw-r--r-- | capplets/about-me/mate-about-me-password.c | 25 | ||||
-rw-r--r-- | capplets/accessibility/at-properties/main.c | 6 | ||||
-rw-r--r-- | capplets/appearance/appearance-font.c | 12 | ||||
-rw-r--r-- | capplets/common/capplet-util.c | 6 | ||||
-rw-r--r-- | capplets/keybindings/eggcellrendererkeys.c | 7 | ||||
-rw-r--r-- | capplets/keyboard/mate-keyboard-properties-xkb.c | 31 | ||||
-rw-r--r-- | capplets/keyboard/mate-keyboard-properties-xkblt.c | 52 | ||||
-rw-r--r-- | capplets/keyboard/mate-keyboard-properties-xkbltadd.c | 26 | ||||
-rw-r--r-- | capplets/keyboard/mate-keyboard-properties-xkbmc.c | 23 | ||||
-rw-r--r-- | capplets/network/mate-network-properties.c | 6 | ||||
-rw-r--r-- | capplets/windows/mate-window-properties.c | 6 |
12 files changed, 121 insertions, 114 deletions
diff --git a/capplets/about-me/mate-about-me-fingerprint.c b/capplets/about-me/mate-about-me-fingerprint.c index a6bced28..7457b013 100644 --- a/capplets/about-me/mate-about-me-fingerprint.c +++ b/capplets/about-me/mate-about-me-fingerprint.c @@ -756,24 +756,31 @@ enroll_fingerprints (GtkWindow *parent, GtkWidget *enable, GtkWidget *disable) gtk_window_set_title (GTK_WINDOW (ass), _("Enable Fingerprint Login")); gtk_window_set_transient_for (GTK_WINDOW (ass), parent); gtk_window_set_position (GTK_WINDOW (ass), GTK_WIN_POS_CENTER_ON_PARENT); - g_signal_connect (G_OBJECT (ass), "cancel", - G_CALLBACK (assistant_cancelled), data); - g_signal_connect (G_OBJECT (ass), "close", - G_CALLBACK (assistant_cancelled), data); - g_signal_connect (G_OBJECT (ass), "prepare", - G_CALLBACK (assistant_prepare), data); + g_signal_connect (ass, "cancel", + G_CALLBACK (assistant_cancelled), + data); + g_signal_connect (ass, "close", + G_CALLBACK (assistant_cancelled), + data); + g_signal_connect (ass, "prepare", + G_CALLBACK (assistant_prepare), + data); /* Page 1 */ gtk_combo_box_set_active (GTK_COMBO_BOX (WID ("finger_combobox")), 0); - g_signal_connect (G_OBJECT (WID ("radiobutton1")), "toggled", - G_CALLBACK (finger_radio_button_toggled), data); - g_signal_connect (G_OBJECT (WID ("radiobutton2")), "toggled", - G_CALLBACK (finger_radio_button_toggled), data); - g_signal_connect (G_OBJECT (WID ("radiobutton3")), "toggled", - G_CALLBACK (finger_radio_button_toggled), data); - g_signal_connect (G_OBJECT (WID ("finger_combobox")), "changed", - G_CALLBACK (finger_combobox_changed), data); + g_signal_connect (gtk_builder_get_object (dialog, "radiobutton1"), "toggled", + G_CALLBACK (finger_radio_button_toggled), + data); + g_signal_connect (gtk_builder_get_object (dialog, "radiobutton2"), "toggled", + G_CALLBACK (finger_radio_button_toggled), + data); + g_signal_connect (gtk_builder_get_object (dialog, "radiobutton3"), "toggled", + G_CALLBACK (finger_radio_button_toggled), + data); + g_signal_connect (gtk_builder_get_object (dialog, "finger_combobox"), "changed", + G_CALLBACK (finger_combobox_changed), + data); data->finger = selected_finger (dialog); diff --git a/capplets/about-me/mate-about-me-password.c b/capplets/about-me/mate-about-me-password.c index 3b9fce9d..5800c3ca 100644 --- a/capplets/about-me/mate-about-me-password.c +++ b/capplets/about-me/mate-about-me-password.c @@ -1112,12 +1112,14 @@ passdlg_init (PasswordDialog *pdialog, GtkWindow *parent) 0); /* Activate authenticate-button when enter is pressed in current-password */ - g_signal_connect (G_OBJECT (pdialog->current_password), "activate", - G_CALLBACK (passdlg_activate), WID ("authenticate-button")); + g_signal_connect (pdialog->current_password, "activate", + G_CALLBACK (passdlg_activate), + WID ("authenticate-button")); /* Activate retyped-password when enter is pressed in new-password */ - g_signal_connect (G_OBJECT (pdialog->new_password), "activate", - G_CALLBACK (passdlg_activate), pdialog->retyped_password); + g_signal_connect (pdialog->new_password, "activate", + G_CALLBACK (passdlg_activate), + pdialog->retyped_password); /* Clear status message */ passdlg_set_status (pdialog, ""); @@ -1126,14 +1128,17 @@ passdlg_init (PasswordDialog *pdialog, GtkWindow *parent) passdlg_set_auth_state (pdialog, FALSE); /* Connect signal handlers */ - g_signal_connect (G_OBJECT (WID ("authenticate-button")), "clicked", - G_CALLBACK (passdlg_authenticate), pdialog); + g_signal_connect (gtk_builder_get_object (dialog, "authenticate-button"), "clicked", + G_CALLBACK (passdlg_authenticate), + pdialog); /* Verify new passwords on-the-fly */ - g_signal_connect (G_OBJECT (WID ("new-password")), "changed", - G_CALLBACK (passdlg_check_password), pdialog); - g_signal_connect (G_OBJECT (WID ("retyped-password")), "changed", - G_CALLBACK (passdlg_check_password), pdialog); + g_signal_connect (gtk_builder_get_object (dialog, "new-password"), "changed", + G_CALLBACK (passdlg_check_password), + pdialog); + g_signal_connect (gtk_builder_get_object (dialog, "retyped-password"), "changed", + G_CALLBACK (passdlg_check_password), + pdialog); /* Set misc dialog properties */ gtk_window_set_resizable (GTK_WINDOW (wpassdlg), FALSE); diff --git a/capplets/accessibility/at-properties/main.c b/capplets/accessibility/at-properties/main.c index aaa71d8a..e5041e14 100644 --- a/capplets/accessibility/at-properties/main.c +++ b/capplets/accessibility/at-properties/main.c @@ -248,9 +248,9 @@ setup_dialog (GtkBuilder *builder, GSettings *settings) "at_properties_dialog")); capplet_set_icon (widget, "preferences-desktop-accessibility"); - g_signal_connect (G_OBJECT (widget), - "response", - G_CALLBACK (cb_dialog_response), NULL); + g_signal_connect (widget, "response", + G_CALLBACK (cb_dialog_response), + NULL); gtk_widget_show (widget); } diff --git a/capplets/appearance/appearance-font.c b/capplets/appearance/appearance-font.c index 06b7d584..1c1d96d5 100644 --- a/capplets/appearance/appearance-font.c +++ b/capplets/appearance/appearance-font.c @@ -719,12 +719,12 @@ cb_show_details (GtkWidget *button, NULL); data->font_groups = g_slist_prepend (data->font_groups, group); - g_signal_connect (G_OBJECT (data->font_details), - "response", - G_CALLBACK (cb_details_response), NULL); - g_signal_connect (G_OBJECT (data->font_details), - "delete_event", - G_CALLBACK (gtk_true), NULL); + g_signal_connect (data->font_details, "response", + G_CALLBACK (cb_details_response), + NULL); + g_signal_connect (data->font_details, "delete_event", + G_CALLBACK (gtk_true), + NULL); } gtk_window_present (GTK_WINDOW (data->font_details)); diff --git a/capplets/common/capplet-util.c b/capplets/common/capplet-util.c index a5615a06..4dea5f51 100644 --- a/capplets/common/capplet-util.c +++ b/capplets/common/capplet-util.c @@ -48,9 +48,9 @@ capplet_error_dialog (GtkWindow *parent, char const *msg, GError *err) GTK_BUTTONS_CLOSE, msg, err->message); - g_signal_connect (G_OBJECT (dialog), - "response", - G_CALLBACK (gtk_widget_destroy), NULL); + g_signal_connect (dialog, "response", + G_CALLBACK (gtk_widget_destroy), + NULL); gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE); gtk_widget_show (dialog); g_error_free (err); diff --git a/capplets/keybindings/eggcellrendererkeys.c b/capplets/keybindings/eggcellrendererkeys.c index 4e61ce41..aa4c8e8a 100644 --- a/capplets/keybindings/eggcellrendererkeys.c +++ b/capplets/keybindings/eggcellrendererkeys.c @@ -622,7 +622,7 @@ egg_cell_renderer_keys_start_editing (GtkCellRenderer *cell, keys->grab_widget = widget; - g_signal_connect (G_OBJECT (widget), "key_press_event", + g_signal_connect (widget, "key_press_event", G_CALLBACK (grab_key_callback), keys); @@ -659,8 +659,9 @@ egg_cell_renderer_keys_start_editing (GtkCellRenderer *cell, gtk_widget_show_all (keys->edit_widget); - g_signal_connect (G_OBJECT (keys->edit_widget), "unrealize", - G_CALLBACK (ungrab_stuff), keys); + g_signal_connect (keys->edit_widget, "unrealize", + G_CALLBACK (ungrab_stuff), + keys); keys->edit_key = keys->accel_key; diff --git a/capplets/keyboard/mate-keyboard-properties-xkb.c b/capplets/keyboard/mate-keyboard-properties-xkb.c index 11833c70..d1dd7925 100644 --- a/capplets/keyboard/mate-keyboard-properties-xkb.c +++ b/capplets/keyboard/mate-keyboard-properties-xkb.c @@ -211,29 +211,28 @@ setup_xkb_tabs (GtkBuilder * dialog) xkb_get_default_group () < 0); xkb_layouts_register_buttons_handlers (dialog); - g_signal_connect (G_OBJECT (WID ("xkb_reset_to_defaults")), - "clicked", G_CALLBACK (reset_to_defaults), - dialog); + g_signal_connect (gtk_builder_get_object (dialog, "xkb_reset_to_defaults"), "clicked", + G_CALLBACK (reset_to_defaults), + dialog); - g_signal_connect (G_OBJECT (chk_new_windows_inherit_layout), - "toggled", (GCallback) - chk_new_windows_inherit_layout_toggled, dialog); + g_signal_connect (chk_new_windows_inherit_layout, "toggled", + (GCallback) chk_new_windows_inherit_layout_toggled, + dialog); - g_signal_connect_swapped (G_OBJECT (WID ("xkb_layout_options")), - "clicked", - G_CALLBACK (xkb_options_popup_dialog), - dialog); + g_signal_connect_swapped (gtk_builder_get_object (dialog, "xkb_layout_options"), "clicked", + G_CALLBACK (xkb_options_popup_dialog), + dialog); - g_signal_connect_swapped (G_OBJECT (WID ("xkb_model_pick")), - "clicked", G_CALLBACK (choose_model), - dialog); + g_signal_connect_swapped (gtk_builder_get_object (dialog, "xkb_model_pick"), "clicked", + G_CALLBACK (choose_model), + dialog); xkb_layouts_register_gsettings_listener (dialog); xkb_options_register_gsettings_listener (dialog); - g_signal_connect (G_OBJECT (WID ("keyboard_dialog")), - "destroy", G_CALLBACK (cleanup_xkb_tabs), - dialog); + g_signal_connect (gtk_builder_get_object (dialog, "keyboard_dialog"), "destroy", + G_CALLBACK (cleanup_xkb_tabs), + dialog); enable_disable_restoring (dialog); } diff --git a/capplets/keyboard/mate-keyboard-properties-xkblt.c b/capplets/keyboard/mate-keyboard-properties-xkblt.c index 12943d53..113fb88f 100644 --- a/capplets/keyboard/mate-keyboard-properties-xkblt.c +++ b/capplets/keyboard/mate-keyboard-properties-xkblt.c @@ -257,10 +257,9 @@ xkb_layouts_prepare_selected_tree (GtkBuilder * dialog) gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view), desc_column); - g_signal_connect_swapped (G_OBJECT (selection), "changed", - G_CALLBACK - (xkb_layouts_enable_disable_buttons), - dialog); + g_signal_connect_swapped (selection, "changed", + G_CALLBACK(xkb_layouts_enable_disable_buttons), + dialog); max_selected_layouts = xkl_engine_get_max_num_groups (engine); /* Setting up DnD */ @@ -270,11 +269,12 @@ xkb_layouts_prepare_selected_tree (GtkBuilder * dialog) gtk_drag_dest_set (tree_view, GTK_DEST_DEFAULT_ALL, &self_drag_target, 1, GDK_ACTION_MOVE); - g_signal_connect (G_OBJECT (tree_view), "drag_data_get", - G_CALLBACK (xkb_layouts_dnd_data_get), dialog); - g_signal_connect (G_OBJECT (tree_view), "drag_data_received", - G_CALLBACK (xkb_layouts_dnd_data_received), - dialog); + g_signal_connect (tree_view, "drag_data_get", + G_CALLBACK (xkb_layouts_dnd_data_get), + dialog); + g_signal_connect (tree_view, "drag_data_received", + G_CALLBACK (xkb_layouts_dnd_data_received), + dialog); } gchar * @@ -436,18 +436,21 @@ move_down_selected_layout (GtkWidget * button, GtkBuilder * dialog) void xkb_layouts_register_buttons_handlers (GtkBuilder * dialog) { - g_signal_connect (G_OBJECT (WID ("xkb_layouts_add")), "clicked", - G_CALLBACK (add_selected_layout), dialog); - g_signal_connect (G_OBJECT (WID ("xkb_layouts_show")), "clicked", - G_CALLBACK (show_selected_layout), dialog); - g_signal_connect (G_OBJECT (WID ("xkb_layouts_remove")), "clicked", - G_CALLBACK (remove_selected_layout), dialog); - g_signal_connect (G_OBJECT (WID ("xkb_layouts_move_up")), - "clicked", G_CALLBACK (move_up_selected_layout), - dialog); - g_signal_connect (G_OBJECT (WID ("xkb_layouts_move_down")), - "clicked", - G_CALLBACK (move_down_selected_layout), dialog); + g_signal_connect (gtk_builder_get_object (dialog, "xkb_layouts_add"), "clicked", + G_CALLBACK (add_selected_layout), + dialog); + g_signal_connect (gtk_builder_get_object (dialog, "xkb_layouts_show"), "clicked", + G_CALLBACK (show_selected_layout), + dialog); + g_signal_connect (gtk_builder_get_object (dialog, "xkb_layouts_remove"), "clicked", + G_CALLBACK (remove_selected_layout), + dialog); + g_signal_connect (gtk_builder_get_object (dialog, "xkb_layouts_move_up"), "clicked", + G_CALLBACK (move_up_selected_layout), + dialog); + g_signal_connect (gtk_builder_get_object (dialog, "xkb_layouts_move_down"), "clicked", + G_CALLBACK (move_down_selected_layout), + dialog); } static void @@ -460,8 +463,7 @@ xkb_layouts_update_list (GSettings * settings, gchar * key, GtkBuilder * dialog) void xkb_layouts_register_gsettings_listener (GtkBuilder * dialog) { - g_signal_connect (xkb_kbd_settings, - "changed::layouts", - G_CALLBACK (xkb_layouts_update_list), - dialog); + g_signal_connect (xkb_kbd_settings, "changed::layouts", + G_CALLBACK (xkb_layouts_update_list), + dialog); } diff --git a/capplets/keyboard/mate-keyboard-properties-xkbltadd.c b/capplets/keyboard/mate-keyboard-properties-xkbltadd.c index 723f29fa..1edaa666 100644 --- a/capplets/keyboard/mate-keyboard-properties-xkbltadd.c +++ b/capplets/keyboard/mate-keyboard-properties-xkbltadd.c @@ -322,8 +322,9 @@ xkb_layout_chooser_available_layouts_fill (GtkBuilder * COMBO_BOX_MODEL_COL_SORT, GTK_SORT_ASCENDING); - g_signal_connect_swapped (G_OBJECT (cbl), "changed", - combo_changed_notify, chooser_dialog); + g_signal_connect_swapped (cbl, "changed", + G_CALLBACK (combo_changed_notify), + chooser_dialog); /* Setup the variants combo */ renderer = gtk_cell_renderer_text_new (); @@ -333,10 +334,9 @@ xkb_layout_chooser_available_layouts_fill (GtkBuilder * renderer, "markup", COMBO_BOX_MODEL_COL_VISIBLE, NULL); - g_signal_connect_swapped (G_OBJECT (cbev), "changed", - G_CALLBACK - (xkb_layout_chooser_available_variant_changed), - chooser_dialog); + g_signal_connect_swapped (cbev, "changed", + G_CALLBACK(xkb_layout_chooser_available_variant_changed), + chooser_dialog); } static gchar ** @@ -462,10 +462,9 @@ xkb_layout_choose (GtkBuilder * dialog) G_CALLBACK (xkb_layout_chooser_available_language_changed)); - g_signal_connect_after (G_OBJECT (notebook), "switch_page", - G_CALLBACK - (xkb_layout_chooser_page_changed), - chooser_dialog); + g_signal_connect_after (notebook, "switch_page", + G_CALLBACK(xkb_layout_chooser_page_changed), + chooser_dialog); gtk_combo_box_set_active (GTK_COMBO_BOX (CWID ("xkb_countries_available")), @@ -507,10 +506,9 @@ xkb_layout_choose (GtkBuilder * dialog) gtk_widget_hide (CWID ("btnPrint")); } - g_signal_connect (G_OBJECT (chooser), - "response", - G_CALLBACK (xkb_layout_chooser_response), - chooser_dialog); + g_signal_connect (chooser, "response", + G_CALLBACK (xkb_layout_chooser_response), + chooser_dialog); toplevel = gtk_widget_get_toplevel (chooser); if (gtk_widget_is_toplevel (toplevel)) { diff --git a/capplets/keyboard/mate-keyboard-properties-xkbmc.c b/capplets/keyboard/mate-keyboard-properties-xkbmc.c index 6ffc69e6..67b3e22c 100644 --- a/capplets/keyboard/mate-keyboard-properties-xkbmc.c +++ b/capplets/keyboard/mate-keyboard-properties-xkbmc.c @@ -217,11 +217,9 @@ fill_vendors_list (GtkBuilder * chooser_dialog) fill_models_list (chooser_dialog); } - g_signal_connect (G_OBJECT - (gtk_tree_view_get_selection - (GTK_TREE_VIEW (vendors_list))), "changed", - G_CALLBACK (xkb_model_chooser_change_vendor_sel), - chooser_dialog); + g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (vendors_list)), "changed", + G_CALLBACK (xkb_model_chooser_change_vendor_sel), + chooser_dialog); return gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list_store), &iter); @@ -278,11 +276,9 @@ fill_models_list (GtkBuilder * chooser_dialog) } } - g_signal_connect (G_OBJECT - (gtk_tree_view_get_selection - (GTK_TREE_VIEW (models_list))), "changed", - G_CALLBACK (xkb_model_chooser_change_model_sel), - chooser_dialog); + g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (models_list)), "changed", + G_CALLBACK (xkb_model_chooser_change_model_sel), + chooser_dialog); } static void @@ -335,10 +331,9 @@ choose_model (GtkBuilder * dialog) fill_models_list (chooser_dialog); } - g_signal_connect (G_OBJECT (chooser), - "response", - G_CALLBACK (xkb_model_chooser_response), - chooser_dialog); + g_signal_connect (chooser, "response", + G_CALLBACK (xkb_model_chooser_response), + chooser_dialog); gtk_dialog_run (GTK_DIALOG (chooser)); gtk_widget_destroy (chooser); g_free (current_model_name); diff --git a/capplets/network/mate-network-properties.c b/capplets/network/mate-network-properties.c index 5645f173..7fbc035d 100644 --- a/capplets/network/mate-network-properties.c +++ b/capplets/network/mate-network-properties.c @@ -359,9 +359,9 @@ connect_sensitivity_signals (GtkBuilder *builder, GSList *mode_group) { for (; mode_group != NULL; mode_group = mode_group->next) { - g_signal_connect (G_OBJECT (mode_group->data), "clicked", - G_CALLBACK(proxy_mode_radiobutton_clicked_cb), - builder); + g_signal_connect (mode_group->data, "clicked", + G_CALLBACK(proxy_mode_radiobutton_clicked_cb), + builder); } } diff --git a/capplets/windows/mate-window-properties.c b/capplets/windows/mate-window-properties.c index 90b46f9c..9757c42c 100644 --- a/capplets/windows/mate-window-properties.c +++ b/capplets/windows/mate-window-properties.c @@ -481,7 +481,7 @@ main (int argc, char **argv) "active", G_SETTINGS_BIND_DEFAULT); - g_signal_connect (G_OBJECT (dialog_win), "destroy", + g_signal_connect (dialog_win, "destroy", G_CALLBACK (gtk_main_quit), NULL); g_signal_connect (marco_settings, "changed", @@ -490,12 +490,12 @@ main (int argc, char **argv) g_signal_connect (marco_settings, "changed::" MARCO_FOCUS_KEY, G_CALLBACK (mouse_focus_changed_callback), NULL); - g_signal_connect (G_OBJECT (screen), "window_manager_changed", + g_signal_connect (screen, "window_manager_changed", G_CALLBACK (wm_changed_callback), NULL); i = 0; while (i < n_mouse_modifiers) { - g_signal_connect (G_OBJECT (mouse_modifiers[i].radio), "toggled", + g_signal_connect (mouse_modifiers[i].radio, "toggled", G_CALLBACK (alt_click_radio_toggled_callback), &mouse_modifiers[i]); ++i; |