From 5905eb253db25dfd2dc06ef5a1a1d152b0e20a79 Mon Sep 17 00:00:00 2001 From: Pablo Barciela Date: Fri, 28 Jun 2019 02:31:23 +0200 Subject: Fix cppcheck warnings appeared since the silence of deprecated gtkaction warnings --- libcaja-private/caja-ui-utilities.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'libcaja-private/caja-ui-utilities.c') diff --git a/libcaja-private/caja-ui-utilities.c b/libcaja-private/caja-ui-utilities.c index 7a796478..1b621777 100644 --- a/libcaja-private/caja-ui-utilities.c +++ b/libcaja-private/caja-ui-utilities.c @@ -61,10 +61,10 @@ caja_ui_prepare_merge_ui (GtkUIManager *ui_manager, GtkActionGroup **action_group) { *merge_id = gtk_ui_manager_new_merge_id (ui_manager); - G_GNUC_BEGIN_IGNORE_DEPRECATIONS + G_GNUC_BEGIN_IGNORE_DEPRECATIONS; *action_group = gtk_action_group_new (name); gtk_action_group_set_translation_domain (*action_group, GETTEXT_PACKAGE); - G_GNUC_END_IGNORE_DEPRECATIONS + G_GNUC_END_IGNORE_DEPRECATIONS; gtk_ui_manager_insert_action_group (ui_manager, *action_group, 0); g_object_unref (*action_group); /* owned by ui manager */ } @@ -139,9 +139,9 @@ extension_action_sensitive_callback (CajaMenuItem *item, "sensitive", &value, NULL); - G_GNUC_BEGIN_IGNORE_DEPRECATIONS + G_GNUC_BEGIN_IGNORE_DEPRECATIONS; gtk_action_set_sensitive (GTK_ACTION (user_data), value); - G_GNUC_END_IGNORE_DEPRECATIONS + G_GNUC_END_IGNORE_DEPRECATIONS; } static cairo_surface_t * @@ -184,12 +184,12 @@ caja_action_from_menu_item (CajaMenuItem *item, "priority", &priority, NULL); - G_GNUC_BEGIN_IGNORE_DEPRECATIONS + G_GNUC_BEGIN_IGNORE_DEPRECATIONS; action = gtk_action_new (name, label, tip, icon_name); - G_GNUC_END_IGNORE_DEPRECATIONS + G_GNUC_END_IGNORE_DEPRECATIONS; if (icon_name != NULL) { @@ -206,9 +206,9 @@ caja_action_from_menu_item (CajaMenuItem *item, } } - G_GNUC_BEGIN_IGNORE_DEPRECATIONS + G_GNUC_BEGIN_IGNORE_DEPRECATIONS; gtk_action_set_sensitive (action, sensitive); - G_GNUC_END_IGNORE_DEPRECATIONS + G_GNUC_END_IGNORE_DEPRECATIONS; g_object_set (action, "is-important", priority, NULL); g_signal_connect_data (action, "activate", @@ -238,12 +238,12 @@ caja_toolbar_action_from_menu_item (CajaMenuItem *item, GtkWidget *parent_widget "priority", &priority, NULL); - G_GNUC_BEGIN_IGNORE_DEPRECATIONS + G_GNUC_BEGIN_IGNORE_DEPRECATIONS; action = gtk_action_new (name, label, tip, icon_name); - G_GNUC_END_IGNORE_DEPRECATIONS + G_GNUC_END_IGNORE_DEPRECATIONS; if (icon_name != NULL) { @@ -260,9 +260,9 @@ caja_toolbar_action_from_menu_item (CajaMenuItem *item, GtkWidget *parent_widget } } - G_GNUC_BEGIN_IGNORE_DEPRECATIONS + G_GNUC_BEGIN_IGNORE_DEPRECATIONS; gtk_action_set_sensitive (action, sensitive); - G_GNUC_END_IGNORE_DEPRECATIONS + G_GNUC_END_IGNORE_DEPRECATIONS; g_object_set (action, "is-important", priority, NULL); g_signal_connect_data (action, "activate", -- cgit v1.2.1