summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorraveit65 <[email protected]>2019-06-27 13:37:01 +0200
committerraveit65 <[email protected]>2019-06-29 16:24:57 +0200
commita94f50f3f2e25962ae20bd02b38266737ae2faf6 (patch)
tree8814b94b4c048706d6b322c1f23a0c3107485f5f
parent9bdf5ca497e7972ef64b08565b3992f8e3d3ff0c (diff)
downloadcaja-a94f50f3f2e25962ae20bd02b38266737ae2faf6.tar.bz2
caja-a94f50f3f2e25962ae20bd02b38266737ae2faf6.tar.xz
caja-window-toolbars: suppress GtkAction warnings
-rw-r--r--src/caja-window-toolbars.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/caja-window-toolbars.c b/src/caja-window-toolbars.c
index 7514a49a..76426319 100644
--- a/src/caja-window-toolbars.c
+++ b/src/caja-window-toolbars.c
@@ -154,6 +154,7 @@ caja_navigation_window_load_extension_toolbar_items (CajaNavigationWindow *windo
GtkActionGroup *action_group;
GtkAction *action = NULL;
CajaMenuItem *item = NULL;
+ const gchar *action_name = NULL;
ui_manager = caja_window_get_ui_manager (CAJA_WINDOW (window));
if (window->details->extensions_toolbar_merge_id != 0)
@@ -172,9 +173,11 @@ caja_navigation_window_load_extension_toolbar_items (CajaNavigationWindow *windo
merge_id = gtk_ui_manager_new_merge_id (ui_manager);
window->details->extensions_toolbar_merge_id = merge_id;
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
action_group = gtk_action_group_new ("ExtensionsToolbarGroup");
window->details->extensions_toolbar_action_group = action_group;
gtk_action_group_set_translation_domain (action_group, GETTEXT_PACKAGE);
+ G_GNUC_END_IGNORE_DEPRECATIONS;
gtk_ui_manager_insert_action_group (ui_manager, action_group, -1);
g_object_unref (action_group); /* owned by ui manager */
@@ -186,15 +189,19 @@ caja_navigation_window_load_extension_toolbar_items (CajaNavigationWindow *windo
action = caja_toolbar_action_from_menu_item (item, GTK_WIDGET (window));
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
gtk_action_group_add_action (action_group,
GTK_ACTION (action));
g_object_unref (action);
+ action_name = gtk_action_get_name (action);
+ G_GNUC_END_IGNORE_DEPRECATIONS;
+
gtk_ui_manager_add_ui (ui_manager,
merge_id,
TOOLBAR_PATH_EXTENSION_ACTIONS,
- gtk_action_get_name (action),
- gtk_action_get_name (action),
+ action_name,
+ action_name,
GTK_UI_MANAGER_TOOLITEM,
FALSE);