summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/file-manager/fm-icon-view.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/src/file-manager/fm-icon-view.c b/src/file-manager/fm-icon-view.c
index 32210955..8f724e2e 100644
--- a/src/file-manager/fm-icon-view.c
+++ b/src/file-manager/fm-icon-view.c
@@ -467,8 +467,10 @@ action_tighter_layout_callback (GtkAction *action,
{
g_assert (FM_IS_ICON_VIEW (user_data));
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
set_tighter_layout (FM_ICON_VIEW (user_data),
gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)));
+ G_GNUC_END_IGNORE_DEPRECATIONS;
}
@@ -493,7 +495,9 @@ action_sort_radio_callback (GtkAction *action,
{
CajaFileSortType sort_type;
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
sort_type = gtk_radio_action_get_current_value (current);
+ G_GNUC_END_IGNORE_DEPRECATIONS;
/* Note that id might be a toggle item.
* Ignore non-sort ids so that they don't cause sorting.
@@ -736,6 +740,7 @@ update_layout_menus (FMIconView *view)
is_auto_layout = fm_icon_view_using_auto_layout (view);
file = fm_directory_view_get_directory_as_file (FM_DIRECTORY_VIEW (view));
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
if (fm_icon_view_supports_auto_layout (view))
{
/* Mark sort criterion. */
@@ -792,6 +797,7 @@ update_layout_menus (FMIconView *view)
gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
caja_icon_container_is_keep_aligned (get_icon_container (view)));
gtk_action_set_sensitive (action, !is_auto_layout);
+ G_GNUC_END_IGNORE_DEPRECATIONS;
}
@@ -1596,12 +1602,14 @@ action_reversed_order_callback (GtkAction *action,
icon_view = FM_ICON_VIEW (user_data);
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
if (set_sort_reversed (icon_view,
gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))))
{
caja_icon_container_sort (get_icon_container (icon_view));
fm_icon_view_reveal_selection (FM_DIRECTORY_VIEW (icon_view));
}
+ G_GNUC_END_IGNORE_DEPRECATIONS;
}
static void
@@ -1614,7 +1622,9 @@ action_keep_aligned_callback (GtkAction *action,
icon_view = FM_ICON_VIEW (user_data);
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
keep_aligned = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
+ G_GNUC_END_IGNORE_DEPRECATIONS;
file = fm_directory_view_get_directory_as_file (FM_DIRECTORY_VIEW (icon_view));
fm_icon_view_set_directory_keep_aligned (icon_view,
@@ -1806,6 +1816,7 @@ fm_icon_view_merge_menus (FMDirectoryView *view)
ui_manager = fm_directory_view_get_ui_manager (FM_DIRECTORY_VIEW (icon_view));
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
action_group = gtk_action_group_new ("IconViewActions");
gtk_action_group_set_translation_domain (action_group, GETTEXT_PACKAGE);
icon_view->details->icon_action_group = action_group;
@@ -1821,6 +1832,7 @@ fm_icon_view_merge_menus (FMDirectoryView *view)
-1,
G_CALLBACK (action_sort_radio_callback),
icon_view);
+ 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 */
@@ -1834,9 +1846,11 @@ fm_icon_view_merge_menus (FMDirectoryView *view)
*/
if (!fm_icon_view_supports_auto_layout (icon_view))
{
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
action = gtk_action_group_get_action (action_group,
FM_ACTION_ARRANGE_ITEMS);
gtk_action_set_visible (action, FALSE);
+ G_GNUC_END_IGNORE_DEPRECATIONS;
}
if (fm_icon_view_supports_scaling (icon_view))
@@ -1897,6 +1911,7 @@ fm_icon_view_update_menus (FMDirectoryView *view)
selection_count = g_list_length (selection);
icon_container = get_icon_container (icon_view);
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
action = gtk_action_group_get_action (icon_view->details->icon_action_group,
FM_ACTION_STRETCH);
gtk_action_set_sensitive (action,
@@ -1927,6 +1942,7 @@ fm_icon_view_update_menus (FMDirectoryView *view)
action = gtk_action_group_get_action (icon_view->details->icon_action_group,
FM_ACTION_MANUAL_LAYOUT);
gtk_action_set_sensitive (action, editable);
+ G_GNUC_END_IGNORE_DEPRECATIONS;
}
static void