[Xfce4-commits] [xfce/thunar] 01/01: Used G_GNUC_BEGIN_IGNORE_DEPRECATIONS on gtk_action and dependencies.
noreply at xfce.org
noreply at xfce.org
Tue May 29 21:03:32 CEST 2018
This is an automated email from the git hooks/post-receive script.
a l e x p u s h e d a c o m m i t t o b r a n c h m a s t e r
in repository xfce/thunar.
commit c5b37dd84e25044c90f29fa638b288264272d4e9
Author: Alexander Schwinn <acs82 at gmx.de>
Date: Tue May 29 21:02:32 2018 +0200
Used G_GNUC_BEGIN_IGNORE_DEPRECATIONS on gtk_action and dependencies.
So far there is no good solution to replace them.
The official workaround for pictured menu items would add an ugly left
padding.
So we will keep the current code as long as there is no other option.
---
thunar/thunar-abstract-icon-view.c | 18 +++++++
thunar/thunar-component.c | 4 ++
thunar/thunar-details-view.c | 13 ++++-
thunar/thunar-gtk-extensions.c | 6 +++
thunar/thunar-history-action.c | 12 +++++
thunar/thunar-history.c | 26 +++++++++
thunar/thunar-launcher.c | 68 ++++++++++++++++++++++-
thunar/thunar-location-buttons.c | 22 ++++++++
thunar/thunar-menu-util.c | 6 +++
thunar/thunar-renamer-dialog.c | 20 +++++++
thunar/thunar-shortcuts-pane.c | 12 +++++
thunar/thunar-standard-view.c | 69 +++++++++++++++++++++++-
thunar/thunar-templates-action.c | 6 +++
thunar/thunar-trash-action.c | 2 +
thunar/thunar-window.c | 107 ++++++++++++++++++++++++++++++++++++-
15 files changed, 385 insertions(+), 6 deletions(-)
diff --git a/thunar/thunar-abstract-icon-view.c b/thunar/thunar-abstract-icon-view.c
index e79369e..1ba1826 100644
--- a/thunar/thunar-abstract-icon-view.c
+++ b/thunar/thunar-abstract-icon-view.c
@@ -230,6 +230,7 @@ thunar_abstract_icon_view_init (ThunarAbstractIconView *abstract_icon_view)
gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (view), THUNAR_STANDARD_VIEW (abstract_icon_view)->name_renderer,
"text", THUNAR_COLUMN_NAME);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* setup the abstract icon view actions */
gtk_action_group_add_actions (THUNAR_STANDARD_VIEW (abstract_icon_view)->action_group,
action_entries, G_N_ELEMENTS (action_entries),
@@ -240,6 +241,7 @@ thunar_abstract_icon_view_init (ThunarAbstractIconView *abstract_icon_view)
gtk_action_group_add_radio_actions (THUNAR_STANDARD_VIEW (abstract_icon_view)->action_group, order_action_entries,
G_N_ELEMENTS (order_action_entries), GTK_SORT_ASCENDING,
G_CALLBACK (thunar_abstract_icon_view_action_sort), abstract_icon_view);
+G_GNUC_END_IGNORE_DEPRECATIONS
/* we need to listen to sort column changes to sync the menu items */
g_signal_connect (G_OBJECT (THUNAR_STANDARD_VIEW (abstract_icon_view)->model), "sort-column-changed",
@@ -280,8 +282,10 @@ thunar_abstract_icon_view_connect_ui_manager (ThunarStandardView *standard_view,
ThunarAbstractIconView *abstract_icon_view = THUNAR_ABSTRACT_ICON_VIEW (standard_view);
GError *error = NULL;
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
abstract_icon_view->priv->ui_merge_id = gtk_ui_manager_add_ui_from_string (ui_manager, thunar_abstract_icon_view_ui,
thunar_abstract_icon_view_ui_length, &error);
+G_GNUC_END_IGNORE_DEPRECATIONS
if (G_UNLIKELY (abstract_icon_view->priv->ui_merge_id == 0))
{
g_error ("Failed to merge ThunarAbstractIconView menus: %s", error->message);
@@ -295,7 +299,9 @@ static void
thunar_abstract_icon_view_disconnect_ui_manager (ThunarStandardView *standard_view,
GtkUIManager *ui_manager)
{
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gtk_ui_manager_remove_ui (ui_manager, THUNAR_ABSTRACT_ICON_VIEW (standard_view)->priv->ui_merge_id);
+G_GNUC_END_IGNORE_DEPRECATIONS
}
@@ -415,6 +421,7 @@ thunar_abstract_icon_view_highlight_path (ThunarStandardView *standard_view,
static GtkAction*
thunar_abstract_icon_view_gesture_action (ThunarAbstractIconView *abstract_icon_view)
{
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
if (abstract_icon_view->priv->gesture_start_y - abstract_icon_view->priv->gesture_current_y > 40
&& ABS (abstract_icon_view->priv->gesture_start_x - abstract_icon_view->priv->gesture_current_x) < 40)
{
@@ -435,6 +442,7 @@ thunar_abstract_icon_view_gesture_action (ThunarAbstractIconView *abstract_icon_
{
return gtk_ui_manager_get_action (THUNAR_STANDARD_VIEW (abstract_icon_view)->ui_manager, "/main-menu/view-menu/reload");
}
+G_GNUC_END_IGNORE_DEPRECATIONS
return NULL;
}
@@ -449,6 +457,7 @@ thunar_abstract_icon_view_action_sort (GtkAction *action,
GtkSortType order;
gint column;
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* query the new sort column id */
action = gtk_action_group_get_action (standard_view->action_group, "sort-by-name");
column = gtk_radio_action_get_current_value (GTK_RADIO_ACTION (action));
@@ -456,6 +465,7 @@ thunar_abstract_icon_view_action_sort (GtkAction *action,
/* query the new sort order */
action = gtk_action_group_get_action (standard_view->action_group, "sort-ascending");
order = gtk_radio_action_get_current_value (GTK_RADIO_ACTION (action));
+G_GNUC_END_IGNORE_DEPRECATIONS
/* apply the new settings */
gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (standard_view->model), column, order);
@@ -546,10 +556,12 @@ thunar_abstract_icon_view_button_press_event (ExoIconView *view,
in_tab = !in_tab;
action_name = in_tab ? "open-in-new-tab" : "open-in-new-window";
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* emit the action */
action = thunar_gtk_ui_manager_get_action_by_name (THUNAR_STANDARD_VIEW (abstract_icon_view)->ui_manager, action_name);
if (G_LIKELY (action != NULL))
gtk_action_activate (action);
+G_GNUC_END_IGNORE_DEPRECATIONS
/* release the file reference */
g_object_unref (G_OBJECT (file));
@@ -597,8 +609,10 @@ thunar_abstract_icon_view_button_release_event (ExoIconView *view,
/* run the selected action (if any) */
action = thunar_abstract_icon_view_gesture_action (abstract_icon_view);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
if (G_LIKELY (action != NULL))
gtk_action_activate (action);
+G_GNUC_END_IGNORE_DEPRECATIONS
/* unregister the "expose-event" handler */
g_signal_handler_disconnect (G_OBJECT (view), abstract_icon_view->priv->gesture_expose_id);
@@ -749,10 +763,12 @@ thunar_abstract_icon_view_item_activated (ExoIconView *view,
exo_icon_view_unselect_all (view);
exo_icon_view_select_path (view, path);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* emit the "open" action */
action = thunar_gtk_ui_manager_get_action_by_name (THUNAR_STANDARD_VIEW (abstract_icon_view)->ui_manager, "open");
if (G_LIKELY (action != NULL))
gtk_action_activate (action);
+G_GNUC_END_IGNORE_DEPRECATIONS
}
@@ -767,6 +783,7 @@ thunar_abstract_icon_view_sort_column_changed (GtkTreeSortable *sortable,
if (gtk_tree_sortable_get_sort_column_id (sortable, &column, &order))
{
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* apply the new sort column */
action = gtk_action_group_get_action (THUNAR_STANDARD_VIEW (abstract_icon_view)->action_group, "sort-by-name");
gtk_radio_action_set_current_value (GTK_RADIO_ACTION (action), column);
@@ -774,6 +791,7 @@ thunar_abstract_icon_view_sort_column_changed (GtkTreeSortable *sortable,
/* apply the new sort order */
action = gtk_action_group_get_action (THUNAR_STANDARD_VIEW (abstract_icon_view)->action_group, "sort-ascending");
gtk_radio_action_set_current_value (GTK_RADIO_ACTION (action), order);
+G_GNUC_END_IGNORE_DEPRECATIONS
}
}
diff --git a/thunar/thunar-component.c b/thunar/thunar-component.c
index 0c578de..ddd4243 100644
--- a/thunar/thunar-component.c
+++ b/thunar/thunar-component.c
@@ -86,6 +86,7 @@ thunar_component_class_init (gpointer klass)
THUNARX_TYPE_FILE_INFO_LIST,
EXO_PARAM_READWRITE));
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/**
* ThunarComponent:ui-manager:
*
@@ -99,6 +100,7 @@ thunar_component_class_init (gpointer klass)
"ui-manager",
GTK_TYPE_UI_MANAGER,
EXO_PARAM_READWRITE));
+G_GNUC_END_IGNORE_DEPRECATIONS
}
@@ -198,7 +200,9 @@ thunar_component_set_ui_manager (ThunarComponent *component,
GtkUIManager *ui_manager)
{
_thunar_return_if_fail (THUNAR_IS_COMPONENT (component));
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
_thunar_return_if_fail (ui_manager == NULL || GTK_IS_UI_MANAGER (ui_manager));
+G_GNUC_END_IGNORE_DEPRECATIONS
(*THUNAR_COMPONENT_GET_IFACE (component)->set_ui_manager) (component, ui_manager);
}
diff --git a/thunar/thunar-details-view.c b/thunar/thunar-details-view.c
index dd8f182..e065bc8 100644
--- a/thunar/thunar-details-view.c
+++ b/thunar/thunar-details-view.c
@@ -204,10 +204,12 @@ thunar_details_view_init (ThunarDetailsView *details_view)
*/
g_signal_connect (G_OBJECT (details_view), "notify::zoom-level", G_CALLBACK (thunar_details_view_zoom_level_changed), NULL);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* setup the details view actions */
gtk_action_group_add_actions (THUNAR_STANDARD_VIEW (details_view)->action_group,
action_entries, G_N_ELEMENTS (action_entries),
GTK_WIDGET (details_view));
+G_GNUC_END_IGNORE_DEPRECATIONS
/* create the tree view to embed */
tree_view = exo_tree_view_new ();
@@ -404,7 +406,6 @@ thunar_details_view_get_accessible (GtkWidget *widget)
}
-
static void
thunar_details_view_connect_ui_manager (ThunarStandardView *standard_view,
GtkUIManager *ui_manager)
@@ -412,8 +413,10 @@ thunar_details_view_connect_ui_manager (ThunarStandardView *standard_view,
ThunarDetailsView *details_view = THUNAR_DETAILS_VIEW (standard_view);
GError *error = NULL;
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
details_view->ui_merge_id = gtk_ui_manager_add_ui_from_string (ui_manager, thunar_details_view_ui,
thunar_details_view_ui_length, &error);
+G_GNUC_END_IGNORE_DEPRECATIONS
if (G_UNLIKELY (details_view->ui_merge_id == 0))
{
g_error ("Failed to merge ThunarDetailsView menus: %s", error->message);
@@ -427,7 +430,9 @@ static void
thunar_details_view_disconnect_ui_manager (ThunarStandardView *standard_view,
GtkUIManager *ui_manager)
{
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gtk_ui_manager_remove_ui (ui_manager, THUNAR_DETAILS_VIEW (standard_view)->ui_merge_id);
+G_GNUC_END_IGNORE_DEPRECATIONS
}
@@ -782,9 +787,11 @@ thunar_details_view_button_press_event (GtkTreeView *tree_view,
action = thunar_gtk_ui_manager_get_action_by_name (THUNAR_STANDARD_VIEW (details_view)->ui_manager, action_name);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* emit the action */
if (G_LIKELY (action != NULL))
gtk_action_activate (action);
+G_GNUC_END_IGNORE_DEPRECATIONS
/* release the file reference */
g_object_unref (G_OBJECT (file));
@@ -835,10 +842,12 @@ thunar_details_view_row_activated (GtkTreeView *tree_view,
gtk_tree_selection_unselect_all (selection);
gtk_tree_selection_select_path (selection, path);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* emit the "open" action */
action = thunar_gtk_ui_manager_get_action_by_name (THUNAR_STANDARD_VIEW (details_view)->ui_manager, "open");
if (G_LIKELY (action != NULL))
gtk_action_activate (action);
+G_GNUC_END_IGNORE_DEPRECATIONS
}
@@ -910,7 +919,9 @@ thunar_details_view_action_setup_columns (GtkAction *action,
ThunarDetailsView *details_view)
{
_thunar_return_if_fail (THUNAR_IS_DETAILS_VIEW (details_view));
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
_thunar_return_if_fail (GTK_IS_ACTION (action));
+G_GNUC_END_IGNORE_DEPRECATIONS
/* popup the column editor dialog */
thunar_show_column_editor (details_view);
diff --git a/thunar/thunar-gtk-extensions.c b/thunar/thunar-gtk-extensions.c
index 3c8cf6d..4852c11 100644
--- a/thunar/thunar-gtk-extensions.c
+++ b/thunar/thunar-gtk-extensions.c
@@ -46,6 +46,7 @@ thunar_gtk_action_set_tooltip (GtkAction *action,
const gchar *format,
...)
{
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
va_list var_args;
gchar *tooltip;
@@ -62,6 +63,7 @@ thunar_gtk_action_set_tooltip (GtkAction *action,
/* release the tooltip */
g_free (tooltip);
+G_GNUC_END_IGNORE_DEPRECATIONS
}
@@ -80,6 +82,7 @@ thunar_gtk_action_group_set_action_sensitive (GtkActionGroup *action_group,
const gchar *action_name,
gboolean sensitive)
{
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
GtkAction *action;
_thunar_return_if_fail (GTK_IS_ACTION_GROUP (action_group));
@@ -90,6 +93,7 @@ thunar_gtk_action_group_set_action_sensitive (GtkActionGroup *action_group,
/* apply the sensitivity to the action */
gtk_action_set_sensitive (action, sensitive);
+G_GNUC_END_IGNORE_DEPRECATIONS
}
@@ -174,6 +178,7 @@ thunar_gtk_ui_manager_get_action_by_name (GtkUIManager *ui_manager,
GtkAction *action;
GList *lp;
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
_thunar_return_val_if_fail (GTK_IS_UI_MANAGER (ui_manager), NULL);
_thunar_return_val_if_fail (action_name != NULL, NULL);
@@ -184,6 +189,7 @@ thunar_gtk_ui_manager_get_action_by_name (GtkUIManager *ui_manager,
if (G_LIKELY (action != NULL))
return action;
}
+G_GNUC_END_IGNORE_DEPRECATIONS
return NULL;
}
diff --git a/thunar/thunar-history-action.c b/thunar/thunar-history-action.c
index 65fe434..30e451c 100644
--- a/thunar/thunar-history-action.c
+++ b/thunar/thunar-history-action.c
@@ -47,7 +47,9 @@ struct _ThunarHistoryAction
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
G_DEFINE_TYPE (ThunarHistoryAction, thunar_history_action, GTK_TYPE_ACTION)
+G_GNUC_END_IGNORE_DEPRECATIONS
@@ -56,7 +58,9 @@ thunar_history_action_class_init (ThunarHistoryActionClass *klass)
{
GtkActionClass *gtkaction_class;
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gtkaction_class = GTK_ACTION_CLASS (klass);
+G_GNUC_END_IGNORE_DEPRECATIONS
gtkaction_class->create_tool_item = thunar_history_action_create_tool_item;
/**
@@ -148,8 +152,10 @@ thunar_history_action_button_release_event (GtkWidget *toggle_button,
g_source_remove (history_action->popup_delay);
history_action->popup_delay = 0;
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* activate event */
gtk_action_activate (GTK_ACTION (history_action));
+G_GNUC_END_IGNORE_DEPRECATIONS
}
}
else
@@ -205,8 +211,10 @@ thunar_history_action_activate (GtkWidget *toggle_button,
_thunar_return_if_fail (GTK_IS_TOGGLE_BUTTON (toggle_button));
_thunar_return_if_fail (THUNAR_IS_HISTORY_ACTION (history_action));
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* activate event (only key events trigger this function) */
gtk_action_activate (GTK_ACTION (history_action));
+G_GNUC_END_IGNORE_DEPRECATIONS
/* activate, so the code deactivates a bit later... */
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle_button), TRUE);
@@ -226,9 +234,11 @@ thunar_history_action_toolbar_configured (GtkWidget *tool_item,
icon = gtk_bin_get_child (GTK_BIN (toggle_button));
action = g_object_get_data (G_OBJECT (toggle_button), I_("thunar-history-action"));
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gtk_image_set_from_icon_name (GTK_IMAGE (icon),
gtk_action_get_icon_name (action),
gtk_tool_item_get_icon_size (GTK_TOOL_ITEM (tool_item)));
+G_GNUC_END_IGNORE_DEPRECATIONS
}
@@ -253,8 +263,10 @@ thunar_history_action_create_tool_item (GtkAction *action)
gtk_button_set_focus_on_click (GTK_BUTTON (button), FALSE);
gtk_widget_show (button);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
icon = gtk_image_new_from_icon_name (gtk_action_get_icon_name (action),
gtk_tool_item_get_icon_size (GTK_TOOL_ITEM (tool_item)));
+G_GNUC_END_IGNORE_DEPRECATIONS
gtk_container_add (GTK_CONTAINER (button), icon);
gtk_widget_show (icon);
diff --git a/thunar/thunar-history.c b/thunar/thunar-history.c
index f9effc7..5991048 100644
--- a/thunar/thunar-history.c
+++ b/thunar/thunar-history.c
@@ -121,6 +121,7 @@ thunar_history_class_init (ThunarHistoryClass *klass)
thunar_history_display_name_quark = g_quark_from_static_string ("thunar-history-display-name");
thunar_history_gfile_quark = g_quark_from_static_string ("thunar-history-gfile");
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/**
* ThunarHistory::action-group:
*
@@ -134,6 +135,7 @@ thunar_history_class_init (ThunarHistoryClass *klass)
"action-group",
GTK_TYPE_ACTION_GROUP,
EXO_PARAM_READWRITE));
+G_GNUC_END_IGNORE_DEPRECATIONS
/**
* ThunarHistory::current-directory:
@@ -163,13 +165,17 @@ thunar_history_init (ThunarHistory *history)
history->action_back = thunar_history_action_new ("back", _("Back"), _("Go to the previous visited folder"), "go-previous-symbolic");
g_signal_connect (G_OBJECT (history->action_back), "activate", G_CALLBACK (thunar_history_action_back), history);
g_signal_connect (G_OBJECT (history->action_back), "show-menu", G_CALLBACK (thunar_history_show_menu), history);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gtk_action_set_sensitive (history->action_back, FALSE);
+G_GNUC_END_IGNORE_DEPRECATIONS
/* create the "forward" action */
history->action_forward = thunar_history_action_new ("forward", _("Forward"), _("Go to the next visited folder"), "go-next-symbolic");
g_signal_connect (G_OBJECT (history->action_forward), "activate", G_CALLBACK (thunar_history_action_forward), history);
g_signal_connect (G_OBJECT (history->action_forward), "show-menu", G_CALLBACK (thunar_history_show_menu), history);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gtk_action_set_sensitive (history->action_forward, FALSE);
+G_GNUC_END_IGNORE_DEPRECATIONS
}
@@ -314,7 +320,9 @@ thunar_history_set_current_directory (ThunarNavigator *navigator,
else
{
/* clear the "forward" list */
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gtk_action_set_sensitive (history->action_forward, FALSE);
+G_GNUC_END_IGNORE_DEPRECATIONS
g_slist_free_full (history->forward_list, g_object_unref);
history->forward_list = NULL;
@@ -323,7 +331,9 @@ thunar_history_set_current_directory (ThunarNavigator *navigator,
{
gfile = thunar_history_get_gfile (history->current_directory);
history->back_list = g_slist_prepend (history->back_list, gfile);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gtk_action_set_sensitive (history->action_back, TRUE);
+G_GNUC_END_IGNORE_DEPRECATIONS
g_object_unref (history->current_directory);
}
@@ -445,9 +455,11 @@ thunar_history_go_back (ThunarHistory *history,
update_actions:
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* update the sensitivity of the actions */
gtk_action_set_sensitive (history->action_back, (history->back_list != NULL));
gtk_action_set_sensitive (history->action_forward, (history->forward_list != NULL));
+G_GNUC_END_IGNORE_DEPRECATIONS
}
@@ -524,9 +536,11 @@ thunar_history_go_forward (ThunarHistory *history,
update_actions:
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* update the sensitivity of the actions */
gtk_action_set_sensitive (history->action_back, (history->back_list != NULL));
gtk_action_set_sensitive (history->action_forward, (history->forward_list != NULL));
+G_GNUC_END_IGNORE_DEPRECATIONS
}
@@ -535,7 +549,9 @@ static void
thunar_history_action_back (GtkAction *action,
ThunarHistory *history)
{
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
_thunar_return_if_fail (GTK_IS_ACTION (action));
+G_GNUC_END_IGNORE_DEPRECATIONS
_thunar_return_if_fail (THUNAR_IS_HISTORY (history));
/* go back one step */
@@ -565,7 +581,9 @@ static void
thunar_history_action_forward (GtkAction *action,
ThunarHistory *history)
{
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
_thunar_return_if_fail (GTK_IS_ACTION (action));
+G_GNUC_END_IGNORE_DEPRECATIONS
_thunar_return_if_fail (THUNAR_IS_HISTORY (history));
/* go forward one step */
@@ -608,7 +626,9 @@ thunar_history_show_menu (GtkAction *action,
const gchar *icon_name;
gchar *parse_name;
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
_thunar_return_if_fail (GTK_IS_ACTION (action));
+G_GNUC_END_IGNORE_DEPRECATIONS
_thunar_return_if_fail (GTK_IS_MENU_SHELL (menu));
_thunar_return_if_fail (THUNAR_IS_HISTORY (history));
@@ -718,6 +738,7 @@ static void
thunar_history_set_action_group (ThunarHistory *history,
GtkActionGroup *action_group)
{
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
_thunar_return_if_fail (THUNAR_IS_HISTORY (history));
_thunar_return_if_fail (action_group == NULL || GTK_IS_ACTION_GROUP (action_group));
@@ -746,6 +767,7 @@ thunar_history_set_action_group (ThunarHistory *history,
/* notify listeners */
g_object_notify (G_OBJECT (history), "action-group");
+G_GNUC_END_IGNORE_DEPRECATIONS
}
@@ -758,7 +780,9 @@ thunar_history_copy (ThunarHistory *history,
GSList *lp;
_thunar_return_val_if_fail (history == NULL || THUNAR_IS_HISTORY (history), NULL);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
_thunar_return_val_if_fail (action_group == NULL || GTK_IS_ACTION_GROUP (action_group), NULL);
+G_GNUC_END_IGNORE_DEPRECATIONS
if (G_UNLIKELY (history == NULL))
return NULL;
@@ -779,9 +803,11 @@ thunar_history_copy (ThunarHistory *history,
for (lp = history->forward_list; lp != NULL; lp = lp->next)
copy->forward_list = g_slist_append (copy->forward_list, g_object_ref (G_OBJECT (lp->data)));
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* update the sensitivity of the actions */
gtk_action_set_sensitive (copy->action_back, (copy->back_list != NULL));
gtk_action_set_sensitive (copy->action_forward, (copy->forward_list != NULL));
+G_GNUC_END_IGNORE_DEPRECATIONS
return copy;
}
diff --git a/thunar/thunar-launcher.c b/thunar/thunar-launcher.c
index 34928e0..f6d434e 100644
--- a/thunar/thunar-launcher.c
+++ b/thunar/thunar-launcher.c
@@ -270,6 +270,7 @@ thunar_launcher_navigator_init (ThunarNavigatorIface *iface)
static void
thunar_launcher_init (ThunarLauncher *launcher)
{
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* setup the action group for the launcher actions */
launcher->action_group = gtk_action_group_new ("ThunarLauncher");
gtk_action_group_set_translation_domain (launcher->action_group, GETTEXT_PACKAGE);
@@ -281,6 +282,7 @@ thunar_launcher_init (ThunarLauncher *launcher)
launcher->action_open_in_new_window = gtk_action_group_get_action (launcher->action_group, "open-in-new-window");
launcher->action_open_in_new_tab = gtk_action_group_get_action (launcher->action_group, "open-in-new-tab");
launcher->action_open_with_other_in_menu = gtk_action_group_get_action (launcher->action_group, "open-with-other-in-menu");
+G_GNUC_END_IGNORE_DEPRECATIONS
/* initialize and add our custom icon factory for the application/action icons */
launcher->icon_factory = gtk_icon_factory_new ();
@@ -501,6 +503,7 @@ thunar_launcher_set_ui_manager (ThunarComponent *component,
/* disconnect from the previous UI manager */
if (G_UNLIKELY (launcher->ui_manager != NULL))
{
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* drop our action group from the previous UI manager */
gtk_ui_manager_remove_action_group (launcher->ui_manager, launcher->action_group);
@@ -513,6 +516,7 @@ thunar_launcher_set_ui_manager (ThunarComponent *component,
/* unmerge our ui controls from the previous UI manager */
gtk_ui_manager_remove_ui (launcher->ui_manager, launcher->ui_merge_id);
+G_GNUC_END_IGNORE_DEPRECATIONS
/* drop the reference on the previous UI manager */
g_object_unref (G_OBJECT (launcher->ui_manager));
@@ -527,11 +531,13 @@ thunar_launcher_set_ui_manager (ThunarComponent *component,
/* we keep a reference on the new manager */
g_object_ref (G_OBJECT (ui_manager));
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* add our action group to the new manager */
gtk_ui_manager_insert_action_group (ui_manager, launcher->action_group, -1);
/* merge our UI control items with the new manager */
launcher->ui_merge_id = gtk_ui_manager_add_ui_from_string (ui_manager, thunar_launcher_ui, thunar_launcher_ui_length, &error);
+G_GNUC_END_IGNORE_DEPRECATIONS
if (G_UNLIKELY (launcher->ui_merge_id == 0))
{
g_error ("Failed to merge ThunarLauncher menus: %s", error->message);
@@ -782,8 +788,10 @@ thunar_launcher_update_idle (gpointer data)
/* drop the previous addons ui controls from the UI manager */
if (G_LIKELY (launcher->ui_addons_merge_id != 0))
{
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gtk_ui_manager_remove_ui (launcher->ui_manager, launcher->ui_addons_merge_id);
gtk_ui_manager_ensure_update (launcher->ui_manager);
+G_GNUC_END_IGNORE_DEPRECATIONS
launcher->ui_addons_merge_id = 0;
}
@@ -815,9 +823,11 @@ thunar_launcher_update_idle (gpointer data)
** - "Open", "Open in n New Windows" and "Open in n New Tabs" actions
**/
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* Prepare "Open" label and icon */
gtk_action_set_label (launcher->action_open, _("_Open"));
gtk_action_set_icon_name (launcher->action_open, "document-open");
+G_GNUC_END_IGNORE_DEPRECATIONS
if (n_selected_files == n_directories && n_directories >= 1)
{
@@ -861,10 +871,12 @@ thunar_launcher_update_idle (gpointer data)
"tooltip", _("Open the selected directory in a new tab"),
NULL);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* set tooltip that makes sence */
gtk_action_set_tooltip (launcher->action_open, _("Open the selected directory"));
+G_GNUC_END_IGNORE_DEPRECATIONS
}
-
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* Show Window/Tab action if there are only directories selected */
gtk_action_set_visible (launcher->action_open_in_new_window, n_directories > 0);
gtk_action_set_visible (launcher->action_open_in_new_tab, n_directories > 0);
@@ -872,9 +884,11 @@ thunar_launcher_update_idle (gpointer data)
/* Show open if there is exactly 1 directory selected */
gtk_action_set_visible (launcher->action_open, n_directories == 1);
gtk_action_set_sensitive (launcher->action_open, TRUE);
+G_GNUC_END_IGNORE_DEPRECATIONS
}
else
{
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* Hide New Window and Tab action */
gtk_action_set_visible (launcher->action_open_in_new_window, FALSE);
gtk_action_set_visible (launcher->action_open_in_new_tab, FALSE);
@@ -886,11 +900,14 @@ thunar_launcher_update_idle (gpointer data)
ngettext ("Open the selected file",
"Open the selected files",
n_selected_files));
+G_GNUC_END_IGNORE_DEPRECATIONS
}
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* hide the "Open With Other Application" actions */
gtk_action_set_visible (launcher->action_open_with_other, FALSE);
gtk_action_set_visible (launcher->action_open_with_other_in_menu, FALSE);
+G_GNUC_END_IGNORE_DEPRECATIONS
}
else
{
@@ -900,6 +917,7 @@ thunar_launcher_update_idle (gpointer data)
** - No "Open in n New Windows" action
**/
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* drop all previous addon actions from the action group */
actions = gtk_action_group_list_actions (launcher->action_group);
for (lp = actions; lp != NULL; lp = lp->next)
@@ -916,6 +934,7 @@ thunar_launcher_update_idle (gpointer data)
/* hide the "Open in n New Windows/Tabs" action */
gtk_action_set_visible (launcher->action_open_in_new_window, FALSE);
gtk_action_set_visible (launcher->action_open_in_new_tab, FALSE);
+G_GNUC_END_IGNORE_DEPRECATIONS
/* determine the set of applications that work for all selected files */
applications = thunar_file_list_get_applications (launcher->selected_files);
@@ -947,9 +966,11 @@ thunar_launcher_update_idle (gpointer data)
g_free (tooltip);
g_free (label);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* load default application icon */
gtk_action_set_stock_id (launcher->action_open, NULL);
gtk_action_set_gicon (launcher->action_open, g_app_info_get_icon (applications->data));
+G_GNUC_END_IGNORE_DEPRECATIONS
/* remember the default application for the "Open" action */
g_object_set_qdata_full (G_OBJECT (launcher->action_open), thunar_launcher_handler_quark, applications->data, g_object_unref);
@@ -988,9 +1009,11 @@ thunar_launcher_update_idle (gpointer data)
file_menu_path = "/main-menu/file-menu/placeholder-launcher/open-with-menu/placeholder-applications";
context_menu_path = "/file-context-menu/placeholder-launcher/open-with-menu/placeholder-applications";
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* show the "Open With Other Application" in the submenu and hide the toplevel one */
gtk_action_set_visible (launcher->action_open_with_other, FALSE);
gtk_action_set_visible (launcher->action_open_with_other_in_menu, (n_selected_files == 1));
+G_GNUC_END_IGNORE_DEPRECATIONS
}
else
{
@@ -1001,6 +1024,7 @@ thunar_launcher_update_idle (gpointer data)
/* add a separator if we have more than one additional application */
if (G_LIKELY (applications != NULL))
{
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* add separator after the DEFAULT/execute action */
gtk_ui_manager_add_ui (launcher->ui_manager, launcher->ui_addons_merge_id,
file_menu_path, "separator", NULL,
@@ -1008,11 +1032,14 @@ thunar_launcher_update_idle (gpointer data)
gtk_ui_manager_add_ui (launcher->ui_manager, launcher->ui_addons_merge_id,
context_menu_path, "separator", NULL,
GTK_UI_MANAGER_SEPARATOR, FALSE);
+G_GNUC_END_IGNORE_DEPRECATIONS
}
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* show the toplevel "Open With Other Application" (if not already done by the "Open" action) */
gtk_action_set_visible (launcher->action_open_with_other, !default_is_open_with_other && (n_selected_files == 1));
gtk_action_set_visible (launcher->action_open_with_other_in_menu, FALSE);
+G_GNUC_END_IGNORE_DEPRECATIONS
}
/* add actions for all remaining applications */
@@ -1031,6 +1058,7 @@ thunar_launcher_update_idle (gpointer data)
"Use \"%s\" to open the selected files",
n_selected_files), g_app_info_get_name (lp->data));
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* allocate a new action for the application */
action = gtk_action_new (name, label, tooltip, NULL);
gtk_action_set_gicon (action, g_app_info_get_icon (lp->data));
@@ -1044,6 +1072,7 @@ thunar_launcher_update_idle (gpointer data)
context_menu_path, name, name,
GTK_UI_MANAGER_MENUITEM, FALSE);
g_object_unref (G_OBJECT (action));
+G_GNUC_END_IGNORE_DEPRECATIONS
/* cleanup */
g_free (tooltip);
@@ -1097,8 +1126,10 @@ thunar_launcher_update_check (ThunarLauncher *launcher,
/* force an update */
thunar_launcher_update_idle (launcher);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* ui update */
gtk_ui_manager_ensure_update (launcher->ui_manager);
+G_GNUC_END_IGNORE_DEPRECATIONS
/* make sure the menu is positioned correctly after the
* interface update */
@@ -1118,7 +1149,9 @@ thunar_launcher_update (ThunarLauncher *launcher)
_thunar_return_if_fail (THUNAR_IS_LAUNCHER (launcher));
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
proxies = gtk_action_get_proxies (launcher->action_open);
+G_GNUC_END_IGNORE_DEPRECATIONS
instant_update = (proxies == NULL);
for (lp = proxies; lp != NULL; lp = lp->next)
{
@@ -1146,13 +1179,14 @@ thunar_launcher_update (ThunarLauncher *launcher)
}
else
{
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* assume all actions are working */
gtk_action_set_sensitive (launcher->action_open, TRUE);
gtk_action_set_visible (launcher->action_open_with_other, TRUE);
gtk_action_set_visible (launcher->action_open_in_new_window, TRUE);
gtk_action_set_visible (launcher->action_open_in_new_tab, TRUE);
gtk_action_set_visible (launcher->action_open_with_other_in_menu, TRUE);
-
+G_GNUC_END_IGNORE_DEPRECATIONS
/* delayed update */
launcher->launcher_idle_id = g_timeout_add_seconds_full (G_PRIORITY_LOW, 5, thunar_launcher_update_idle,
launcher, thunar_launcher_update_idle_destroy);
@@ -1347,13 +1381,17 @@ thunar_launcher_action_open (GtkAction *action,
GAppInfo *app_info;
GList *selected_paths;
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
_thunar_return_if_fail (GTK_IS_ACTION (action));
+G_GNUC_END_IGNORE_DEPRECATIONS
_thunar_return_if_fail (THUNAR_IS_LAUNCHER (launcher));
/* force update if still dirty */
thunar_launcher_update_check (launcher, NULL);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
if (!gtk_action_get_sensitive (action))
return;
+G_GNUC_END_IGNORE_DEPRECATIONS
/* check if we have a mime handler associated with the action */
app_info = g_object_get_qdata (G_OBJECT (action), thunar_launcher_handler_quark);
@@ -1389,13 +1427,17 @@ static void
thunar_launcher_action_open_with_other (GtkAction *action,
ThunarLauncher *launcher)
{
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
_thunar_return_if_fail (GTK_IS_ACTION (action));
+G_GNUC_END_IGNORE_DEPRECATIONS
_thunar_return_if_fail (THUNAR_IS_LAUNCHER (launcher));
/* force update if still dirty */
thunar_launcher_update_check (launcher, NULL);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
if (!gtk_action_get_visible (action))
return;
+G_GNUC_END_IGNORE_DEPRECATIONS
/* verify that we have atleast one selected file */
if (G_LIKELY (launcher->selected_files != NULL))
@@ -1413,13 +1455,17 @@ thunar_launcher_action_open_in_new_window (GtkAction *action,
{
ThunarLauncherPokeData *poke_data;
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
_thunar_return_if_fail (GTK_IS_ACTION (action));
+G_GNUC_END_IGNORE_DEPRECATIONS
_thunar_return_if_fail (THUNAR_IS_LAUNCHER (launcher));
/* force update if still dirty */
thunar_launcher_update_check (launcher, NULL);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
if (!gtk_action_get_visible (action))
return;
+G_GNUC_END_IGNORE_DEPRECATIONS
/* open the selected directories in new windows */
poke_data = thunar_launcher_poke_data_new (launcher->selected_files);
@@ -1434,13 +1480,17 @@ thunar_launcher_action_open_in_new_tab (GtkAction *action,
{
ThunarLauncherPokeData *poke_data;
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
_thunar_return_if_fail (GTK_IS_ACTION (action));
+G_GNUC_END_IGNORE_DEPRECATIONS
_thunar_return_if_fail (THUNAR_IS_LAUNCHER (launcher));
/* force update if still dirty */
thunar_launcher_update_check (launcher, NULL);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
if (!gtk_action_get_visible (action))
return;
+G_GNUC_END_IGNORE_DEPRECATIONS
/* open all selected directories in a new tab */
poke_data = thunar_launcher_poke_data_new (launcher->selected_files);
@@ -1458,7 +1508,9 @@ thunar_launcher_action_sendto_desktop (GtkAction *action,
GFile *desktop_file;
GList *files;
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
_thunar_return_if_fail (GTK_IS_ACTION (action));
+G_GNUC_END_IGNORE_DEPRECATIONS
_thunar_return_if_fail (THUNAR_IS_LAUNCHER (launcher));
/* determine the source files */
@@ -1605,7 +1657,9 @@ thunar_launcher_action_sendto_device (GtkAction *action,
ThunarDevice *device;
GList *files;
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
_thunar_return_if_fail (GTK_IS_ACTION (action));
+G_GNUC_END_IGNORE_DEPRECATIONS
_thunar_return_if_fail (THUNAR_IS_LAUNCHER (launcher));
/* determine the source paths */
@@ -1697,8 +1751,10 @@ thunar_launcher_sendto_idle (gpointer user_data)
linkable = !thunar_file_is_trashed (lp->data);
}
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* update the "Desktop (Create Link)" sendto action */
action = gtk_action_group_get_action (launcher->action_group, "sendto-desktop");
+G_GNUC_END_IGNORE_DEPRECATIONS
g_object_set (G_OBJECT (action),
"label", ngettext ("Desktop (Create Link)", "Desktop (Create Links)", n_selected_files),
"tooltip", ngettext ("Create a link to the selected file on the desktop",
@@ -1710,6 +1766,7 @@ thunar_launcher_sendto_idle (gpointer user_data)
/* re-add the content to "Send To" if we have any files */
if (G_LIKELY (n_selected_files > 0))
{
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* drop all previous sendto actions from the action group */
handlers = gtk_action_group_list_actions (launcher->action_group);
for (lp = handlers; lp != NULL; lp = lp->next)
@@ -1720,6 +1777,7 @@ thunar_launcher_sendto_idle (gpointer user_data)
/* allocate a new merge id from the UI manager (if not already done) */
if (G_UNLIKELY (launcher->ui_addons_merge_id == 0))
launcher->ui_addons_merge_id = gtk_ui_manager_new_merge_id (launcher->ui_manager);
+G_GNUC_END_IGNORE_DEPRECATIONS
/* determine the currently active devices */
devices = thunar_device_monitor_get_devices (launcher->device_monitor);
@@ -1739,6 +1797,7 @@ thunar_launcher_sendto_idle (gpointer user_data)
"Send the selected files to \"%s\"",
n_selected_files), device_name);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* allocate a new action for the device */
action = gtk_action_new (name, device_name, tooltip, NULL);
g_object_set_qdata_full (G_OBJECT (action), thunar_launcher_handler_quark, lp->data, g_object_unref);
@@ -1756,6 +1815,7 @@ thunar_launcher_sendto_idle (gpointer user_data)
gtk_action_set_gicon (action, icon);
g_object_unref (icon);
}
+G_GNUC_END_IGNORE_DEPRECATIONS
/* cleanup */
g_free (name);
@@ -1772,6 +1832,7 @@ thunar_launcher_sendto_idle (gpointer user_data)
{
if (got_devices)
{
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* add separator between the devices and actions action */
gtk_ui_manager_add_ui (launcher->ui_manager, launcher->ui_addons_merge_id,
file_menu_path, "separator", NULL,
@@ -1779,6 +1840,7 @@ thunar_launcher_sendto_idle (gpointer user_data)
gtk_ui_manager_add_ui (launcher->ui_manager, launcher->ui_addons_merge_id,
context_menu_path, "separator", NULL,
GTK_UI_MANAGER_SEPARATOR, FALSE);
+G_GNUC_END_IGNORE_DEPRECATIONS
}
/* add all handlers to the user interface */
@@ -1791,6 +1853,7 @@ thunar_launcher_sendto_idle (gpointer user_data)
"Send the selected files to \"%s\"",
n_selected_files), label);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* allocate a new action for the handler */
action = gtk_action_new (name, label, tooltip, NULL);
gtk_action_set_gicon (action, g_app_info_get_icon (lp->data));
@@ -1802,6 +1865,7 @@ thunar_launcher_sendto_idle (gpointer user_data)
gtk_ui_manager_add_ui (launcher->ui_manager, launcher->ui_addons_merge_id,
context_menu_path, name, name, GTK_UI_MANAGER_MENUITEM, FALSE);
g_object_unref (G_OBJECT (action));
+G_GNUC_END_IGNORE_DEPRECATIONS
/* cleanup */
g_free (tooltip);
diff --git a/thunar/thunar-location-buttons.c b/thunar/thunar-location-buttons.c
index af8645f..39901b7 100644
--- a/thunar/thunar-location-buttons.c
+++ b/thunar/thunar-location-buttons.c
@@ -265,11 +265,13 @@ thunar_location_buttons_init (ThunarLocationButtons *buttons)
{
GtkWidget *icon;
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* setup the action group for the location buttons */
buttons->action_group = gtk_action_group_new ("ThunarLocationButtons");
gtk_action_group_set_accel_group (buttons->action_group, gtk_accel_group_new ());
gtk_action_group_set_translation_domain (buttons->action_group, GETTEXT_PACKAGE);
gtk_action_group_add_actions (buttons->action_group, action_entries, G_N_ELEMENTS (action_entries), buttons);
+G_GNUC_END_IGNORE_DEPRECATIONS
gtk_widget_set_has_window (GTK_WIDGET (buttons), FALSE);
gtk_widget_set_redraw_on_allocate (GTK_WIDGET (buttons), FALSE);
@@ -1247,6 +1249,7 @@ thunar_location_buttons_context_menu (ThunarLocationButton *button,
/* grab a reference on the clipboard manager for this display */
clipboard = thunar_clipboard_manager_get_for_display (gtk_widget_get_display (GTK_WIDGET (buttons)));
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* setup the "Open" action */
action = gtk_action_group_get_action (buttons->action_group, "location-buttons-open");
thunar_gtk_action_set_tooltip (action, _("Open \"%s\" in this window"), display_name);
@@ -1279,11 +1282,13 @@ thunar_location_buttons_context_menu (ThunarLocationButton *button,
gtk_action_set_visible (action, (thunar_file_is_root (file) && thunar_file_is_trashed (file)));
gtk_action_set_sensitive (action, (thunar_file_get_size (file) > 0));
gtk_menu_shell_append (GTK_MENU_SHELL (menu), gtk_action_create_menu_item (action));
+G_GNUC_END_IGNORE_DEPRECATIONS
item = gtk_separator_menu_item_new ();
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_show (item);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* setup the "Paste Into Folder" action */
action = gtk_action_group_get_action (buttons->action_group, "location-buttons-paste-into-folder");
thunar_gtk_action_set_tooltip (action, _("Move or copy files previously selected by a Cut or Copy command into \"%s\""), display_name);
@@ -1300,6 +1305,7 @@ thunar_location_buttons_context_menu (ThunarLocationButton *button,
thunar_gtk_action_set_tooltip (action, _("View the properties of the folder \"%s\""), display_name);
g_object_set_qdata_full (G_OBJECT (action), thunar_file_quark, g_object_ref (G_OBJECT (file)), (GDestroyNotify) g_object_unref);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), gtk_action_create_menu_item (action));
+G_GNUC_END_IGNORE_DEPRECATIONS
/* run the menu (takes over the floating of menu) */
thunar_gtk_menu_run (GTK_MENU (menu));
@@ -1326,7 +1332,9 @@ thunar_location_buttons_action_create_folder (GtkAction *action,
gchar *name;
_thunar_return_if_fail (THUNAR_IS_LOCATION_BUTTONS (buttons));
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
_thunar_return_if_fail (GTK_IS_ACTION (action));
+G_GNUC_END_IGNORE_DEPRECATIONS
/* determine the directory for the action */
directory = g_object_get_qdata (G_OBJECT (action), thunar_file_quark);
@@ -1366,7 +1374,9 @@ thunar_location_buttons_action_down_folder (GtkAction *action,
GList *lp;
_thunar_return_if_fail (THUNAR_IS_LOCATION_BUTTONS (buttons));
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
_thunar_return_if_fail (GTK_IS_ACTION (action));
+G_GNUC_END_IGNORE_DEPRECATIONS
/* lookup the active button */
for (lp = buttons->list; lp != NULL; lp = lp->next)
@@ -1392,7 +1402,9 @@ thunar_location_buttons_action_empty_trash (GtkAction *action,
ThunarApplication *application;
_thunar_return_if_fail (THUNAR_IS_LOCATION_BUTTONS (buttons));
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
_thunar_return_if_fail (GTK_IS_ACTION (action));
+G_GNUC_END_IGNORE_DEPRECATIONS
/* launch the operation */
application = thunar_application_get ();
@@ -1409,7 +1421,9 @@ thunar_location_buttons_action_open (GtkAction *action,
ThunarFile *directory;
_thunar_return_if_fail (THUNAR_IS_LOCATION_BUTTONS (buttons));
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
_thunar_return_if_fail (GTK_IS_ACTION (action));
+G_GNUC_END_IGNORE_DEPRECATIONS
/* determine the directory for the action */
directory = g_object_get_qdata (G_OBJECT (action), thunar_file_quark);
@@ -1429,7 +1443,9 @@ thunar_location_buttons_action_open_in_new_tab (GtkAction *action,
ThunarFile *directory;
_thunar_return_if_fail (THUNAR_IS_LOCATION_BUTTONS (buttons));
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
_thunar_return_if_fail (GTK_IS_ACTION (action));
+G_GNUC_END_IGNORE_DEPRECATIONS
/* determine the directory for the action */
directory = g_object_get_qdata (G_OBJECT (action), thunar_file_quark);
@@ -1450,7 +1466,9 @@ thunar_location_buttons_action_open_in_new_window (GtkAction *action
ThunarFile *directory;
_thunar_return_if_fail (THUNAR_IS_LOCATION_BUTTONS (buttons));
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
_thunar_return_if_fail (GTK_IS_ACTION (action));
+G_GNUC_END_IGNORE_DEPRECATIONS
/* determine the directory for the action */
directory = g_object_get_qdata (G_OBJECT (action), thunar_file_quark);
@@ -1473,7 +1491,9 @@ thunar_location_buttons_action_paste_into_folder (GtkAction *action,
ThunarFile *directory;
_thunar_return_if_fail (THUNAR_IS_LOCATION_BUTTONS (buttons));
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
_thunar_return_if_fail (GTK_IS_ACTION (action));
+G_GNUC_END_IGNORE_DEPRECATIONS
/* determine the directory for the action */
directory = g_object_get_qdata (G_OBJECT (action), thunar_file_quark);
@@ -1497,7 +1517,9 @@ thunar_location_buttons_action_properties (GtkAction *action,
GtkWidget *dialog;
_thunar_return_if_fail (THUNAR_IS_LOCATION_BUTTONS (buttons));
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
_thunar_return_if_fail (GTK_IS_ACTION (action));
+G_GNUC_END_IGNORE_DEPRECATIONS
/* determine the directory for the action */
directory = g_object_get_qdata (G_OBJECT (action), thunar_file_quark);
diff --git a/thunar/thunar-menu-util.c b/thunar/thunar-menu-util.c
index 0d6bcbc..b01f3d2 100644
--- a/thunar/thunar-menu-util.c
+++ b/thunar/thunar-menu-util.c
@@ -51,6 +51,7 @@ action_from_menu_item (GObject *item)
"priority", &priority,
NULL);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
action = gtk_action_new (name, label, tooltip, NULL);
if (icon_name != NULL)
@@ -59,6 +60,7 @@ action_from_menu_item (GObject *item)
}
gtk_action_set_sensitive (action, sensitive);
+G_GNUC_END_IGNORE_DEPRECATIONS
g_object_set (action, "is-important", priority, NULL);
g_signal_connect_data (action, "activate",
@@ -90,6 +92,7 @@ thunar_menu_util_add_items_to_ui_manager (GtkUIManager *ui_manager,
char *action_path;
GList *children;
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* add the menu items to the UI manager */
for (lp = items; lp != NULL; lp = lp->next)
{
@@ -124,6 +127,7 @@ thunar_menu_util_add_items_to_ui_manager (GtkUIManager *ui_manager,
thunarx_menu_item_list_free (children);
g_free (subpath);
}
+G_GNUC_END_IGNORE_DEPRECATIONS
/* release the reference on item and action */
g_object_unref (G_OBJECT (lp->data));
@@ -149,7 +153,9 @@ thunar_menu_util_add_items_to_menu (GtkWidget *menu,
{
action = action_from_menu_item (G_OBJECT (lp->data));
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
item = gtk_action_create_menu_item (action);
+G_GNUC_END_IGNORE_DEPRECATIONS
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_show (item);
diff --git a/thunar/thunar-renamer-dialog.c b/thunar/thunar-renamer-dialog.c
index 2d238e9..1bb0b16 100644
--- a/thunar/thunar-renamer-dialog.c
+++ b/thunar/thunar-renamer-dialog.c
@@ -361,6 +361,7 @@ thunar_renamer_dialog_init (ThunarRenamerDialog *renamer_dialog)
gtk_dialog_set_default_response (GTK_DIALOG (renamer_dialog), GTK_RESPONSE_ACCEPT);
gtk_widget_set_tooltip_text (button, _("Click here to actually rename the files listed above to their new names."));
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* setup the action group for this dialog */
renamer_dialog->action_group = gtk_action_group_new ("ThunarRenamerDialog");
gtk_action_group_set_translation_domain (renamer_dialog->action_group, GETTEXT_PACKAGE);
@@ -370,6 +371,7 @@ thunar_renamer_dialog_init (ThunarRenamerDialog *renamer_dialog)
renamer_dialog->ui_manager = gtk_ui_manager_new ();
gtk_ui_manager_insert_action_group (renamer_dialog->ui_manager, renamer_dialog->action_group, 0);
gtk_ui_manager_add_ui_from_string (renamer_dialog->ui_manager, thunar_renamer_dialog_ui, thunar_renamer_dialog_ui_length, NULL);
+G_GNUC_END_IGNORE_DEPRECATIONS
/* connect the accelerators */
accel_group = gtk_ui_manager_get_accel_group (renamer_dialog->ui_manager);
@@ -382,7 +384,9 @@ thunar_renamer_dialog_init (ThunarRenamerDialog *renamer_dialog)
exo_binding_new (G_OBJECT (renamer_dialog), "selected-files", G_OBJECT (renamer_dialog->launcher), "selected-files");
/* add the toolbar to the dialog */
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
toolbar = gtk_ui_manager_get_widget (renamer_dialog->ui_manager, "/toolbar");
+G_GNUC_END_IGNORE_DEPRECATIONS
exo_binding_new (G_OBJECT (renamer_dialog), "standalone", G_OBJECT (toolbar), "visible");
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (renamer_dialog))), toolbar, FALSE, FALSE, 0);
@@ -859,6 +863,7 @@ thunar_renamer_dialog_context_menu (ThunarRenamerDialog *renamer_dialog)
items = thunarx_renamer_get_menu_items (renamer, GTK_WINDOW (renamer_dialog), renamer_dialog->selected_files);
}
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* check if we have any renamer menu items */
if (G_UNLIKELY (items != NULL))
{
@@ -896,6 +901,7 @@ thunar_renamer_dialog_context_menu (ThunarRenamerDialog *renamer_dialog)
g_object_unref (G_OBJECT (renamer_actions));
}
+G_GNUC_END_IGNORE_DEPRECATIONS
/* release the additional reference on the dialog */
g_object_unref (G_OBJECT (renamer_dialog));
}
@@ -1032,7 +1038,9 @@ thunar_renamer_dialog_action_add_files (GtkAction *action,
GSList *lp;
gchar *uri;
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
_thunar_return_if_fail (GTK_IS_ACTION (action));
+G_GNUC_END_IGNORE_DEPRECATIONS
_thunar_return_if_fail (THUNAR_IS_RENAMER_DIALOG (renamer_dialog));
/* allocate the file chooser */
@@ -1138,7 +1146,9 @@ thunar_renamer_dialog_action_remove_files (GtkAction *action,
GList *rows;
GList *lp;
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
_thunar_return_if_fail (GTK_IS_ACTION (action));
+G_GNUC_END_IGNORE_DEPRECATIONS
_thunar_return_if_fail (THUNAR_IS_RENAMER_DIALOG (renamer_dialog));
/* determine the selected rows in the view */
@@ -1178,7 +1188,9 @@ static void
thunar_renamer_dialog_action_clear (GtkAction *action,
ThunarRenamerDialog *renamer_dialog)
{
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
_thunar_return_if_fail (GTK_IS_ACTION (action));
+G_GNUC_END_IGNORE_DEPRECATIONS
_thunar_return_if_fail (THUNAR_IS_RENAMER_DIALOG (renamer_dialog));
/* just clear the list of files in the model */
@@ -1191,7 +1203,9 @@ static void
thunar_renamer_dialog_action_about (GtkAction *action,
ThunarRenamerDialog *renamer_dialog)
{
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
_thunar_return_if_fail (GTK_IS_ACTION (action));
+G_GNUC_END_IGNORE_DEPRECATIONS
_thunar_return_if_fail (THUNAR_IS_RENAMER_DIALOG (renamer_dialog));
/* just popup the about dialog */
@@ -1208,7 +1222,9 @@ thunar_renamer_dialog_action_properties (GtkAction *action,
{
GtkWidget *dialog;
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
_thunar_return_if_fail (GTK_IS_ACTION (action));
+G_GNUC_END_IGNORE_DEPRECATIONS
_thunar_return_if_fail (THUNAR_IS_RENAMER_DIALOG (renamer_dialog));
/* popup the properties dialog */
@@ -1623,8 +1639,10 @@ thunar_renamer_dialog_row_activated (GtkTreeView *tree_view,
/* just activate the "open" action */
action = thunar_gtk_ui_manager_get_action_by_name (renamer_dialog->ui_manager, "open");
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
if (G_LIKELY (action != NULL))
gtk_action_activate (action);
+G_GNUC_END_IGNORE_DEPRECATIONS
}
@@ -1666,6 +1684,7 @@ thunar_renamer_dialog_selection_changed (GtkTreeSelection *selection,
}
g_list_free (rows);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* the "Remove Files" action is only sensitive if we have one or more files in the selection */
action = gtk_action_group_get_action (renamer_dialog->action_group, "remove-files");
g_object_set (G_OBJECT (action),
@@ -1679,6 +1698,7 @@ thunar_renamer_dialog_selection_changed (GtkTreeSelection *selection,
/* the "Properties" action is only sensitive if we have exactly one selected file */
action = gtk_action_group_get_action (renamer_dialog->action_group, "properties");
gtk_action_set_sensitive (action, n_selected_files > 0);
+ G_GNUC_END_IGNORE_DEPRECATIONS
/* notify listeners */
g_object_notify (G_OBJECT (renamer_dialog), "selected-files");
diff --git a/thunar/thunar-shortcuts-pane.c b/thunar/thunar-shortcuts-pane.c
index aad860e..873a0fc 100644
--- a/thunar/thunar-shortcuts-pane.c
+++ b/thunar/thunar-shortcuts-pane.c
@@ -164,9 +164,11 @@ static void
thunar_shortcuts_pane_init (ThunarShortcutsPane *shortcuts_pane)
{
/* setup the action group for the shortcuts actions */
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
shortcuts_pane->action_group = gtk_action_group_new ("ThunarShortcutsPane");
gtk_action_group_set_translation_domain (shortcuts_pane->action_group, GETTEXT_PACKAGE);
gtk_action_group_add_actions (shortcuts_pane->action_group, action_entries, G_N_ELEMENTS (action_entries), shortcuts_pane);
+G_GNUC_END_IGNORE_DEPRECATIONS
/* configure the GtkScrolledWindow */
gtk_scrolled_window_set_hadjustment (GTK_SCROLLED_WINDOW (shortcuts_pane), NULL);
@@ -376,8 +378,10 @@ thunar_shortcuts_pane_set_selected_files (ThunarComponent *component,
if (!thunar_file_is_directory (lp->data))
break;
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* change the visibility of the "shortcuts-add" action appropriately */
action = gtk_action_group_get_action (shortcuts_pane->action_group, "sendto-shortcuts");
+G_GNUC_END_IGNORE_DEPRECATIONS
if (lp == NULL && selected_files != NULL)
{
/* check if atleast one of the selected folders is not already present in the model */
@@ -402,8 +406,10 @@ thunar_shortcuts_pane_set_selected_files (ThunarComponent *component,
}
else
{
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* hide the action */
gtk_action_set_visible (action, FALSE);
+G_GNUC_END_IGNORE_DEPRECATIONS
}
/* notify listeners */
@@ -430,11 +436,13 @@ thunar_shortcuts_pane_set_ui_manager (ThunarComponent *component,
/* disconnect from the previous UI manager */
if (G_UNLIKELY (shortcuts_pane->ui_manager != NULL))
{
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* drop our action group from the previous UI manager */
gtk_ui_manager_remove_action_group (shortcuts_pane->ui_manager, shortcuts_pane->action_group);
/* unmerge our ui controls from the previous UI manager */
gtk_ui_manager_remove_ui (shortcuts_pane->ui_manager, shortcuts_pane->ui_merge_id);
+G_GNUC_END_IGNORE_DEPRECATIONS
/* drop our reference on the previous UI manager */
g_object_unref (G_OBJECT (shortcuts_pane->ui_manager));
@@ -449,11 +457,13 @@ thunar_shortcuts_pane_set_ui_manager (ThunarComponent *component,
/* we keep a reference on the new manager */
g_object_ref (G_OBJECT (ui_manager));
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* add our action group to the new manager */
gtk_ui_manager_insert_action_group (ui_manager, shortcuts_pane->action_group, -1);
/* merge our UI control items with the new manager */
shortcuts_pane->ui_merge_id = gtk_ui_manager_add_ui_from_string (ui_manager, thunar_shortcuts_pane_ui, thunar_shortcuts_pane_ui_length, &error);
+G_GNUC_END_IGNORE_DEPRECATIONS
if (G_UNLIKELY (shortcuts_pane->ui_merge_id == 0))
{
g_error ("Failed to merge ThunarShortcutsPane menus: %s", error->message);
@@ -475,7 +485,9 @@ thunar_shortcuts_pane_action_shortcuts_add (GtkAction *action,
GtkTreeModel *child_model;
GList *lp;
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
_thunar_return_if_fail (GTK_IS_ACTION (action));
+G_GNUC_END_IGNORE_DEPRECATIONS
_thunar_return_if_fail (THUNAR_IS_SHORTCUTS_PANE (shortcuts_pane));
/* determine the shortcuts model for the view */
diff --git a/thunar/thunar-standard-view.c b/thunar/thunar-standard-view.c
index d243950..43abc5d 100644
--- a/thunar/thunar-standard-view.c
+++ b/thunar/thunar-standard-view.c
@@ -660,6 +660,7 @@ thunar_standard_view_init (ThunarStandardView *standard_view)
gtk_scrolled_window_set_vadjustment (GTK_SCROLLED_WINDOW (standard_view), NULL);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (standard_view), GTK_SHADOW_IN);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* setup the action group for this view */
standard_view->action_group = gtk_action_group_new ("ThunarStandardView");
gtk_action_group_set_translation_domain (standard_view->action_group, GETTEXT_PACKAGE);
@@ -680,6 +681,7 @@ thunar_standard_view_init (ThunarStandardView *standard_view)
standard_view->priv->action_make_link = gtk_action_group_get_action (standard_view->action_group, "make-link");
standard_view->priv->action_rename = gtk_action_group_get_action (standard_view->action_group, "rename");
standard_view->priv->action_restore = gtk_action_group_get_action (standard_view->action_group, "restore");
+G_GNUC_END_IGNORE_DEPRECATIONS
/* add the "Create Document" sub menu action */
standard_view->priv->action_create_document = thunar_templates_action_new ("create-document", _("Create _Document"));
@@ -687,7 +689,9 @@ thunar_standard_view_init (ThunarStandardView *standard_view)
G_CALLBACK (thunar_standard_view_action_create_empty_file), standard_view);
g_signal_connect (G_OBJECT (standard_view->priv->action_create_document), "create-template",
G_CALLBACK (thunar_standard_view_action_create_template), standard_view);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gtk_action_group_add_action (standard_view->action_group, standard_view->priv->action_create_document);
+G_GNUC_END_IGNORE_DEPRECATIONS
g_object_unref (G_OBJECT (standard_view->priv->action_create_document));
/* setup the history support */
@@ -1227,6 +1231,7 @@ thunar_standard_view_set_ui_manager (ThunarComponent *component,
if (standard_view->ui_manager == ui_manager)
return;
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* disconnect from the previous UI manager */
if (G_LIKELY (standard_view->ui_manager != NULL))
{
@@ -1289,6 +1294,7 @@ thunar_standard_view_set_ui_manager (ThunarComponent *component,
gtk_ui_manager_ensure_update (standard_view->ui_manager);
}
+G_GNUC_END_IGNORE_DEPRECATIONS
/* let others know that we have a new manager */
g_object_notify_by_pspec (G_OBJECT (standard_view), standard_view_props[PROP_UI_MANAGER]);
}
@@ -1486,6 +1492,7 @@ thunar_standard_view_set_current_directory (ThunarNavigator *navigator,
/* check if the new directory is in the trash */
trashed = thunar_file_is_trashed (current_directory);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* update the "Create Folder"/"Create Document" actions */
gtk_action_set_visible (standard_view->priv->action_create_folder, !trashed);
gtk_action_set_visible (standard_view->priv->action_create_document, !trashed);
@@ -1495,6 +1502,7 @@ thunar_standard_view_set_current_directory (ThunarNavigator *navigator,
/* update the "Restore" action */
gtk_action_set_visible (standard_view->priv->action_restore, trashed);
+G_GNUC_END_IGNORE_DEPRECATIONS
/* schedule a thumbnail timeout */
/* NOTE: quickly after this we always trigger a size allocate wich will handle this */
@@ -1841,7 +1849,9 @@ thunar_standard_view_scroll_to_file (ThunarView *view,
static gboolean
thunar_standard_view_delete_selected_files (ThunarStandardView *standard_view)
{
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
GtkAction *action = GTK_ACTION (standard_view->priv->action_move_to_trash);
+G_GNUC_END_IGNORE_DEPRECATIONS
const gchar *accel_path;
GtkAccelKey key;
@@ -1857,19 +1867,25 @@ thunar_standard_view_delete_selected_files (ThunarStandardView *standard_view)
* this function is never called. If a hardcoded key combination is
* pressed and a custom accelerator is set, accel_key || accel_mods
* are no 0. */
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
accel_path = gtk_action_get_accel_path (action);
+G_GNUC_END_IGNORE_DEPRECATIONS
if (accel_path != NULL
&& gtk_accel_map_lookup_entry (accel_path, &key)
&& (key.accel_key != 0 || key.accel_mods != 0))
return FALSE;
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* just emit the "activate" signal on the "move-trash" action */
gtk_action_activate (action);
+G_GNUC_END_IGNORE_DEPRECATIONS
}
else
{
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* do a permanent delete */
gtk_action_activate (GTK_ACTION (standard_view->priv->action_delete));
+G_GNUC_END_IGNORE_DEPRECATIONS
}
/* ...and we're done */
@@ -2055,15 +2071,19 @@ thunar_standard_view_merge_custom_actions (ThunarStandardView *standard_view,
/* remove the previously determined menu actions from the UI manager */
if (G_LIKELY (standard_view->priv->custom_merge_id != 0))
{
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gtk_ui_manager_remove_ui (standard_view->ui_manager, standard_view->priv->custom_merge_id);
gtk_ui_manager_ensure_update (standard_view->ui_manager);
+G_GNUC_END_IGNORE_DEPRECATIONS
standard_view->priv->custom_merge_id = 0;
}
/* drop any previous custom action group */
if (G_LIKELY (standard_view->priv->custom_actions != NULL))
{
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gtk_ui_manager_remove_action_group (standard_view->ui_manager, standard_view->priv->custom_actions);
+G_GNUC_END_IGNORE_DEPRECATIONS
g_object_unref (G_OBJECT (standard_view->priv->custom_actions));
standard_view->priv->custom_actions = NULL;
}
@@ -2071,10 +2091,12 @@ thunar_standard_view_merge_custom_actions (ThunarStandardView *standard_view,
/* add the actions specified by the menu providers */
if (G_LIKELY (items != NULL))
{
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* allocate the action group and the merge id for the custom actions */
standard_view->priv->custom_actions = gtk_action_group_new ("thunar-standard-view-custom-actions");
standard_view->priv->custom_merge_id = gtk_ui_manager_new_merge_id (standard_view->ui_manager);
gtk_ui_manager_insert_action_group (standard_view->ui_manager, standard_view->priv->custom_actions, -1);
+G_GNUC_END_IGNORE_DEPRECATIONS
if (G_LIKELY (selected_items != NULL))
{
@@ -2092,8 +2114,10 @@ thunar_standard_view_merge_custom_actions (ThunarStandardView *standard_view,
standard_view->priv->custom_merge_id,
path, items);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* be sure to update the UI manager to avoid flickering */
gtk_ui_manager_ensure_update (standard_view->ui_manager);
+G_GNUC_END_IGNORE_DEPRECATIONS
/* cleanup */
g_list_free (items);
@@ -2271,7 +2295,9 @@ thunar_standard_view_action_create_empty_file (GtkAction *action,
GList path_list;
gchar *name;
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
_thunar_return_if_fail (GTK_IS_ACTION (action));
+G_GNUC_END_IGNORE_DEPRECATIONS
_thunar_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
/* ask the user to enter a name for the new empty file */
@@ -2315,7 +2341,9 @@ thunar_standard_view_action_create_folder (GtkAction *action,
GList path_list;
gchar *name;
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
_thunar_return_if_fail (GTK_IS_ACTION (action));
+G_GNUC_END_IGNORE_DEPRECATIONS
_thunar_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
/* ask the user to enter a name for the new folder */
@@ -2361,7 +2389,9 @@ thunar_standard_view_action_create_template (GtkAction *action,
gchar *name;
gchar *title;
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
_thunar_return_if_fail (GTK_IS_ACTION (action));
+G_GNUC_END_IGNORE_DEPRECATIONS
_thunar_return_if_fail (THUNAR_IS_FILE (file));
_thunar_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
@@ -2414,7 +2444,9 @@ thunar_standard_view_action_properties (GtkAction *action,
GtkWidget *toplevel;
GtkWidget *dialog;
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
_thunar_return_if_fail (GTK_IS_ACTION (action));
+G_GNUC_END_IGNORE_DEPRECATIONS
_thunar_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
/* popup the files dialog */
@@ -2449,7 +2481,9 @@ static void
thunar_standard_view_action_cut (GtkAction *action,
ThunarStandardView *standard_view)
{
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
_thunar_return_if_fail (GTK_IS_ACTION (action));
+G_GNUC_END_IGNORE_DEPRECATIONS
_thunar_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
_thunar_return_if_fail (THUNAR_IS_CLIPBOARD_MANAGER (standard_view->clipboard));
@@ -2462,7 +2496,9 @@ static void
thunar_standard_view_action_copy (GtkAction *action,
ThunarStandardView *standard_view)
{
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
_thunar_return_if_fail (GTK_IS_ACTION (action));
+G_GNUC_END_IGNORE_DEPRECATIONS
_thunar_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
_thunar_return_if_fail (THUNAR_IS_CLIPBOARD_MANAGER (standard_view->clipboard));
@@ -2477,7 +2513,9 @@ thunar_standard_view_action_paste (GtkAction *action,
{
ThunarFile *current_directory;
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
_thunar_return_if_fail (GTK_IS_ACTION (action));
+G_GNUC_END_IGNORE_DEPRECATIONS
_thunar_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
current_directory = thunar_navigator_get_current_directory (THUNAR_NAVIGATOR (standard_view));
@@ -2520,7 +2558,9 @@ thunar_standard_view_action_move_to_trash (GtkAction *action,
const gchar *accel_path;
GtkAccelKey key;
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
_thunar_return_if_fail (GTK_IS_ACTION (action));
+G_GNUC_END_IGNORE_DEPRECATIONS
_thunar_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
/* check if we should permanently delete the files (user holds shift) */
@@ -2529,7 +2569,9 @@ thunar_standard_view_action_move_to_trash (GtkAction *action,
{
/* look if the user has set a custom accelerator (accel_key != 0)
* that contains a shift modifier */
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
accel_path = gtk_action_get_accel_path (action);
+G_GNUC_END_IGNORE_DEPRECATIONS
if (accel_path != NULL
&& gtk_accel_map_lookup_entry (accel_path, &key)
&& key.accel_key != 0
@@ -2557,7 +2599,9 @@ thunar_standard_view_action_paste_into_folder (GtkAction *action,
{
ThunarFile *file;
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
_thunar_return_if_fail (GTK_IS_ACTION (action));
+G_GNUC_END_IGNORE_DEPRECATIONS
_thunar_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
/* determine the first selected file and verify that it's a folder */
@@ -2572,7 +2616,9 @@ static void
thunar_standard_view_action_select_all_files (GtkAction *action,
ThunarStandardView *standard_view)
{
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
_thunar_return_if_fail (GTK_IS_ACTION (action));
+G_GNUC_END_IGNORE_DEPRECATIONS
_thunar_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
/* grab the focus to the view */
@@ -2599,7 +2645,9 @@ thunar_standard_view_action_select_by_pattern (GtkAction *action,
const gchar *pattern;
gchar *pattern_extended = NULL;
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
_thunar_return_if_fail (GTK_IS_ACTION (action));
+G_GNUC_END_IGNORE_DEPRECATIONS
_thunar_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
window = gtk_widget_get_toplevel (GTK_WIDGET (standard_view));
@@ -2667,7 +2715,9 @@ static void
thunar_standard_view_action_selection_invert (GtkAction *action,
ThunarStandardView *standard_view)
{
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
_thunar_return_if_fail (GTK_IS_ACTION (action));
+G_GNUC_END_IGNORE_DEPRECATIONS
_thunar_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
/* grab the focus to the view */
@@ -2688,7 +2738,9 @@ thunar_standard_view_action_duplicate (GtkAction *action,
GClosure *new_files_closure;
GList *selected_files;
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
_thunar_return_if_fail (GTK_IS_ACTION (action));
+G_GNUC_END_IGNORE_DEPRECATIONS
_thunar_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
/* determine the file for the current directory */
@@ -2725,7 +2777,9 @@ thunar_standard_view_action_make_link (GtkAction *action,
GClosure *new_files_closure;
GList *selected_files;
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
_thunar_return_if_fail (GTK_IS_ACTION (action));
+G_GNUC_END_IGNORE_DEPRECATIONS
_thunar_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
/* determine the file for the current directory */
@@ -2816,7 +2870,9 @@ thunar_standard_view_action_rename (GtkAction *action,
const gchar *accel_path;
GtkAccelKey key;
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
_thunar_return_if_fail (GTK_IS_ACTION (action));
+G_GNUC_END_IGNORE_DEPRECATIONS
_thunar_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
/* leave if no files are selected */
@@ -2829,7 +2885,9 @@ thunar_standard_view_action_rename (GtkAction *action,
{
/* Check if the user defined a custom accelerator that includes the
* shift button. If he or she has, we won't force the bulk renamer. */
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
accel_path = gtk_action_get_accel_path (action);
+G_GNUC_END_IGNORE_DEPRECATIONS
if (accel_path != NULL
&& gtk_accel_map_lookup_entry (accel_path, &key)
&& (key.accel_mods & GDK_SHIFT_MASK) != 0)
@@ -2872,7 +2930,9 @@ thunar_standard_view_action_restore (GtkAction *action,
{
ThunarApplication *application;
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
_thunar_return_if_fail (GTK_IS_ACTION (action));
+G_GNUC_END_IGNORE_DEPRECATIONS
_thunar_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
/* restore the selected files */
@@ -3081,6 +3141,7 @@ thunar_standard_view_button_press_event (GtkWidget *view,
GdkEventButton *event,
ThunarStandardView *standard_view)
{
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
GtkAction *action = NULL;
if (G_LIKELY (event->type == GDK_BUTTON_PRESS))
@@ -3098,7 +3159,7 @@ thunar_standard_view_button_press_event (GtkWidget *view,
return TRUE;
}
}
-
+G_GNUC_END_IGNORE_DEPRECATIONS
/* next please... */
return FALSE;
}
@@ -4263,8 +4324,10 @@ thunar_standard_view_context_menu (ThunarStandardView *standard_view)
/* grab an additional reference on the view */
g_object_ref (G_OBJECT (standard_view));
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* run the menu (figuring out whether to use the file or the folder context menu) */
menu = gtk_ui_manager_get_widget (standard_view->ui_manager, (selected_items != NULL) ? "/file-context-menu" : "/folder-context-menu");
+G_GNUC_END_IGNORE_DEPRECATIONS
thunar_gtk_menu_run (GTK_MENU (menu));
g_list_free_full (selected_items, (GDestroyNotify) gtk_tree_path_free);
@@ -4401,6 +4464,7 @@ thunar_standard_view_selection_changed (ThunarStandardView *standard_view)
&& thunar_file_is_directory (selected_files->data)
&& thunar_file_is_writable (selected_files->data);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* update the "Create Folder"/"Create Document" actions */
gtk_action_set_sensitive (standard_view->priv->action_create_folder, !trashed && writable);
gtk_action_set_sensitive (standard_view->priv->action_create_document, !trashed && writable);
@@ -4408,6 +4472,7 @@ thunar_standard_view_selection_changed (ThunarStandardView *standard_view)
/* update the "Properties" action */
gtk_action_set_sensitive (standard_view->priv->action_properties,
current_directory != NULL || n_selected_files > 0);
+G_GNUC_END_IGNORE_DEPRECATIONS
/* update the "Cut" action */
g_object_set (G_OBJECT (standard_view->priv->action_cut),
@@ -4425,8 +4490,10 @@ thunar_standard_view_selection_changed (ThunarStandardView *standard_view)
n_selected_files),
NULL);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* update the "Paste" action */
gtk_action_set_sensitive (standard_view->priv->action_paste, writable && pastable);
+G_GNUC_END_IGNORE_DEPRECATIONS
/* update the "Move to Trash" action */
g_object_set (G_OBJECT (standard_view->priv->action_move_to_trash),
diff --git a/thunar/thunar-templates-action.c b/thunar/thunar-templates-action.c
index b9297b8..ace5e07 100644
--- a/thunar/thunar-templates-action.c
+++ b/thunar/thunar-templates-action.c
@@ -71,7 +71,9 @@ static guint templates_action_signals[LAST_SIGNAL];
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
G_DEFINE_TYPE (ThunarTemplatesAction, thunar_templates_action, GTK_TYPE_ACTION)
+G_GNUC_END_IGNORE_DEPRECATIONS
@@ -84,8 +86,10 @@ thunar_templates_action_class_init (ThunarTemplatesActionClass *klass)
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = thunar_templates_action_finalize;
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gtkaction_class = GTK_ACTION_CLASS (klass);
gtkaction_class->create_menu_item = thunar_templates_action_create_menu_item;
+G_GNUC_END_IGNORE_DEPRECATIONS
/**
* ThunarTemplatesAction::create-empty-file:
@@ -157,7 +161,9 @@ thunar_templates_action_create_menu_item (GtkAction *action)
_thunar_return_val_if_fail (THUNAR_IS_TEMPLATES_ACTION (action), NULL);
/* let GtkAction allocate the menu item */
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
item = (*GTK_ACTION_CLASS (thunar_templates_action_parent_class)->create_menu_item) (action);
+G_GNUC_END_IGNORE_DEPRECATIONS
/* associate an empty submenu with the item (will be filled when shown) */
menu = gtk_menu_new ();
diff --git a/thunar/thunar-trash-action.c b/thunar/thunar-trash-action.c
index 56302b0..791e479 100644
--- a/thunar/thunar-trash-action.c
+++ b/thunar/thunar-trash-action.c
@@ -49,7 +49,9 @@ struct _ThunarTrashAction
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
G_DEFINE_TYPE (ThunarTrashAction, thunar_trash_action, GTK_TYPE_ACTION)
+G_GNUC_END_IGNORE_DEPRECATIONS
diff --git a/thunar/thunar-window.c b/thunar/thunar-window.c
index 4f52058..197ab8b 100644
--- a/thunar/thunar-window.c
+++ b/thunar/thunar-window.c
@@ -455,6 +455,7 @@ thunar_window_class_init (ThunarWindowClass *klass)
FALSE,
EXO_PARAM_READABLE));
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/**
* ThunarWindow:ui-manager:
*
@@ -469,6 +470,7 @@ thunar_window_class_init (ThunarWindowClass *klass)
"ui-manager",
GTK_TYPE_UI_MANAGER,
EXO_PARAM_READABLE));
+G_GNUC_END_IGNORE_DEPRECATIONS
/**
* ThunarWindow:zoom-level:
@@ -756,6 +758,7 @@ thunar_window_init (ThunarWindow *window)
g_closure_sink (window->menu_item_deselected_closure);
window->icon_factory = thunar_icon_factory_get_default ();
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* setup the action group for this window */
window->action_group = gtk_action_group_new ("ThunarWindow");
gtk_action_group_set_translation_domain (window->action_group, GETTEXT_PACKAGE);
@@ -798,6 +801,7 @@ thunar_window_init (ThunarWindow *window)
accel_group = gtk_ui_manager_get_accel_group (window->ui_manager);
gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
+G_GNUC_END_IGNORE_DEPRECATIONS
/* setup the launcher support */
window->launcher = thunar_launcher_new ();
@@ -822,14 +826,18 @@ thunar_window_init (ThunarWindow *window)
gtk_container_add (GTK_CONTAINER (window), window->grid);
gtk_widget_show (window->grid);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
window->menubar = gtk_ui_manager_get_widget (window->ui_manager, "/main-menu");
+G_GNUC_END_IGNORE_DEPRECATIONS
gtk_widget_set_hexpand (window->menubar, TRUE);
gtk_grid_attach (GTK_GRID (window->grid), window->menubar, 0, 0, 1, 1);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* update menubar visibiliy */
action = gtk_action_group_get_action (window->action_group, "view-menubar");
g_signal_connect (G_OBJECT (window->menubar), "deactivate", G_CALLBACK (thunar_window_toggle_menubar_deactivate), window);
gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), last_menubar_visible);
+G_GNUC_END_IGNORE_DEPRECATIONS
/* append the menu item for the spinner */
item = gtk_menu_item_new ();
@@ -907,8 +915,10 @@ thunar_window_init (ThunarWindow *window)
g_signal_connect_swapped (G_OBJECT (window->location_bar), "reload-requested", G_CALLBACK (thunar_window_handle_reload_request), window);
g_signal_connect_swapped (G_OBJECT (window->location_bar), "entry-done", G_CALLBACK (thunar_window_update_location_bar_visible), window);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* setup the toolbar for the location bar */
window->location_toolbar = gtk_ui_manager_get_widget (window->ui_manager, "/location-toolbar");
+G_GNUC_END_IGNORE_DEPRECATIONS
gtk_toolbar_set_style (GTK_TOOLBAR (window->location_toolbar), GTK_TOOLBAR_ICONS);
gtk_toolbar_set_icon_size (GTK_TOOLBAR (window->location_toolbar),
small_icons ? GTK_ICON_SIZE_SMALL_TOOLBAR : GTK_ICON_SIZE_LARGE_TOOLBAR);
@@ -928,11 +938,13 @@ thunar_window_init (ThunarWindow *window)
/* display the new location bar widget */
gtk_widget_show (window->location_bar);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* activate the selected location selector */
action = gtk_action_group_get_action (window->action_group, "view-location-selector-pathbar");
gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), !strcmp(last_location_bar, g_type_name (THUNAR_TYPE_LOCATION_BUTTONS)));
action = gtk_action_group_get_action (window->action_group, "view-location-selector-toolbar");
gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), !strcmp(last_location_bar, g_type_name (THUNAR_TYPE_LOCATION_ENTRY)));
+G_GNUC_END_IGNORE_DEPRECATIONS
g_free (last_location_bar);
@@ -949,6 +961,7 @@ thunar_window_init (ThunarWindow *window)
type = G_TYPE_NONE;
g_free (last_side_pane);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* activate the selected side pane */
action = gtk_action_group_get_action (window->action_group, "view-side-pane-shortcuts");
gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), (type == THUNAR_TYPE_SHORTCUTS_PANE));
@@ -961,6 +974,7 @@ thunar_window_init (ThunarWindow *window)
/* connect signal */
action = gtk_action_group_get_action (window->action_group, "view-as-icons");
+G_GNUC_END_IGNORE_DEPRECATIONS
g_signal_connect (G_OBJECT (action), "changed", G_CALLBACK (thunar_window_action_view_changed), window);
/* schedule asynchronous menu action merging */
@@ -985,21 +999,27 @@ thunar_window_dispose (GObject *object)
/* un-merge the custom preferences */
if (G_LIKELY (window->custom_preferences_merge_id != 0))
{
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gtk_ui_manager_remove_ui (window->ui_manager, window->custom_preferences_merge_id);
+G_GNUC_END_IGNORE_DEPRECATIONS
window->custom_preferences_merge_id = 0;
}
/* un-merge the go menu actions */
if (G_LIKELY (window->go_items_actions_merge_id != 0))
{
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gtk_ui_manager_remove_ui (window->ui_manager, window->go_items_actions_merge_id);
+G_GNUC_END_IGNORE_DEPRECATIONS
window->go_items_actions_merge_id = 0;
}
/* un-merge the bookmark actions */
if (G_LIKELY (window->bookmark_items_actions_merge_id != 0))
{
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gtk_ui_manager_remove_ui (window->ui_manager, window->bookmark_items_actions_merge_id);
+G_GNUC_END_IGNORE_DEPRECATIONS
window->bookmark_items_actions_merge_id = 0;
}
@@ -1081,8 +1101,10 @@ thunar_window_get_property (GObject *object,
break;
case PROP_SHOW_HIDDEN:
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
action = gtk_action_group_get_action (window->action_group, "show-hidden");
g_value_set_boolean (value, gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)));
+G_GNUC_END_IGNORE_DEPRECATIONS
break;
case PROP_UI_MANAGER:
@@ -1139,6 +1161,7 @@ thunar_window_back (ThunarWindow *window)
/* check source event */
event = gtk_get_current_event ();
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
if (event != NULL
&& event->type == GDK_KEY_PRESS)
{
@@ -1165,6 +1188,7 @@ thunar_window_back (ThunarWindow *window)
gtk_action_activate (action);
return TRUE;
}
+G_GNUC_END_IGNORE_DEPRECATIONS
return FALSE;
}
@@ -1203,11 +1227,13 @@ thunar_window_toggle_sidepane (ThunarWindow *window)
/* determine the currently active side pane type */
window->toggle_sidepane_type = G_OBJECT_TYPE (window->sidepane);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* just reset both side pane actions */
action = gtk_action_group_get_action (window->action_group, "view-side-pane-shortcuts");
gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), FALSE);
action = gtk_action_group_get_action (window->action_group, "view-side-pane-tree");
gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), FALSE);
+G_GNUC_END_IGNORE_DEPRECATIONS
}
else
{
@@ -1223,11 +1249,13 @@ thunar_window_toggle_sidepane (ThunarWindow *window)
g_free (type_name);
}
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* activate the given side pane */
action = gtk_action_group_get_action (window->action_group, "view-side-pane-shortcuts");
gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), (window->toggle_sidepane_type == THUNAR_TYPE_SHORTCUTS_PANE));
action = gtk_action_group_get_action (window->action_group, "view-side-pane-tree");
gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), (window->toggle_sidepane_type == THUNAR_TYPE_TREE_PANE));
+G_GNUC_END_IGNORE_DEPRECATIONS
}
return TRUE;
@@ -1261,10 +1289,12 @@ thunar_window_toggle_menubar_deactivate (GtkWidget *menubar,
_thunar_return_if_fail (THUNAR_IS_WINDOW (window));
_thunar_return_if_fail (window->menubar == menubar);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* this was a temporarily show, hide the bar */
action = gtk_action_group_get_action (window->action_group, "view-menubar");
if (!gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)))
gtk_widget_hide (menubar);
+G_GNUC_END_IGNORE_DEPRECATIONS
}
@@ -1471,12 +1501,15 @@ thunar_window_notebook_switch_page (GtkWidget *notebook,
current_directory = thunar_navigator_get_current_directory (THUNAR_NAVIGATOR (page));
thunar_window_set_current_directory (window, current_directory);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* activate the selected view */
action = gtk_action_group_get_action (window->action_group, "view-as-icons");
g_signal_handlers_block_by_func (action, thunar_window_action_view_changed, window);
gtk_radio_action_set_current_value (GTK_RADIO_ACTION (action), view_type2index (G_OBJECT_TYPE (page)));
+G_GNUC_END_IGNORE_DEPRECATIONS
g_signal_handlers_unblock_by_func (action, thunar_window_action_view_changed, window);
+
/* add stock bindings */
thunar_window_binding_create (window, window, "current-directory", page, "current-directory", G_BINDING_DEFAULT);
thunar_window_binding_create (window, window, "show-hidden", page, "show-hidden", G_BINDING_SYNC_CREATE);
@@ -1532,9 +1565,11 @@ thunar_window_notebook_show_tabs (ThunarWindow *window)
/* update visibility */
gtk_notebook_set_show_tabs (GTK_NOTEBOOK (window->notebook), show_tabs);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* visibility of the detach action */
action = gtk_action_group_get_action (window->action_group, "detach-tab");
gtk_action_set_visible (action, n_pages > 1);
+G_GNUC_END_IGNORE_DEPRECATIONS
}
@@ -1606,8 +1641,10 @@ thunar_window_notebook_popup_menu_real (ThunarWindow *window)
{
GtkWidget *menu;
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* run the menu (figuring out whether to use the file or the folder context menu) */
menu = gtk_ui_manager_get_widget (window->ui_manager, "/tab-context-menu");
+G_GNUC_END_IGNORE_DEPRECATIONS
thunar_gtk_menu_run (GTK_MENU (menu));
}
@@ -1956,8 +1993,10 @@ thunar_window_merge_custom_preferences (ThunarWindow *window)
providers = thunarx_provider_factory_list_providers (window->provider_factory, THUNARX_TYPE_PREFERENCES_PROVIDER);
if (G_LIKELY (providers != NULL))
{
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* allocate a new merge id from the UI manager */
window->custom_preferences_merge_id = gtk_ui_manager_new_merge_id (window->ui_manager);
+G_GNUC_END_IGNORE_DEPRECATIONS
/* add menu items from all providers */
for (pp = providers; pp != NULL; pp = pp->next)
@@ -2065,9 +2104,11 @@ thunar_window_bookmark_merge_line (GFile *file_path,
if (name == NULL)
name = thunar_file_get_display_name (file);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
action = gtk_action_new (unique_name, name, tooltip, NULL);
icon_name = thunar_file_get_icon_name (file, THUNAR_FILE_ICON_STATE_DEFAULT, icon_theme);
gtk_action_set_icon_name (action, icon_name);
+G_GNUC_END_IGNORE_DEPRECATIONS
g_object_set_data_full (G_OBJECT (action), I_("thunar-file"), file,
thunar_window_bookmark_release_file);
@@ -2095,8 +2136,10 @@ thunar_window_bookmark_merge_line (GFile *file_path,
name = remote_name;
}
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
action = gtk_action_new (unique_name, name, tooltip, NULL);
gtk_action_set_icon_name (action, "folder-remote");
+G_GNUC_END_IGNORE_DEPRECATIONS
g_object_set_data_full (G_OBJECT (action), I_("location-file"),
g_object_ref (file_path), g_object_unref);
@@ -2106,6 +2149,7 @@ thunar_window_bookmark_merge_line (GFile *file_path,
path = "/main-menu/go-menu/placeholder-go-remote-actions";
}
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
if (G_LIKELY (action != NULL))
{
if (gtk_action_group_get_action (window->bookmark_action_group, unique_name) == NULL)
@@ -2126,6 +2170,7 @@ thunar_window_bookmark_merge_line (GFile *file_path,
g_object_unref (action);
}
+G_GNUC_END_IGNORE_DEPRECATIONS
g_checksum_free (checksum);
g_free (tooltip);
@@ -2145,14 +2190,18 @@ thunar_window_bookmark_merge (gpointer user_data)
/* remove old actions */
if (window->bookmark_items_actions_merge_id != 0)
{
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gtk_ui_manager_remove_ui (window->ui_manager, window->bookmark_items_actions_merge_id);
gtk_ui_manager_ensure_update (window->ui_manager);
+G_GNUC_END_IGNORE_DEPRECATIONS
}
/* drop old bookmarks action group */
if (window->bookmark_action_group != NULL)
{
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gtk_ui_manager_remove_action_group (window->ui_manager, window->bookmark_action_group);
+G_GNUC_END_IGNORE_DEPRECATIONS
g_object_unref (window->bookmark_action_group);
}
@@ -2168,12 +2217,14 @@ thunar_window_bookmark_merge (gpointer user_data)
}
}
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* generate a new merge id */
window->bookmark_items_actions_merge_id = gtk_ui_manager_new_merge_id (window->ui_manager);
/* create a new action group */
window->bookmark_action_group = gtk_action_group_new ("ThunarBookmarks");
gtk_ui_manager_insert_action_group (window->ui_manager, window->bookmark_action_group, -1);
+G_GNUC_END_IGNORE_DEPRECATIONS
/* collect bookmarks */
thunar_util_load_bookmarks (window->bookmark_file,
@@ -2200,6 +2251,7 @@ thunar_window_merge_go_actions (ThunarWindow *window)
/* setup the "open-trash" action */
if (thunar_g_vfs_is_uri_scheme_supported ("trash"))
{
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* allocate a new merge id from the UI manager */
window->go_items_actions_merge_id = gtk_ui_manager_new_merge_id (window->ui_manager);
@@ -2215,13 +2267,16 @@ thunar_window_merge_go_actions (ThunarWindow *window)
gtk_action_get_name (GTK_ACTION (action)),
gtk_action_get_name (GTK_ACTION (action)),
GTK_UI_MANAGER_MENUITEM, FALSE);
+G_GNUC_END_IGNORE_DEPRECATIONS
g_object_unref (action);
}
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* setup visibility of the "open-network" action */
action = gtk_action_group_get_action (window->action_group, "open-network");
gtk_action_set_visible (action, thunar_g_vfs_is_uri_scheme_supported ("network"));
+G_GNUC_END_IGNORE_DEPRECATIONS
}
@@ -2438,7 +2493,9 @@ thunar_window_action_preferences (GtkAction *action,
GtkWidget *dialog;
ThunarApplication *application;
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
_thunar_return_if_fail (GTK_IS_ACTION (action));
+G_GNUC_END_IGNORE_DEPRECATIONS
_thunar_return_if_fail (THUNAR_IS_WINDOW (window));
/* allocate and display a preferences dialog */;
@@ -2459,7 +2516,9 @@ thunar_window_action_reload (GtkAction *action,
{
gboolean result;
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
_thunar_return_if_fail (GTK_IS_ACTION (action));
+G_GNUC_END_IGNORE_DEPRECATIONS
_thunar_return_if_fail (THUNAR_IS_WINDOW (window));
/* force the view to reload */
@@ -2476,6 +2535,7 @@ static void
thunar_window_action_pathbar_changed (GtkToggleAction *action,
ThunarWindow *window)
{
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
GtkAction *other_action;
GType type;
@@ -2497,6 +2557,7 @@ thunar_window_action_pathbar_changed (GtkToggleAction *action,
gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (other_action), FALSE);
g_signal_handlers_unblock_by_func (G_OBJECT (other_action), thunar_window_action_toolbar_changed, window);
}
+G_GNUC_END_IGNORE_DEPRECATIONS
}
@@ -2505,6 +2566,7 @@ static void
thunar_window_action_toolbar_changed (GtkToggleAction *action,
ThunarWindow *window)
{
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
GtkAction *other_action;
GType type;
@@ -2526,6 +2588,7 @@ thunar_window_action_toolbar_changed (GtkToggleAction *action,
gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (other_action), FALSE);
g_signal_handlers_unblock_by_func (G_OBJECT (other_action), thunar_window_action_pathbar_changed, window);
}
+G_GNUC_END_IGNORE_DEPRECATIONS
}
@@ -2537,8 +2600,10 @@ thunar_window_action_shortcuts_changed (GtkToggleAction *action,
GtkAction *other_action;
GType type;
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* determine the new type of side pane */
type = gtk_toggle_action_get_active (action) ? THUNAR_TYPE_SHORTCUTS_PANE : G_TYPE_NONE;
+G_GNUC_END_IGNORE_DEPRECATIONS
/* install the new sidepane */
thunar_window_install_sidepane (window, type);
@@ -2546,11 +2611,13 @@ thunar_window_action_shortcuts_changed (GtkToggleAction *action,
/* check if we actually installed anything */
if (G_LIKELY (type != G_TYPE_NONE))
{
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* reset the state of the tree pane action (without firing the handler) */
other_action = gtk_action_group_get_action (window->action_group, "view-side-pane-tree");
g_signal_handlers_block_by_func (G_OBJECT (other_action), thunar_window_action_tree_changed, window);
gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (other_action), FALSE);
g_signal_handlers_unblock_by_func (G_OBJECT (other_action), thunar_window_action_tree_changed, window);
+G_GNUC_END_IGNORE_DEPRECATIONS
}
}
@@ -2563,8 +2630,10 @@ thunar_window_action_tree_changed (GtkToggleAction *action,
GtkAction *other_action;
GType type;
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* determine the new type of side pane */
type = gtk_toggle_action_get_active (action) ? THUNAR_TYPE_TREE_PANE : G_TYPE_NONE;
+G_GNUC_END_IGNORE_DEPRECATIONS
/* install the new sidepane */
thunar_window_install_sidepane (window, type);
@@ -2572,11 +2641,13 @@ thunar_window_action_tree_changed (GtkToggleAction *action,
/* check if we actually installed anything */
if (G_LIKELY (type != G_TYPE_NONE))
{
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* reset the state of the shortcuts pane action (without firing the handler) */
other_action = gtk_action_group_get_action (window->action_group, "view-side-pane-shortcuts");
g_signal_handlers_block_by_func (G_OBJECT (other_action), thunar_window_action_shortcuts_changed, window);
gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (other_action), FALSE);
g_signal_handlers_unblock_by_func (G_OBJECT (other_action), thunar_window_action_shortcuts_changed, window);
+G_GNUC_END_IGNORE_DEPRECATIONS
}
}
@@ -2587,12 +2658,13 @@ thunar_window_action_statusbar_changed (GtkToggleAction *action,
ThunarWindow *window)
{
gboolean active;
-
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
_thunar_return_if_fail (GTK_IS_TOGGLE_ACTION (action));
_thunar_return_if_fail (THUNAR_IS_WINDOW (window));
/* determine the new state of the action */
active = gtk_toggle_action_get_active (action);
+G_GNUC_END_IGNORE_DEPRECATIONS
/* check if we should drop the statusbar */
if (!active && window->statusbar != NULL)
@@ -2626,12 +2698,13 @@ thunar_window_action_menubar_changed (GtkToggleAction *action,
ThunarWindow *window)
{
gboolean active;
-
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
_thunar_return_if_fail (GTK_IS_TOGGLE_ACTION (action));
_thunar_return_if_fail (THUNAR_IS_WINDOW (window));
/* determine the new state of the action */
active = gtk_toggle_action_get_active (action);
+G_GNUC_END_IGNORE_DEPRECATIONS
/* show or hide the bar */
gtk_widget_set_visible (window->menubar, active);
@@ -2649,7 +2722,9 @@ thunar_window_action_zoom_in (GtkAction *action,
{
gboolean result;
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
_thunar_return_if_fail (GTK_IS_ACTION (action));
+G_GNUC_END_IGNORE_DEPRECATIONS
_thunar_return_if_fail (THUNAR_IS_WINDOW (window));
/* increase the zoom level */
@@ -2664,7 +2739,9 @@ thunar_window_action_zoom_out (GtkAction *action,
{
gboolean result;
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
_thunar_return_if_fail (GTK_IS_ACTION (action));
+G_GNUC_END_IGNORE_DEPRECATIONS
_thunar_return_if_fail (THUNAR_IS_WINDOW (window));
/* decrease the zoom level */
@@ -2679,7 +2756,9 @@ thunar_window_action_zoom_reset (GtkAction *action,
{
gboolean result;
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
_thunar_return_if_fail (GTK_IS_ACTION (action));
+G_GNUC_END_IGNORE_DEPRECATIONS
_thunar_return_if_fail (THUNAR_IS_WINDOW (window));
/* reset zoom level */
@@ -2714,12 +2793,16 @@ thunar_window_action_view_changed (GtkRadioAction *action,
/* remember the file selection */
selected_files = thunar_g_file_list_copy (thunar_component_get_selected_files (THUNAR_COMPONENT (old_view)));
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* update the UI (else GtkUIManager will crash on merging) */
gtk_ui_manager_ensure_update (window->ui_manager);
+G_GNUC_END_IGNORE_DEPRECATIONS
}
/* determine the new type of view */
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
window->view_type = view_index2type (gtk_radio_action_get_current_value (action));
+G_GNUC_END_IGNORE_DEPRECATIONS
/* always open a new directory */
if (current_directory == NULL && window->current_directory != NULL)
@@ -2917,7 +3000,9 @@ static void
thunar_window_action_open_desktop (GtkAction *action,
ThunarWindow *window)
{
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
_thunar_return_if_fail (GTK_IS_ACTION (action));
+G_GNUC_END_IGNORE_DEPRECATIONS
_thunar_return_if_fail (THUNAR_IS_WINDOW (window));
thunar_window_open_user_folder (action, window,
@@ -2940,7 +3025,9 @@ thunar_window_action_open_templates (GtkAction *action,
gboolean show_about_templates;
gboolean success;
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
_thunar_return_if_fail (GTK_IS_ACTION (action));
+G_GNUC_END_IGNORE_DEPRECATIONS
_thunar_return_if_fail (THUNAR_IS_WINDOW (window));
success = thunar_window_open_user_folder (action,window,
@@ -3050,7 +3137,9 @@ thunar_window_action_open_trash (GtkAction *action,
ThunarFile *trash_bin_file;
GError *error = NULL;
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
_thunar_return_if_fail (GTK_IS_ACTION (action));
+G_GNUC_END_IGNORE_DEPRECATIONS
_thunar_return_if_fail (THUNAR_IS_WINDOW (window));
/* determine the path to the trash bin */
@@ -3085,7 +3174,9 @@ thunar_window_action_open_network (GtkAction *action,
GError *error = NULL;
GFile *network;
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
_thunar_return_if_fail (GTK_IS_ACTION (action));
+G_GNUC_END_IGNORE_DEPRECATIONS
_thunar_return_if_fail (THUNAR_IS_WINDOW (window));
/* determine the network root location */
@@ -3190,6 +3281,7 @@ static void
thunar_window_action_show_hidden (GtkToggleAction *action,
ThunarWindow *window)
{
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
_thunar_return_if_fail (GTK_IS_TOGGLE_ACTION (action));
_thunar_return_if_fail (THUNAR_IS_WINDOW (window));
@@ -3201,6 +3293,7 @@ thunar_window_action_show_hidden (GtkToggleAction *action,
if (gtk_widget_get_visible (GTK_WIDGET (window)))
g_object_set (G_OBJECT (window->preferences), "last-show-hidden",
gtk_toggle_action_get_active (action), NULL);
+G_GNUC_END_IGNORE_DEPRECATIONS
}
@@ -3221,10 +3314,12 @@ thunar_window_current_directory_changed (ThunarFile *current_directory,
_thunar_return_if_fail (THUNAR_IS_FILE (current_directory));
_thunar_return_if_fail (window->current_directory == current_directory);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* update the "Empty Trash" action */
action = gtk_action_group_get_action (window->action_group, "empty-trash");
gtk_action_set_sensitive (action, (thunar_file_get_item_count (current_directory) > 0));
gtk_action_set_visible (action, (thunar_file_is_root (current_directory) && thunar_file_is_trashed (current_directory)));
+G_GNUC_END_IGNORE_DEPRECATIONS
/* get name of directory or full path */
g_object_get (G_OBJECT (window->preferences), "misc-full-path-in-title", &show_full_path, NULL);
@@ -3294,6 +3389,7 @@ thunar_window_menu_item_selected (GtkWidget *menu_item,
/* we can only display tooltips if we have a statusbar */
if (G_LIKELY (window->statusbar != NULL))
{
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* determine the action for the menu item */
action = gtk_activatable_get_related_action (GTK_ACTIVATABLE (menu_item));
if (G_UNLIKELY (action == NULL))
@@ -3301,6 +3397,7 @@ thunar_window_menu_item_selected (GtkWidget *menu_item,
/* determine the tooltip from the action */
tooltip = gtk_action_get_tooltip (action);
+G_GNUC_END_IGNORE_DEPRECATIONS
if (G_LIKELY (tooltip != NULL))
{
/* check if there is a new line in the tooltip */
@@ -3395,6 +3492,7 @@ thunar_window_update_custom_actions (ThunarView *view,
g_list_free (providers);
}
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* remove previously inserted menu actions from the UI manager */
if (window->custom_merge_id != 0)
{
@@ -3432,6 +3530,7 @@ thunar_window_update_custom_actions (ThunarView *view,
/* cleanup */
g_list_free (items);
}
+G_GNUC_END_IGNORE_DEPRECATIONS
}
@@ -3486,10 +3585,12 @@ thunar_window_device_pre_unmount (ThunarDeviceMonitor *device_monitor,
/* check if the file is the current directory or an ancestor of the current directory */
if (thunar_file_is_gfile_ancestor (window->current_directory, root_file))
{
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* change to the home folder */
action = gtk_action_group_get_action (window->action_group, "open-home");
if (G_LIKELY (action != NULL))
gtk_action_activate (action);
+G_GNUC_END_IGNORE_DEPRECATIONS
}
}
@@ -3716,11 +3817,13 @@ thunar_window_set_current_directory (ThunarWindow *window,
type = g_type_from_name (type_name);
}
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* activate the selected view */
action = gtk_action_group_get_action (window->action_group, "view-as-icons");
g_signal_handlers_block_by_func (action, thunar_window_action_view_changed, window);
gtk_radio_action_set_current_value (GTK_RADIO_ACTION (action), view_type2index (g_type_is_a (type, THUNAR_TYPE_VIEW) ? type : THUNAR_TYPE_ICON_VIEW));
thunar_window_action_view_changed (GTK_RADIO_ACTION (action), GTK_RADIO_ACTION (action), window);
+G_GNUC_END_IGNORE_DEPRECATIONS
g_signal_handlers_unblock_by_func (action, thunar_window_action_view_changed, window);
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list