Branch: refs/heads/master Author: Colomban Wendling ban@herbesfolles.org Committer: Colomban Wendling ban@herbesfolles.org Date: Tue, 26 May 2015 20:49:58 UTC Commit: e12fa5d270a6f8a7093977b0df77482bb46a18a7 https://github.com/geany/geany/commit/e12fa5d270a6f8a7093977b0df77482bb46a18...
Log Message: ----------- Merge pull request #456 from techee/osx_vte_improvements
Osx vte improvements
Modified Paths: -------------- src/keyfile.c
Modified: src/keyfile.c 9 lines changed, 8 insertions(+), 1 deletions(-) =================================================================== @@ -861,6 +861,13 @@ static void load_dialog_prefs(GKeyFile *config) struct passwd *pw = getpwuid(getuid()); const gchar *shell = (pw != NULL) ? pw->pw_shell : "/bin/sh";
+#ifdef __APPLE__ + /* Geany is started using launchd on OS X and we don't get any environment variables + * so PS1 isn't defined. Start as a login shell to read the corresponding config files. */ + if (strcmp(shell, "/bin/bash") == 0) + shell = "/bin/bash -l"; +#endif + vc = g_new0(VteConfig, 1); vte_info.dir = utils_get_setting_string(config, "VTE", "last_dir", NULL); if ((vte_info.dir == NULL || utils_str_equal(vte_info.dir, "")) && pw != NULL) @@ -875,7 +882,7 @@ static void load_dialog_prefs(GKeyFile *config) "send_selection_unsafe", FALSE); 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", "Monospace 10"); + vc->font = utils_get_setting_string(config, "VTE", "font", GEANY_DEFAULT_FONT_EDITOR); vc->scroll_on_key = utils_get_setting_boolean(config, "VTE", "scroll_on_key", TRUE); vc->scroll_on_out = utils_get_setting_boolean(config, "VTE", "scroll_on_out", TRUE); vc->enable_bash_keys = utils_get_setting_boolean(config, "VTE", "enable_bash_keys", TRUE);
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).