gatuno
/
gatuno-terminal
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

terminal-window: : suppress GtkAction warnings

raveit65 2019-09-10 12:21:26 +02:00
parent 80d5ca102b
commit 6abf2d2bed
1 changed files with 88 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
src/terminal-window.c
View File

@ -569,8 +569,10 @@ terminal_set_profile_toggled_callback (GtkToggleAction *action,
TerminalWindowPrivate *priv = window->priv; TerminalWindowPrivate *priv = window->priv;
TerminalProfile *profile; TerminalProfile *profile;
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
if (!gtk_toggle_action_get_active (action)) if (!gtk_toggle_action_get_active (action))
return; return;
G_GNUC_END_IGNORE_DEPRECATIONS;
if (priv->active_screen == NULL) if (priv->active_screen == NULL)
return; return;
@ -598,7 +600,9 @@ profile_visible_name_notify_cb (TerminalProfile *profile,
visible_name = terminal_profile_get_property_string (profile, TERMINAL_PROFILE_VISIBLE_NAME); visible_name = terminal_profile_get_property_string (profile, TERMINAL_PROFILE_VISIBLE_NAME);
display_name = escape_underscores (visible_name); display_name = escape_underscores (visible_name);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
dot = strchr (gtk_action_get_name (action), '.'); dot = strchr (gtk_action_get_name (action), '.');
G_GNUC_END_IGNORE_DEPRECATIONS;
if (dot != NULL) if (dot != NULL)
{ {
char *free_me; char *free_me;
@ -633,7 +637,9 @@ disconnect_profiles_from_actions_in_group (GtkActionGroup *action_group)
{ {
GList *actions, *l; GList *actions, *l;
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
actions = gtk_action_group_list_actions (action_group); actions = gtk_action_group_list_actions (action_group);
G_GNUC_END_IGNORE_DEPRECATIONS;
for (l = actions; l != NULL; l = l->next) for (l = actions; l != NULL; l = l->next)
{ {
GObject *action = G_OBJECT (l->data); GObject *action = G_OBJECT (l->data);
@ -663,7 +669,9 @@ terminal_window_update_set_profile_menu_active_profile (TerminalWindow *window)
new_active_profile = terminal_screen_get_profile (priv->active_screen); new_active_profile = terminal_screen_get_profile (priv->active_screen);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
actions = gtk_action_group_list_actions (priv->profiles_action_group); actions = gtk_action_group_list_actions (priv->profiles_action_group);
G_GNUC_END_IGNORE_DEPRECATIONS;
for (l = actions; l != NULL; l = l->next) for (l = actions; l != NULL; l = l->next)
{ {
GObject *action = G_OBJECT (l->data); GObject *action = G_OBJECT (l->data);
@ -674,7 +682,9 @@ terminal_window_update_set_profile_menu_active_profile (TerminalWindow *window)
continue; continue;
g_signal_handlers_block_by_func (action, G_CALLBACK (terminal_set_profile_toggled_callback), window); g_signal_handlers_block_by_func (action, G_CALLBACK (terminal_set_profile_toggled_callback), window);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), TRUE); gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), TRUE);
G_GNUC_END_IGNORE_DEPRECATIONS;
g_signal_handlers_unblock_by_func (action, G_CALLBACK (terminal_set_profile_toggled_callback), window); g_signal_handlers_unblock_by_func (action, G_CALLBACK (terminal_set_profile_toggled_callback), window);
break; break;
@ -711,9 +721,11 @@ terminal_window_update_set_profile_menu (TerminalWindow *window)
profiles = terminal_app_get_profile_list (terminal_app_get ()); profiles = terminal_app_get_profile_list (terminal_app_get ());
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
action = gtk_action_group_get_action (priv->action_group, "TerminalProfiles"); action = gtk_action_group_get_action (priv->action_group, "TerminalProfiles");
single_profile = !profiles || profiles->next == NULL; /* list length <= 1 */ single_profile = !profiles || profiles->next == NULL; /* list length <= 1 */
gtk_action_set_sensitive (action, !single_profile); gtk_action_set_sensitive (action, !single_profile);
G_GNUC_END_IGNORE_DEPRECATIONS;
if (profiles == NULL) if (profiles == NULL)
return; return;
@ -722,7 +734,9 @@ terminal_window_update_set_profile_menu (TerminalWindow *window)
else else
active_profile = NULL; active_profile = NULL;
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
action_group = priv->profiles_action_group = gtk_action_group_new ("Profiles"); action_group = priv->profiles_action_group = gtk_action_group_new ("Profiles");
G_GNUC_END_IGNORE_DEPRECATIONS;
gtk_ui_manager_insert_action_group (priv->ui_manager, action_group, -1); gtk_ui_manager_insert_action_group (priv->ui_manager, action_group, -1);
g_object_unref (action_group); g_object_unref (action_group);
@ -738,6 +752,7 @@ terminal_window_update_set_profile_menu (TerminalWindow *window)
g_snprintf (name, sizeof (name), "TerminalSetProfile%u", n++); g_snprintf (name, sizeof (name), "TerminalSetProfile%u", n++);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
profile_action = gtk_radio_action_new (name, profile_action = gtk_radio_action_new (name,
NULL, NULL,
NULL, NULL,
@ -749,6 +764,7 @@ terminal_window_update_set_profile_menu (TerminalWindow *window)
if (profile == active_profile) if (profile == active_profile)
gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (profile_action), TRUE); gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (profile_action), TRUE);
G_GNUC_END_IGNORE_DEPRECATIONS;
g_object_set_data_full (G_OBJECT (profile_action), g_object_set_data_full (G_OBJECT (profile_action),
PROFILE_DATA_KEY, PROFILE_DATA_KEY,
@ -760,7 +776,9 @@ terminal_window_update_set_profile_menu (TerminalWindow *window)
g_signal_connect (profile_action, "toggled", g_signal_connect (profile_action, "toggled",
G_CALLBACK (terminal_set_profile_toggled_callback), window); G_CALLBACK (terminal_set_profile_toggled_callback), window);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
gtk_action_group_add_action (action_group, GTK_ACTION (profile_action)); gtk_action_group_add_action (action_group, GTK_ACTION (profile_action));
G_GNUC_END_IGNORE_DEPRECATIONS;
g_object_unref (profile_action); g_object_unref (profile_action);
gtk_ui_manager_add_ui (priv->ui_manager, priv->profiles_ui_id, gtk_ui_manager_add_ui (priv->ui_manager, priv->profiles_ui_id,
@ -786,7 +804,9 @@ terminal_window_create_new_terminal_action (TerminalWindow *window,
TerminalWindowPrivate *priv = window->priv; TerminalWindowPrivate *priv = window->priv;
GtkAction *action; GtkAction *action;
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
action = gtk_action_new (name, NULL, NULL, NULL); action = gtk_action_new (name, NULL, NULL, NULL);
G_GNUC_END_IGNORE_DEPRECATIONS;
g_object_set_data_full (G_OBJECT (action), g_object_set_data_full (G_OBJECT (action),
PROFILE_DATA_KEY, PROFILE_DATA_KEY,
@ -797,7 +817,9 @@ terminal_window_create_new_terminal_action (TerminalWindow *window,
G_CALLBACK (profile_visible_name_notify_cb), action); G_CALLBACK (profile_visible_name_notify_cb), action);
g_signal_connect (action, "activate", callback, window); g_signal_connect (action, "activate", callback, window);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
gtk_action_group_add_action (priv->new_terminal_action_group, action); gtk_action_group_add_action (priv->new_terminal_action_group, action);
G_GNUC_END_IGNORE_DEPRECATIONS;
g_object_unref (action); g_object_unref (action);
} }
@ -829,10 +851,12 @@ terminal_window_update_new_terminal_menus (TerminalWindow *window)
profiles = terminal_app_get_profile_list (terminal_app_get ()); profiles = terminal_app_get_profile_list (terminal_app_get ());
have_single_profile = !profiles || !profiles->next; have_single_profile = !profiles || !profiles->next;
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
action = gtk_action_group_get_action (priv->action_group, "FileNewTab"); action = gtk_action_group_get_action (priv->action_group, "FileNewTab");
gtk_action_set_visible (action, have_single_profile); gtk_action_set_visible (action, have_single_profile);
action = gtk_action_group_get_action (priv->action_group, "FileNewWindow"); action = gtk_action_group_get_action (priv->action_group, "FileNewWindow");
gtk_action_set_visible (action, have_single_profile); gtk_action_set_visible (action, have_single_profile);
G_GNUC_END_IGNORE_DEPRECATIONS;
if (have_single_profile) if (have_single_profile)
{ {
@ -842,7 +866,9 @@ terminal_window_update_new_terminal_menus (TerminalWindow *window)
/* Now build the submenus */ /* Now build the submenus */
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
action_group = priv->new_terminal_action_group = gtk_action_group_new ("NewTerminal"); action_group = priv->new_terminal_action_group = gtk_action_group_new ("NewTerminal");
G_GNUC_END_IGNORE_DEPRECATIONS;
gtk_ui_manager_insert_action_group (priv->ui_manager, action_group, -1); gtk_ui_manager_insert_action_group (priv->ui_manager, action_group, -1);
g_object_unref (action_group); g_object_unref (action_group);
@ -891,8 +917,10 @@ terminal_set_encoding_callback (GtkToggleAction *action,
TerminalWindowPrivate *priv = window->priv; TerminalWindowPrivate *priv = window->priv;
TerminalEncoding *encoding; TerminalEncoding *encoding;
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
if (!gtk_toggle_action_get_active (action)) if (!gtk_toggle_action_get_active (action))
return; return;
G_GNUC_END_IGNORE_DEPRECATIONS;
if (priv->active_screen == NULL) if (priv->active_screen == NULL)
return; return;
@ -930,7 +958,9 @@ terminal_window_update_encoding_menu (TerminalWindow *window)
priv->encodings_action_group = NULL; priv->encodings_action_group = NULL;
} }
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
action_group = priv->encodings_action_group = gtk_action_group_new ("Encodings"); action_group = priv->encodings_action_group = gtk_action_group_new ("Encodings");
G_GNUC_END_IGNORE_DEPRECATIONS;
gtk_ui_manager_insert_action_group (priv->ui_manager, action_group, -1); gtk_ui_manager_insert_action_group (priv->ui_manager, action_group, -1);
g_object_unref (action_group); g_object_unref (action_group);
@ -961,6 +991,7 @@ terminal_window_update_encoding_menu (TerminalWindow *window)
g_snprintf (name, sizeof (name), SET_ENCODING_ACTION_NAME_PREFIX "%s", terminal_encoding_get_id (e)); g_snprintf (name, sizeof (name), SET_ENCODING_ACTION_NAME_PREFIX "%s", terminal_encoding_get_id (e));
display_name = g_strdup_printf ("%s (%s)", e->name, terminal_encoding_get_charset (e)); display_name = g_strdup_printf ("%s (%s)", e->name, terminal_encoding_get_charset (e));
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
encoding_action = gtk_radio_action_new (name, encoding_action = gtk_radio_action_new (name,
display_name, display_name,
NULL, NULL,
@ -973,6 +1004,7 @@ terminal_window_update_encoding_menu (TerminalWindow *window)
if (charset && strcmp (terminal_encoding_get_id (e), charset) == 0) if (charset && strcmp (terminal_encoding_get_id (e), charset) == 0)
gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (encoding_action), TRUE); gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (encoding_action), TRUE);
G_GNUC_END_IGNORE_DEPRECATIONS;
g_signal_connect (encoding_action, "toggled", g_signal_connect (encoding_action, "toggled",
G_CALLBACK (terminal_set_encoding_callback), window); G_CALLBACK (terminal_set_encoding_callback), window);
@ -981,7 +1013,9 @@ terminal_window_update_encoding_menu (TerminalWindow *window)
terminal_encoding_ref (e), terminal_encoding_ref (e),
(GDestroyNotify) terminal_encoding_unref); (GDestroyNotify) terminal_encoding_unref);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
gtk_action_group_add_action (action_group, GTK_ACTION (encoding_action)); gtk_action_group_add_action (action_group, GTK_ACTION (encoding_action));
G_GNUC_END_IGNORE_DEPRECATIONS;
g_object_unref (encoding_action); g_object_unref (encoding_action);
gtk_ui_manager_add_ui (priv->ui_manager, priv->encodings_ui_id, gtk_ui_manager_add_ui (priv->ui_manager, priv->encodings_ui_id,
@ -1008,12 +1042,16 @@ terminal_window_update_encoding_menu_active_encoding (TerminalWindow *window)
g_snprintf (name, sizeof (name), SET_ENCODING_ACTION_NAME_PREFIX "%s", g_snprintf (name, sizeof (name), SET_ENCODING_ACTION_NAME_PREFIX "%s",
vte_terminal_get_encoding (VTE_TERMINAL (priv->active_screen))); vte_terminal_get_encoding (VTE_TERMINAL (priv->active_screen)));
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
action = gtk_action_group_get_action (priv->encodings_action_group, name); action = gtk_action_group_get_action (priv->encodings_action_group, name);
G_GNUC_END_IGNORE_DEPRECATIONS;
if (!action) if (!action)
return; return;
g_signal_handlers_block_by_func (action, G_CALLBACK (terminal_set_encoding_callback), window); g_signal_handlers_block_by_func (action, G_CALLBACK (terminal_set_encoding_callback), window);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), TRUE); gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), TRUE);
G_GNUC_END_IGNORE_DEPRECATIONS;
g_signal_handlers_unblock_by_func (action, G_CALLBACK (terminal_set_encoding_callback), window); g_signal_handlers_unblock_by_func (action, G_CALLBACK (terminal_set_encoding_callback), window);
} }
@ -1029,7 +1067,9 @@ terminal_size_to_cb (GtkAction *action,
if (priv->active_screen == NULL) if (priv->active_screen == NULL)
return; return;
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
name = gtk_action_get_name (action) + strlen (SIZE_TO_ACTION_NAME_PREFIX); name = gtk_action_get_name (action) + strlen (SIZE_TO_ACTION_NAME_PREFIX);
G_GNUC_END_IGNORE_DEPRECATIONS;
width = g_ascii_strtoull (name, &end, 10); width = g_ascii_strtoull (name, &end, 10);
g_assert (end && *end == 'x'); g_assert (end && *end == 'x');
height = g_ascii_strtoull (end + 1, &end, 10); height = g_ascii_strtoull (end + 1, &end, 10);
@ -1077,13 +1117,17 @@ terminal_window_update_size_to_menu (TerminalWindow *window)
*/ */
display_name = g_strdup_printf ("_%u. %ux%u", i + 1, grid_width, grid_height); display_name = g_strdup_printf ("_%u. %ux%u", i + 1, grid_width, grid_height);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
action = gtk_action_new (name, display_name, NULL, NULL); action = gtk_action_new (name, display_name, NULL, NULL);
G_GNUC_END_IGNORE_DEPRECATIONS;
g_free (display_name); g_free (display_name);
g_signal_connect (action, "activate", g_signal_connect (action, "activate",
G_CALLBACK (terminal_size_to_cb), window); G_CALLBACK (terminal_size_to_cb), window);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
gtk_action_group_add_action (priv->action_group, action); gtk_action_group_add_action (priv->action_group, action);
G_GNUC_END_IGNORE_DEPRECATIONS;
g_object_unref (action); g_object_unref (action);
gtk_ui_manager_add_ui (priv->ui_manager, priv->ui_id, gtk_ui_manager_add_ui (priv->ui_manager, priv->ui_id,
@ -1108,8 +1152,10 @@ terminal_window_update_copy_sensitivity (TerminalScreen *screen,
can_copy = vte_terminal_get_has_selection (VTE_TERMINAL (screen)); can_copy = vte_terminal_get_has_selection (VTE_TERMINAL (screen));
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
action = gtk_action_group_get_action (priv->action_group, "EditCopy"); action = gtk_action_group_get_action (priv->action_group, "EditCopy");
gtk_action_set_sensitive (action, can_copy); gtk_action_set_sensitive (action, can_copy);
G_GNUC_END_IGNORE_DEPRECATIONS;
if (can_copy && priv->copy_selection) if (can_copy && priv->copy_selection)
#if VTE_CHECK_VERSION (0, 50, 0) #if VTE_CHECK_VERSION (0, 50, 0)
@ -1133,10 +1179,12 @@ terminal_window_update_zoom_sensitivity (TerminalWindow *window)
current = terminal_screen_get_font_scale (screen); current = terminal_screen_get_font_scale (screen);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
action = gtk_action_group_get_action (priv->action_group, "ViewZoomOut"); action = gtk_action_group_get_action (priv->action_group, "ViewZoomOut");
gtk_action_set_sensitive (action, find_smaller_zoom_factor (current, &zoom)); gtk_action_set_sensitive (action, find_smaller_zoom_factor (current, &zoom));
action = gtk_action_group_get_action (priv->action_group, "ViewZoomIn"); action = gtk_action_group_get_action (priv->action_group, "ViewZoomIn");
gtk_action_set_sensitive (action, find_larger_zoom_factor (current, &zoom)); gtk_action_set_sensitive (action, find_larger_zoom_factor (current, &zoom));
G_GNUC_END_IGNORE_DEPRECATIONS;
} }
static void static void
@ -1152,12 +1200,14 @@ terminal_window_update_search_sensitivity (TerminalScreen *screen,
can_search = vte_terminal_search_get_regex (VTE_TERMINAL (screen)) != NULL; can_search = vte_terminal_search_get_regex (VTE_TERMINAL (screen)) != NULL;
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
action = gtk_action_group_get_action (priv->action_group, "SearchFindNext"); action = gtk_action_group_get_action (priv->action_group, "SearchFindNext");
gtk_action_set_sensitive (action, can_search); gtk_action_set_sensitive (action, can_search);
action = gtk_action_group_get_action (priv->action_group, "SearchFindPrevious"); action = gtk_action_group_get_action (priv->action_group, "SearchFindPrevious");
gtk_action_set_sensitive (action, can_search); gtk_action_set_sensitive (action, can_search);
action = gtk_action_group_get_action (priv->action_group, "SearchClearHighlight"); action = gtk_action_group_get_action (priv->action_group, "SearchClearHighlight");
gtk_action_set_sensitive (action, can_search); gtk_action_set_sensitive (action, can_search);
G_GNUC_END_IGNORE_DEPRECATIONS;
} }
static void static void
@ -1173,11 +1223,13 @@ update_edit_menu_cb (GtkClipboard *clipboard,
can_paste = targets != NULL && gtk_targets_include_text (targets, n_targets); can_paste = targets != NULL && gtk_targets_include_text (targets, n_targets);
can_paste_uris = targets != NULL && gtk_targets_include_uri (targets, n_targets); can_paste_uris = targets != NULL && gtk_targets_include_uri (targets, n_targets);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
action = gtk_action_group_get_action (priv->action_group, "EditPaste"); action = gtk_action_group_get_action (priv->action_group, "EditPaste");
gtk_action_set_sensitive (action, can_paste); gtk_action_set_sensitive (action, can_paste);
action = gtk_action_group_get_action (priv->action_group, "EditPasteURIPaths"); action = gtk_action_group_get_action (priv->action_group, "EditPasteURIPaths");
gtk_action_set_visible (action, can_paste_uris); gtk_action_set_visible (action, can_paste_uris);
gtk_action_set_sensitive (action, can_paste_uris); gtk_action_set_sensitive (action, can_paste_uris);
G_GNUC_END_IGNORE_DEPRECATIONS;
/* Ref was added in gtk_clipboard_request_targets below */ /* Ref was added in gtk_clipboard_request_targets below */
g_object_unref (window); g_object_unref (window);
@ -1237,6 +1289,7 @@ terminal_window_update_tabs_menu_sensitivity (TerminalWindow *window)
not_last = page_num + 1 < num_pages; not_last = page_num + 1 < num_pages;
/* Hide the tabs menu in single-tab windows */ /* Hide the tabs menu in single-tab windows */
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
action = gtk_action_group_get_action (action_group, "Tabs"); action = gtk_action_group_get_action (action_group, "Tabs");
gtk_action_set_visible (action, num_pages > 1); gtk_action_set_visible (action, num_pages > 1);
@ -1267,6 +1320,7 @@ terminal_window_update_tabs_menu_sensitivity (TerminalWindow *window)
gtk_action_set_sensitive (action, num_pages > 1); gtk_action_set_sensitive (action, num_pages > 1);
action = gtk_action_group_get_action (action_group, "FileCloseTab"); action = gtk_action_group_get_action (action_group, "FileCloseTab");
gtk_action_set_sensitive (action, num_pages > 1); gtk_action_set_sensitive (action, num_pages > 1);
G_GNUC_END_IGNORE_DEPRECATIONS;
} }
static void static void
@ -1446,6 +1500,7 @@ popup_clipboard_targets_received_cb (GtkClipboard *clipboard,
show_email_link = info->string != NULL && info->flavour == FLAVOR_EMAIL; show_email_link = info->string != NULL && info->flavour == FLAVOR_EMAIL;
show_call_link = info->string != NULL && info->flavour == FLAVOR_VOIP_CALL; show_call_link = info->string != NULL && info->flavour == FLAVOR_VOIP_CALL;
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
action = gtk_action_group_get_action (priv->action_group, "PopupSendEmail"); action = gtk_action_group_get_action (priv->action_group, "PopupSendEmail");
gtk_action_set_visible (action, show_email_link); gtk_action_set_visible (action, show_email_link);
action = gtk_action_group_get_action (priv->action_group, "PopupCopyEmailAddress"); action = gtk_action_group_get_action (priv->action_group, "PopupCopyEmailAddress");
@ -1470,21 +1525,26 @@ popup_clipboard_targets_received_cb (GtkClipboard *clipboard,
gtk_action_set_sensitive (action, can_paste); gtk_action_set_sensitive (action, can_paste);
action = gtk_action_group_get_action (priv->action_group, "PopupPasteURIPaths"); action = gtk_action_group_get_action (priv->action_group, "PopupPasteURIPaths");
gtk_action_set_visible (action, can_paste_uris); gtk_action_set_visible (action, can_paste_uris);
G_GNUC_END_IGNORE_DEPRECATIONS;
g_object_get (gtk_widget_get_settings (GTK_WIDGET (window)), g_object_get (gtk_widget_get_settings (GTK_WIDGET (window)),
"gtk-show-input-method-menu", &show_input_method_menu, "gtk-show-input-method-menu", &show_input_method_menu,
NULL); NULL);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
action = gtk_action_group_get_action (priv->action_group, "PopupInputMethods"); action = gtk_action_group_get_action (priv->action_group, "PopupInputMethods");
gtk_action_set_visible (action, show_input_method_menu); gtk_action_set_visible (action, show_input_method_menu);
G_GNUC_END_IGNORE_DEPRECATIONS;
popup_menu = gtk_ui_manager_get_widget (priv->ui_manager, "/Popup"); popup_menu = gtk_ui_manager_get_widget (priv->ui_manager, "/Popup");
g_signal_connect (popup_menu, "deactivate", g_signal_connect (popup_menu, "deactivate",
G_CALLBACK (popup_menu_deactivate_callback), window); G_CALLBACK (popup_menu_deactivate_callback), window);
/* Pseudo activation of the popup menu's action */ /* Pseudo activation of the popup menu's action */
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
action = gtk_action_group_get_action (priv->action_group, "Popup"); action = gtk_action_group_get_action (priv->action_group, "Popup");
gtk_action_activate (action); gtk_action_activate (action);
G_GNUC_END_IGNORE_DEPRECATIONS;
if (info->button == 0) if (info->button == 0)
gtk_menu_shell_select_first (GTK_MENU_SHELL (popup_menu), FALSE); gtk_menu_shell_select_first (GTK_MENU_SHELL (popup_menu), FALSE);
@ -1707,11 +1767,13 @@ terminal_window_state_event (GtkWidget *widget,
is_fullscreen = (event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN) != 0; is_fullscreen = (event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN) != 0;
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
action = gtk_action_group_get_action (priv->action_group, "ViewFullscreen"); action = gtk_action_group_get_action (priv->action_group, "ViewFullscreen");
gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), is_fullscreen); gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), is_fullscreen);
action = gtk_action_group_get_action (priv->action_group, "PopupLeaveFullscreen"); action = gtk_action_group_get_action (priv->action_group, "PopupLeaveFullscreen");
gtk_action_set_visible (action, is_fullscreen); gtk_action_set_visible (action, is_fullscreen);
G_GNUC_END_IGNORE_DEPRECATIONS;
} }
if (window_state_event) if (window_state_event)
@ -1731,8 +1793,10 @@ terminal_window_window_manager_changed_cb (GdkScreen *screen,
supports_fs = gdk_x11_screen_supports_net_wm_hint (screen, gdk_atom_intern ("_NET_WM_STATE_FULLSCREEN", FALSE)); supports_fs = gdk_x11_screen_supports_net_wm_hint (screen, gdk_atom_intern ("_NET_WM_STATE_FULLSCREEN", FALSE));
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
action = gtk_action_group_get_action (priv->action_group, "ViewFullscreen"); action = gtk_action_group_get_action (priv->action_group, "ViewFullscreen");
gtk_action_set_sensitive (action, supports_fs); gtk_action_set_sensitive (action, supports_fs);
G_GNUC_END_IGNORE_DEPRECATIONS;
} }
#endif #endif
@ -2210,6 +2274,7 @@ terminal_window_init (TerminalWindow *window)
/* Create the actions */ /* Create the actions */
/* Note that this action group name is used in terminal-accels.c; do not change it */ /* Note that this action group name is used in terminal-accels.c; do not change it */
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
priv->action_group = action_group = gtk_action_group_new ("Main"); priv->action_group = action_group = gtk_action_group_new ("Main");
gtk_action_group_set_translation_domain (action_group, NULL); gtk_action_group_set_translation_domain (action_group, NULL);
gtk_action_group_add_actions (action_group, menu_entries, gtk_action_group_add_actions (action_group, menu_entries,
@ -2218,6 +2283,7 @@ terminal_window_init (TerminalWindow *window)
toggle_menu_entries, toggle_menu_entries,
G_N_ELEMENTS (toggle_menu_entries), G_N_ELEMENTS (toggle_menu_entries),
window); window);
G_GNUC_END_IGNORE_DEPRECATIONS;
gtk_ui_manager_insert_action_group (manager, action_group, 0); gtk_ui_manager_insert_action_group (manager, action_group, 0);
g_object_unref (action_group); g_object_unref (action_group);
@ -2226,6 +2292,7 @@ terminal_window_init (TerminalWindow *window)
G_CALLBACK (update_edit_menu), window); G_CALLBACK (update_edit_menu), window);
update_edit_menu (window); update_edit_menu (window);
/* Idem for this action, since the window is not fullscreen. */ /* Idem for this action, since the window is not fullscreen. */
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
action = gtk_action_group_get_action (priv->action_group, "PopupLeaveFullscreen"); action = gtk_action_group_get_action (priv->action_group, "PopupLeaveFullscreen");
gtk_action_set_visible (action, FALSE); gtk_action_set_visible (action, FALSE);
@ -2233,6 +2300,7 @@ terminal_window_init (TerminalWindow *window)
action = gtk_action_group_get_action (priv->action_group, "FileSaveContents"); action = gtk_action_group_get_action (priv->action_group, "FileSaveContents");
gtk_action_set_visible (action, FALSE); gtk_action_set_visible (action, FALSE);
#endif #endif
G_GNUC_END_IGNORE_DEPRECATIONS;
/* Load the UI */ /* Load the UI */
error = NULL; error = NULL;
@ -2671,8 +2739,10 @@ terminal_window_set_menubar_visible (TerminalWindow *window,
priv->menubar_visible = setting; priv->menubar_visible = setting;
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
action = gtk_action_group_get_action (priv->action_group, "ViewMenubar"); action = gtk_action_group_get_action (priv->action_group, "ViewMenubar");
gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), setting); gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), setting);
G_GNUC_END_IGNORE_DEPRECATIONS;
g_object_set (priv->menubar, "visible", setting, NULL); g_object_set (priv->menubar, "visible", setting, NULL);
@ -2917,8 +2987,10 @@ notebook_button_press_cb (GtkWidget *widget,
/* switch to the page the mouse is over */ /* switch to the page the mouse is over */
gtk_notebook_set_current_page (notebook, tab_clicked); gtk_notebook_set_current_page (notebook, tab_clicked);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
action = gtk_action_group_get_action (priv->action_group, "NotebookPopup"); action = gtk_action_group_get_action (priv->action_group, "NotebookPopup");
gtk_action_activate (action); gtk_action_activate (action);
G_GNUC_END_IGNORE_DEPRECATIONS;
menu = gtk_ui_manager_get_widget (priv->ui_manager, "/NotebookPopup"); menu = gtk_ui_manager_get_widget (priv->ui_manager, "/NotebookPopup");
if (gtk_menu_get_attach_widget (GTK_MENU (menu))) if (gtk_menu_get_attach_widget (GTK_MENU (menu)))
@ -2985,8 +3057,10 @@ notebook_popup_menu_cb (GtkWidget *widget,
tab = gtk_notebook_get_nth_page (notebook, page_num); tab = gtk_notebook_get_nth_page (notebook, page_num);
tab_label = gtk_notebook_get_tab_label (notebook, tab); tab_label = gtk_notebook_get_tab_label (notebook, tab);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
action = gtk_action_group_get_action (priv->action_group, "NotebookPopup"); action = gtk_action_group_get_action (priv->action_group, "NotebookPopup");
gtk_action_activate (action); gtk_action_activate (action);
G_GNUC_END_IGNORE_DEPRECATIONS;
menu = gtk_ui_manager_get_widget (priv->ui_manager, "/NotebookPopup"); menu = gtk_ui_manager_get_widget (priv->ui_manager, "/NotebookPopup");
if (gtk_menu_get_attach_widget (GTK_MENU (menu))) if (gtk_menu_get_attach_widget (GTK_MENU (menu)))
@ -3786,7 +3860,9 @@ edit_paste_callback (GtkAction *action,
return; return;
clipboard = gtk_widget_get_clipboard (GTK_WIDGET (window), GDK_SELECTION_CLIPBOARD); clipboard = gtk_widget_get_clipboard (GTK_WIDGET (window), GDK_SELECTION_CLIPBOARD);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
name = gtk_action_get_name (action); name = gtk_action_get_name (action);
G_GNUC_END_IGNORE_DEPRECATIONS;
data = g_slice_new (PasteData); data = g_slice_new (PasteData);
data->screen = g_object_ref (priv->active_screen); data->screen = g_object_ref (priv->active_screen);
@ -3852,16 +3928,23 @@ static void
view_menubar_toggled_callback (GtkToggleAction *action, view_menubar_toggled_callback (GtkToggleAction *action,
TerminalWindow *window) TerminalWindow *window)
{ {
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
terminal_window_set_menubar_visible (window, gtk_toggle_action_get_active (action)); terminal_window_set_menubar_visible (window, gtk_toggle_action_get_active (action));
G_GNUC_END_IGNORE_DEPRECATIONS;
} }
static void static void
view_fullscreen_toggled_callback (GtkToggleAction *action, view_fullscreen_toggled_callback (GtkToggleAction *action,
TerminalWindow *window) TerminalWindow *window)
{ {
gboolean toggle_action_check;
g_return_if_fail (gtk_widget_get_realized (GTK_WIDGET (window))); g_return_if_fail (gtk_widget_get_realized (GTK_WIDGET (window)));
if (gtk_toggle_action_get_active (action)) G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
toggle_action_check = gtk_toggle_action_get_active (action);
G_GNUC_END_IGNORE_DEPRECATIONS;
if (toggle_action_check)
gtk_window_fullscreen (GTK_WINDOW (window)); gtk_window_fullscreen (GTK_WINDOW (window));
else else
gtk_window_unfullscreen (GTK_WINDOW (window)); gtk_window_unfullscreen (GTK_WINDOW (window));
@ -4083,7 +4166,9 @@ terminal_next_or_previous_profile_cb (GtkAction *action,
const char *name; const char *name;
guint backwards = 0; guint backwards = 0;
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
name = gtk_action_get_name (action); name = gtk_action_get_name (action);
G_GNUC_END_IGNORE_DEPRECATIONS;
if (strcmp (name, "ProfilePrevious") == 0) if (strcmp (name, "ProfilePrevious") == 0)
{ {
backwards = 1; backwards = 1;
@ -4241,7 +4326,9 @@ tabs_next_or_previous_tab_cb (GtkAction *action,
const char *name; const char *name;
guint keyval = 0; guint keyval = 0;
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
name = gtk_action_get_name (action); name = gtk_action_get_name (action);
G_GNUC_END_IGNORE_DEPRECATIONS;
if (strcmp (name, "TabsNext") == 0) if (strcmp (name, "TabsNext") == 0)
{ {
keyval = GDK_KEY_Page_Down; keyval = GDK_KEY_Page_Down;