[geany/geany] 215030: VTE: Don't show the various settings when VTE is disabled on the CLI

[Colomban Wendling]

Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Fri, 19 Aug 2016 23:47:30 UTC
Commit:      2150302fe6e88f88e5eba78502b478be2b78c662
             https://github.com/geany/geany/commit/2150302fe6e88f88e5eba78502b478be2b78c662

Log Message:
-----------
VTE: Don't show the various settings when VTE is disabled on the CLI


Modified Paths:
--------------
    src/keyfile.c
    src/libmain.c

Modified: src/keyfile.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -848,7 +848,7 @@ static void load_dialog_prefs(GKeyFile *config)
 	/* VTE */
 #ifdef HAVE_VTE
 	vte_info.load_vte = utils_get_setting_boolean(config, "VTE", "load_vte", TRUE);
-	if (vte_info.load_vte)
+	if (vte_info.load_vte && vte_info.have_vte /* not disabled on the cmdline */)
 	{
 		StashGroup *group;
 		struct passwd *pw = getpwuid(getuid());


Modified: src/libmain.c
5 lines changed, 5 insertions(+), 0 deletions(-)
===================================================================
@@ -866,6 +866,11 @@ static void load_session_project_file(void)
 
 static void load_settings(void)
 {
+#ifdef HAVE_VTE
+	/* initially assume we'll have VTE unless it's disabled by cmdline, to allow configuration
+	 * loading to be notified about disabled VTE on the cmdline */
+	vte_info.have_vte = !no_vte;
+#endif
 	configuration_load();
 	/* let cmdline options overwrite configuration settings */
 #ifdef HAVE_VTE



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