diff options
-rw-r--r-- | plugins/time/pluma-time-plugin.c | 7 | ||||
-rw-r--r-- | pluma/pluma-help.c | 7 | ||||
-rw-r--r-- | pluma/pluma-notebook.c | 32 | ||||
-rw-r--r-- | pluma/pluma-utils.c | 7 | ||||
-rw-r--r-- | pluma/pluma-view.c | 8 | ||||
-rw-r--r-- | pluma/pluma-window.c | 18 |
6 files changed, 31 insertions, 48 deletions
diff --git a/plugins/time/pluma-time-plugin.c b/plugins/time/pluma-time-plugin.c index 4f6e0da5..c375cbcd 100644 --- a/plugins/time/pluma-time-plugin.c +++ b/plugins/time/pluma-time-plugin.c @@ -897,10 +897,9 @@ get_choose_format_dialog (GtkWindow *parent, gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (err_dialog))), error_widget); - g_signal_connect (G_OBJECT (err_dialog), - "response", - G_CALLBACK (gtk_widget_destroy), - NULL); + g_signal_connect (err_dialog, "response", + G_CALLBACK (gtk_widget_destroy), + NULL); gtk_widget_show_all (err_dialog); diff --git a/pluma/pluma-help.c b/pluma/pluma-help.c index b013a712..8e705c0b 100644 --- a/pluma/pluma-help.c +++ b/pluma/pluma-help.c @@ -84,10 +84,9 @@ pluma_help_display (GtkWindow *parent, gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", error->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); diff --git a/pluma/pluma-notebook.c b/pluma/pluma-notebook.c index 1662690d..38dfc8aa 100644 --- a/pluma/pluma-notebook.c +++ b/pluma/pluma-notebook.c @@ -578,10 +578,9 @@ move_current_tab_to_another_notebook (PlumaNotebook *src, /* start drag handling in dest notebook */ dest->priv->motion_notify_handler_id = - g_signal_connect (G_OBJECT (dest), - "motion-notify-event", - G_CALLBACK (motion_notify_cb), - NULL); + g_signal_connect (dest, "motion-notify-event", + G_CALLBACK (motion_notify_cb), + NULL); drag_start (dest, (GdkEvent *) event); } @@ -661,10 +660,9 @@ button_press_cb (PlumaNotebook *notebook, notebook->priv->y_start = event->y_root; notebook->priv->motion_notify_handler_id = - g_signal_connect (G_OBJECT (notebook), - "motion-notify-event", - G_CALLBACK (motion_notify_cb), - NULL); + g_signal_connect (notebook, "motion-notify-event", + G_CALLBACK (motion_notify_cb), + NULL); } else if ((event->type == GDK_BUTTON_PRESS) && (event->button == 3 || event->button == 2)) @@ -826,36 +824,30 @@ pluma_notebook_init (PlumaNotebook *notebook) gtk_notebook_set_show_border (GTK_NOTEBOOK (notebook), FALSE); gtk_notebook_set_show_tabs (GTK_NOTEBOOK (notebook), FALSE); - g_signal_connect (notebook, - "button-press-event", + g_signal_connect (notebook, "button-press-event", (GCallback)button_press_cb, NULL); - g_signal_connect (notebook, - "button-release-event", + g_signal_connect (notebook, "button-release-event", (GCallback)button_release_cb, NULL); - g_signal_connect (notebook, - "grab-focus", + g_signal_connect (notebook, "grab-focus", (GCallback)grab_focus_cb, NULL); - g_signal_connect (notebook, - "focus-in-event", + g_signal_connect (notebook, "focus-in-event", (GCallback)focus_in_cb, NULL); - g_signal_connect (notebook, - "focus-out-event", + g_signal_connect (notebook, "focus-out-event", (GCallback)focus_out_cb, NULL); gtk_widget_add_events (GTK_WIDGET (notebook), GDK_BUTTON1_MOTION_MASK); - g_signal_connect_after (G_OBJECT (notebook), - "switch_page", + g_signal_connect_after (notebook, "switch_page", G_CALLBACK (pluma_notebook_switch_page_cb), NULL); } diff --git a/pluma/pluma-utils.c b/pluma/pluma-utils.c index 15205df3..0f0cf2d9 100644 --- a/pluma/pluma-utils.c +++ b/pluma/pluma-utils.c @@ -518,10 +518,9 @@ pluma_warning (GtkWindow *parent, const gchar *format, ...) gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE); - 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_widget_show (dialog); } diff --git a/pluma/pluma-view.c b/pluma/pluma-view.c index 9ef88e3b..2abf85c5 100644 --- a/pluma/pluma-view.c +++ b/pluma/pluma-view.c @@ -1523,7 +1523,7 @@ search_entry_populate_popup (GtkEntry *entry, /* create "Wrap Around" menu item. */ menu_item = gtk_check_menu_item_new_with_mnemonic (_("_Wrap Around")); - g_signal_connect (G_OBJECT (menu_item), "toggled", + g_signal_connect (menu_item, "toggled", G_CALLBACK (wrap_around_menu_item_toggled), view); gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menu_item); @@ -1533,7 +1533,7 @@ search_entry_populate_popup (GtkEntry *entry, /* create "Match Entire Word Only" menu item. */ menu_item = gtk_check_menu_item_new_with_mnemonic (_("Match _Entire Word Only")); - g_signal_connect (G_OBJECT (menu_item), "toggled", + g_signal_connect (menu_item, "toggled", G_CALLBACK (match_entire_word_menu_item_toggled), view); gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menu_item); @@ -1543,7 +1543,7 @@ search_entry_populate_popup (GtkEntry *entry, /* create "Match Case" menu item. */ menu_item = gtk_check_menu_item_new_with_mnemonic (_("_Match Case")); - g_signal_connect (G_OBJECT (menu_item), "toggled", + g_signal_connect (menu_item, "toggled", G_CALLBACK (match_case_menu_item_toggled), view); gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menu_item); @@ -1553,7 +1553,7 @@ search_entry_populate_popup (GtkEntry *entry, /* create "Parse escapes" menu item. */ menu_item = gtk_check_menu_item_new_with_mnemonic (_("_Parse escape sequences (e.g. \n)")); - g_signal_connect (G_OBJECT (menu_item), "toggled", + g_signal_connect (menu_item, "toggled", G_CALLBACK (parse_escapes_menu_item_toggled), view); gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menu_item); diff --git a/pluma/pluma-window.c b/pluma/pluma-window.c index b225a49b..b86c0b68 100644 --- a/pluma/pluma-window.c +++ b/pluma/pluma-window.c @@ -1665,12 +1665,10 @@ create_menu_bar_and_toolbar (PlumaWindow *window, (GtkCallback)set_non_homogeneus, NULL); - g_signal_connect_after (G_OBJECT (window->priv->toolbar), - "show", + g_signal_connect_after (window->priv->toolbar, "show", G_CALLBACK (toolbar_visibility_changed), window); - g_signal_connect_after (G_OBJECT (window->priv->toolbar), - "hide", + g_signal_connect_after (window->priv->toolbar, "hide", G_CALLBACK (toolbar_visibility_changed), window); } @@ -2036,8 +2034,7 @@ create_statusbar (PlumaWindow *window, fill_tab_width_combo (window); - g_signal_connect (G_OBJECT (window->priv->tab_width_combo), - "changed", + g_signal_connect (window->priv->tab_width_combo, "changed", G_CALLBACK (tab_width_combo_changed), window); @@ -2051,17 +2048,14 @@ create_statusbar (PlumaWindow *window, fill_language_combo (window); - g_signal_connect (G_OBJECT (window->priv->language_combo), - "changed", + g_signal_connect (window->priv->language_combo, "changed", G_CALLBACK (language_combo_changed), window); - g_signal_connect_after (G_OBJECT (window->priv->statusbar), - "show", + g_signal_connect_after (window->priv->statusbar, "show", G_CALLBACK (statusbar_visibility_changed), window); - g_signal_connect_after (G_OBJECT (window->priv->statusbar), - "hide", + g_signal_connect_after (window->priv->statusbar, "hide", G_CALLBACK (statusbar_visibility_changed), window); |