[geany/geany] f789aa: VTE: drop support for selecting the emulated terminal

[Colomban Wendling]

Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Sat, 29 Oct 2016 14:09:04 UTC
Commit:      f789aa138d1f43532998bfc61c642f9abd64ff0f
             https://github.com/geany/geany/commit/f789aa138d1f43532998bfc61c642f9abd64ff0f

Log Message:
-----------
VTE: drop support for selecting the emulated terminal

VTE 0.38 dropped the capability to emulate various terminals to only
support xterm.  This shouldn't be so much of a problem for us, as our
setting to select the emulated terminal is hidden since 2008 and
defaults to xterm since forever, and xterm is highly compatible.


Modified Paths:
--------------
    doc/geany.txt
    src/keyfile.c
    src/vte.c
    src/vte.h

Modified: doc/geany.txt
3 lines changed, 0 insertions(+), 3 deletions(-)
===================================================================
@@ -2554,9 +2554,6 @@ msgwin_messages_visible           Whether to show the Messages tab in the      t
 msgwin_scribble_visible           Whether to show the Scribble tab in the      true        immediately
                                   Messages Window
 **VTE related**
-emulation                         Terminal emulation mode. Only change this    xterm       immediately
-                                  if you have VTE termcap files other than
-                                  ``vte/termcap/xterm``.
 send_selection_unsafe             By default, Geany strips any trailing        false       immediately
                                   newline characters from the current
                                   selection before sending it to the terminal


Modified: src/keyfile.c
3 lines changed, 0 insertions(+), 3 deletions(-)
===================================================================
@@ -524,8 +524,6 @@ static void save_dialog_prefs(GKeyFile *config)
 	{
 		gchar *tmp_string;
 
-		if (!g_key_file_has_key(config, "VTE", "emulation", NULL))	/* hidden */
-			g_key_file_set_string(config, "VTE", "emulation", vc->emulation);
 		g_key_file_set_string(config, "VTE", "font", vc->font);
 		g_key_file_set_boolean(config, "VTE", "scroll_on_key", vc->scroll_on_key);
 		g_key_file_set_boolean(config, "VTE", "scroll_on_out", vc->scroll_on_out);
@@ -881,7 +879,6 @@ static void load_dialog_prefs(GKeyFile *config)
 			/* fallback to root */
 			vte_info.dir = g_strdup("/");
 
-		vc->emulation = utils_get_setting_string(config, "VTE", "emulation", "xterm");
 		vc->image = utils_get_setting_string(config, "VTE", "image", "");
 		vc->shell = utils_get_setting_string(config, "VTE", "shell", shell);
 		vc->font = utils_get_setting_string(config, "VTE", "font", GEANY_DEFAULT_FONT_EDITOR);


Modified: src/vte.c
4 lines changed, 0 insertions(+), 4 deletions(-)
===================================================================
@@ -108,7 +108,6 @@ struct VteFunctions
 	gboolean (*vte_terminal_get_has_selection) (VteTerminal *terminal);
 	void (*vte_terminal_copy_clipboard) (VteTerminal *terminal);
 	void (*vte_terminal_paste_clipboard) (VteTerminal *terminal);
-	void (*vte_terminal_set_emulation) (VteTerminal *terminal, const gchar *emulation);
 	void (*vte_terminal_set_color_foreground) (VteTerminal *terminal, const GdkColor *foreground);
 	void (*vte_terminal_set_color_bold) (VteTerminal *terminal, const GdkColor *foreground);
 	void (*vte_terminal_set_color_background) (VteTerminal *terminal, const GdkColor *background);
@@ -345,7 +344,6 @@ void vte_close(void)
 	gtk_widget_destroy(vc->vte);
 	gtk_widget_destroy(vc->menu);
 	g_object_unref(vc->menu);
-	g_free(vc->emulation);
 	g_free(vc->shell);
 	g_free(vc->image);
 	g_free(vc->font);
@@ -517,7 +515,6 @@ static gboolean vte_register_symbols(GModule *mod)
 	BIND_REQUIRED_SYMBOL(vte_terminal_get_has_selection);
 	BIND_REQUIRED_SYMBOL(vte_terminal_copy_clipboard);
 	BIND_REQUIRED_SYMBOL(vte_terminal_paste_clipboard);
-	BIND_REQUIRED_SYMBOL(vte_terminal_set_emulation);
 	BIND_REQUIRED_SYMBOL(vte_terminal_set_color_foreground);
 	BIND_REQUIRED_SYMBOL(vte_terminal_set_color_bold);
 	BIND_REQUIRED_SYMBOL(vte_terminal_set_color_background);
@@ -551,7 +548,6 @@ void vte_apply_user_settings(void)
 	vf->vte_terminal_set_scrollback_lines(VTE_TERMINAL(vc->vte), vc->scrollback_lines);
 	vf->vte_terminal_set_scroll_on_keystroke(VTE_TERMINAL(vc->vte), vc->scroll_on_key);
 	vf->vte_terminal_set_scroll_on_output(VTE_TERMINAL(vc->vte), vc->scroll_on_out);
-	vf->vte_terminal_set_emulation(VTE_TERMINAL(vc->vte), vc->emulation);
 	font_desc = pango_font_description_from_string(vc->font);
 	vf->vte_terminal_set_font(VTE_TERMINAL(vc->vte), font_desc);
 	pango_font_description_free(font_desc);


Modified: src/vte.h
1 lines changed, 0 insertions(+), 1 deletions(-)
===================================================================
@@ -56,7 +56,6 @@ typedef struct
 	gboolean cursor_blinks;
 	gboolean send_selection_unsafe;
 	gint scrollback_lines;
-	gchar *emulation;
 	gchar *shell;
 	gchar *image;
 	gchar *font;



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).