Branch: refs/heads/master Author: Jiří Techet techet@gmail.com Committer: Jiří Techet techet@gmail.com Date: Mon, 09 Oct 2023 18:12:33 UTC Commit: afb66ce5d1a3ceee8e9a177ecb76b4f0a530d6c9 https://github.com/geany/geany/commit/afb66ce5d1a3ceee8e9a177ecb76b4f0a530d6...
Log Message: ----------- VTE cleanup related to GTK 3.24 requirement
The patch bumping the requirement to 3.24 always sets
vte_config.im_submenu = NULL;
so some code isn't executed and needed any more.
Modified Paths: -------------- src/vte.c src/vte.h
Modified: src/vte.c 7 lines changed, 0 insertions(+), 7 deletions(-) =================================================================== @@ -124,7 +124,6 @@ struct VteFunctions void (*vte_terminal_set_color_bold) (VteTerminal *terminal, const GdkColor *foreground); void (*vte_terminal_set_color_background) (VteTerminal *terminal, const GdkColor *background); void (*vte_terminal_feed_child) (VteTerminal *terminal, const char *data, glong length); - void (*vte_terminal_im_append_menuitems) (VteTerminal *terminal, GtkMenuShell *menushell); void (*vte_terminal_set_cursor_blink_mode) (VteTerminal *terminal, VteTerminalCursorBlinkMode mode); void (*vte_terminal_set_cursor_blinks) (VteTerminal *terminal, gboolean blink); @@ -323,9 +322,6 @@ static void on_vte_realize(void) { /* the vte widget has to be realised before color changes take effect */ vte_apply_user_settings(); - - if (vf->vte_terminal_im_append_menuitems && vte_config.im_submenu) - vf->vte_terminal_im_append_menuitems(VTE_TERMINAL(vte_config.vte), GTK_MENU_SHELL(vte_config.im_submenu)); }
@@ -619,7 +615,6 @@ static gboolean vte_register_symbols(GModule *mod) BIND_REQUIRED_SYMBOL(vte_terminal_set_color_background); } BIND_REQUIRED_SYMBOL(vte_terminal_feed_child); - BIND_SYMBOL(vte_terminal_im_append_menuitems); if (! BIND_SYMBOL(vte_terminal_set_cursor_blink_mode)) /* vte_terminal_set_cursor_blink_mode() is only available since 0.17.1, so if we don't find * this symbol, we are probably on an older version and use the old API instead */ @@ -772,8 +767,6 @@ static GtkWidget *vte_create_popup_menu(void)
msgwin_menu_add_common_items(GTK_MENU(menu));
- vte_config.im_submenu = NULL; - return menu; }
Modified: src/vte.h 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -44,7 +44,6 @@ typedef struct { GtkWidget *vte; GtkWidget *menu; - GtkWidget *im_submenu; gboolean scroll_on_key; gboolean scroll_on_out; gboolean ignore_menu_bar_accel;
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).