summaryrefslogtreecommitdiff
path: root/libcaja-private
diff options
context:
space:
mode:
authorPablo Barciela <[email protected]>2019-06-28 02:31:23 +0200
committerraveit65 <[email protected]>2019-06-28 11:40:46 +0200
commit5905eb253db25dfd2dc06ef5a1a1d152b0e20a79 (patch)
treeb8cb5fc3a3dc7b1f2598d3afc3105c1c91214ddc /libcaja-private
parent78e178d2c08d80c57b5f63ac5aeb3622eff6300a (diff)
downloadcaja-5905eb253db25dfd2dc06ef5a1a1d152b0e20a79.tar.bz2
caja-5905eb253db25dfd2dc06ef5a1a1d152b0e20a79.tar.xz
Fix cppcheck warnings
appeared since the silence of deprecated gtkaction warnings
Diffstat (limited to 'libcaja-private')
-rw-r--r--libcaja-private/caja-clipboard.c20
-rw-r--r--libcaja-private/caja-ui-utilities.c24
2 files changed, 22 insertions, 22 deletions
diff --git a/libcaja-private/caja-clipboard.c b/libcaja-private/caja-clipboard.c
index 76c929e2..874909b4 100644
--- a/libcaja-private/caja-clipboard.c
+++ b/libcaja-private/caja-clipboard.c
@@ -147,7 +147,7 @@ received_clipboard_contents (GtkClipboard *clipboard,
action_group = data;
- G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
action = gtk_action_group_get_action (action_group,
"Paste");
if (action != NULL)
@@ -155,7 +155,7 @@ received_clipboard_contents (GtkClipboard *clipboard,
gtk_action_set_sensitive (action,
gtk_selection_data_targets_include_text (selection_data));
}
- G_GNUC_END_IGNORE_DEPRECATIONS
+ G_GNUC_END_IGNORE_DEPRECATIONS;
g_object_unref (action_group);
}
@@ -176,11 +176,11 @@ set_paste_sensitive_if_clipboard_contains_data (GtkActionGroup *action_group)
GtkAction *action;
/* If selection notification isn't supported, always activate Paste */
- G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
action = gtk_action_group_get_action (action_group,
"Paste");
gtk_action_set_sensitive (action, TRUE);
- G_GNUC_END_IGNORE_DEPRECATIONS
+ G_GNUC_END_IGNORE_DEPRECATIONS;
}
}
@@ -189,14 +189,14 @@ set_clipboard_menu_items_sensitive (GtkActionGroup *action_group)
{
GtkAction *action;
- G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
action = gtk_action_group_get_action (action_group,
"Cut");
gtk_action_set_sensitive (action, TRUE);
action = gtk_action_group_get_action (action_group,
"Copy");
gtk_action_set_sensitive (action, TRUE);
- G_GNUC_END_IGNORE_DEPRECATIONS
+ G_GNUC_END_IGNORE_DEPRECATIONS;
}
static void
@@ -204,14 +204,14 @@ set_clipboard_menu_items_insensitive (GtkActionGroup *action_group)
{
GtkAction *action;
- G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
action = gtk_action_group_get_action (action_group,
"Cut");
gtk_action_set_sensitive (action, FALSE);
action = gtk_action_group_get_action (action_group,
"Copy");
gtk_action_set_sensitive (action, FALSE);
- G_GNUC_END_IGNORE_DEPRECATIONS
+ G_GNUC_END_IGNORE_DEPRECATIONS;
}
static gboolean
@@ -493,13 +493,13 @@ initialize_clipboard_component_with_callback_data (GtkEditable *target,
GtkActionGroup *action_group;
TargetCallbackData *target_data;
- G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
action_group = gtk_action_group_new ("ClipboardActions");
gtk_action_group_set_translation_domain (action_group, GETTEXT_PACKAGE);
gtk_action_group_add_actions (action_group,
clipboard_entries, G_N_ELEMENTS (clipboard_entries),
target);
- G_GNUC_END_IGNORE_DEPRECATIONS
+ G_GNUC_END_IGNORE_DEPRECATIONS;
/* Do the actual connection of the UI to the container at
* focus time, and disconnect at both focus and destroy
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",