diff options
| author | rbuj <[email protected]> | 2020-12-29 10:38:15 +0100 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2021-01-28 21:08:12 +0100 |
| commit | 3b2fd26415133da19eee10ae18b61df19d5ce80f (patch) | |
| tree | d8848f632cd5ce0a7fac47dd9258dd7eb56c40f2 /stickynotes | |
| parent | e948feaf6a87c411503aee62f97334e500cb80f1 (diff) | |
| download | mate-applets-3b2fd26415133da19eee10ae18b61df19d5ce80f.tar.bz2 mate-applets-3b2fd26415133da19eee10ae18b61df19d5ce80f.tar.xz | |
Remove unnecessary casts on g_signal_connect calls
Diffstat (limited to 'stickynotes')
| -rw-r--r-- | stickynotes/stickynotes.c | 155 | ||||
| -rw-r--r-- | stickynotes/stickynotes_applet_callbacks.c | 9 |
2 files changed, 102 insertions, 62 deletions
diff --git a/stickynotes/stickynotes.c b/stickynotes/stickynotes.c index 21ea7c3b..be05a5fb 100644 --- a/stickynotes/stickynotes.c +++ b/stickynotes/stickynotes.c @@ -261,79 +261,122 @@ stickynote_new_aux (GdkScreen *screen, * we would have an invalid GtkMenu. We need to ref it. */ g_object_ref (note->w_menu); - g_signal_connect (G_OBJECT (note->w_window), "button-press-event", - G_CALLBACK (stickynote_show_popup_menu), note->w_menu); - g_signal_connect (G_OBJECT (note->w_lock), "button-press-event", - G_CALLBACK (stickynote_show_popup_menu), note->w_menu); + g_signal_connect (note->w_window, "button-press-event", + G_CALLBACK (stickynote_show_popup_menu), + note->w_menu); - g_signal_connect (G_OBJECT (note->w_close), "button-press-event", - G_CALLBACK (stickynote_show_popup_menu), note->w_menu); + g_signal_connect (note->w_lock, "button-press-event", + G_CALLBACK (stickynote_show_popup_menu), + note->w_menu); - g_signal_connect (G_OBJECT (note->w_resize_se), "button-press-event", - G_CALLBACK (stickynote_show_popup_menu), note->w_menu); + g_signal_connect (note->w_close, "button-press-event", + G_CALLBACK (stickynote_show_popup_menu), + note->w_menu); - g_signal_connect (G_OBJECT (note->w_resize_sw), "button-press-event", - G_CALLBACK (stickynote_show_popup_menu), note->w_menu); + g_signal_connect (note->w_resize_se, "button-press-event", + G_CALLBACK (stickynote_show_popup_menu), + note->w_menu); + + g_signal_connect (note->w_resize_sw, "button-press-event", + G_CALLBACK (stickynote_show_popup_menu), + note->w_menu); /* Connect a properties dialog to the note */ gtk_window_set_transient_for (GTK_WINDOW (note->w_properties), GTK_WINDOW (note->w_window)); gtk_dialog_set_default_response (GTK_DIALOG (note->w_properties), GTK_RESPONSE_CLOSE); - g_signal_connect (G_OBJECT (note->w_properties), "response", - G_CALLBACK (response_cb), note); + g_signal_connect (note->w_properties, "response", + G_CALLBACK (response_cb), + note); /* Connect signals to the sticky note */ - g_signal_connect (G_OBJECT (note->w_lock), "clicked", - G_CALLBACK (stickynote_toggle_lock_cb), note); - g_signal_connect (G_OBJECT (note->w_close), "clicked", - G_CALLBACK (stickynote_close_cb), note); - g_signal_connect (G_OBJECT (note->w_resize_se), "button-press-event", - G_CALLBACK (stickynote_resize_cb), note); - g_signal_connect (G_OBJECT (note->w_resize_sw), "button-press-event", - G_CALLBACK (stickynote_resize_cb), note); - - g_signal_connect (G_OBJECT (note->w_window), "button-press-event", - G_CALLBACK (stickynote_move_cb), note); - g_signal_connect (G_OBJECT (note->w_window), "configure-event", - G_CALLBACK (stickynote_configure_cb), note); - g_signal_connect (G_OBJECT (note->w_window), "delete-event", - G_CALLBACK (stickynote_delete_cb), note); - - g_signal_connect (gtk_builder_get_object (builder, "popup_create"), - "activate", G_CALLBACK (popup_create_cb), note); - g_signal_connect (gtk_builder_get_object (builder, "popup_destroy"), - "activate", G_CALLBACK (popup_destroy_cb), note); - g_signal_connect (gtk_builder_get_object (builder, "popup_toggle_lock"), - "toggled", G_CALLBACK (popup_toggle_lock_cb), note); - g_signal_connect (gtk_builder_get_object (builder, "popup_properties"), - "activate", G_CALLBACK (popup_properties_cb), note); - - g_signal_connect_swapped (G_OBJECT (note->w_entry), "changed", - G_CALLBACK (properties_apply_title_cb), note); - g_signal_connect (G_OBJECT (note->w_color), "color-set", - G_CALLBACK (properties_color_cb), note); - g_signal_connect (G_OBJECT (note->w_font_color), "color-set", - G_CALLBACK (properties_color_cb), note); - g_signal_connect_swapped (G_OBJECT (note->w_def_color), "toggled", - G_CALLBACK (properties_apply_color_cb), note); - g_signal_connect (G_OBJECT (note->w_font), "font-set", - G_CALLBACK (properties_font_cb), note); - g_signal_connect_swapped (G_OBJECT (note->w_def_font), "toggled", - G_CALLBACK (properties_apply_font_cb), note); - g_signal_connect (G_OBJECT (note->w_entry), "activate", - G_CALLBACK (properties_activate_cb), note); - g_signal_connect (G_OBJECT (note->w_properties), "delete-event", - G_CALLBACK (gtk_widget_hide), note); + g_signal_connect (note->w_lock, "clicked", + G_CALLBACK (stickynote_toggle_lock_cb), + note); + + g_signal_connect (note->w_close, "clicked", + G_CALLBACK (stickynote_close_cb), + note); + + g_signal_connect (note->w_resize_se, "button-press-event", + G_CALLBACK (stickynote_resize_cb), + note); + + g_signal_connect (note->w_resize_sw, "button-press-event", + G_CALLBACK (stickynote_resize_cb), + note); + + g_signal_connect (note->w_window, "button-press-event", + G_CALLBACK (stickynote_move_cb), + note); + + g_signal_connect (note->w_window, "configure-event", + G_CALLBACK (stickynote_configure_cb), + note); + + g_signal_connect (note->w_window, "delete-event", + G_CALLBACK (stickynote_delete_cb), + note); + + g_signal_connect (gtk_builder_get_object (builder, "popup_create"), "activate", + G_CALLBACK (popup_create_cb), + note); + + g_signal_connect (gtk_builder_get_object (builder, "popup_destroy"), "activate", + G_CALLBACK (popup_destroy_cb), + note); + + g_signal_connect (gtk_builder_get_object (builder, "popup_toggle_lock"), "toggled", + G_CALLBACK (popup_toggle_lock_cb), + note); + + g_signal_connect (gtk_builder_get_object (builder, "popup_properties"), "activate", + G_CALLBACK (popup_properties_cb), + note); + + g_signal_connect_swapped (note->w_entry, "changed", + G_CALLBACK (properties_apply_title_cb), + note); + + g_signal_connect (note->w_color, "color-set", + G_CALLBACK (properties_color_cb), + note); + + g_signal_connect (note->w_font_color, "color-set", + G_CALLBACK (properties_color_cb), + note); + + g_signal_connect_swapped (note->w_def_color, "toggled", + G_CALLBACK (properties_apply_color_cb), + note); + + g_signal_connect (note->w_font, "font-set", + G_CALLBACK (properties_font_cb), + note); + + g_signal_connect_swapped (note->w_def_font, "toggled", + G_CALLBACK (properties_apply_font_cb), + note); + + g_signal_connect (note->w_entry, "activate", + G_CALLBACK (properties_activate_cb), + note); + + g_signal_connect (note->w_properties, "delete-event", + G_CALLBACK (gtk_widget_hide), + note); g_object_unref (builder); g_signal_connect_after (note->w_body, "button-press-event", - G_CALLBACK (gtk_true), note); + G_CALLBACK (gtk_true), + note); - g_signal_connect (gtk_text_view_get_buffer (GTK_TEXT_VIEW (note->w_body)), - "changed", G_CALLBACK (buffer_changed), note); + g_signal_connect (gtk_text_view_get_buffer (GTK_TEXT_VIEW (note->w_body)), "changed", + G_CALLBACK (buffer_changed), + note); return note; } diff --git a/stickynotes/stickynotes_applet_callbacks.c b/stickynotes/stickynotes_applet_callbacks.c index 4e006bd2..7b454f5b 100644 --- a/stickynotes/stickynotes_applet_callbacks.c +++ b/stickynotes/stickynotes_applet_callbacks.c @@ -383,8 +383,7 @@ menu_help_cb (GtkAction *action, _("There was an error displaying help: %s"), error->message); - g_signal_connect (dialog, - "response", + g_signal_connect (dialog, "response", G_CALLBACK (gtk_widget_destroy), NULL); @@ -612,12 +611,10 @@ preferences_response_cb (GtkWidget *dialog, _("There was an error displaying help: %s"), error->message); - g_signal_connect (G_OBJECT (dialog), - "response", + g_signal_connect (dialog, "response", G_CALLBACK (gtk_widget_destroy), NULL); - gtk_window_set_resizable (GTK_WINDOW (dialog), - FALSE); + gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE); gtk_window_set_screen (GTK_WINDOW (dialog), gtk_widget_get_screen (GTK_WIDGET (dialog))); gtk_widget_show (dialog); |