From 476a26c5f7ecd154bd4184709d45946dba5eb218 Mon Sep 17 00:00:00 2001 From: Simon Gomizelj Date: Sat, 23 Nov 2013 20:34:40 -0500 Subject: [PATCH] disable clickable_url when no browser configured --- termite.cc | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/termite.cc b/termite.cc index e03a551..0dc0c8d 100644 --- a/termite.cc +++ b/termite.cc @@ -1172,6 +1172,20 @@ static void set_config(GtkWindow *window, VteTerminal *vte, config_info *info, info->clickable_url = cfg_bool("clickable_url", TRUE); info->size_hints = cfg_bool("size_hints", FALSE); + g_free(info->browser); + info->browser = nullptr; + + if (auto s = get_config_string(config, "options", "browser")) { + info->browser = *s; + } else { + info->browser = g_strdup(g_getenv("BROWSER")); + } + + if (!info->browser) { + g_warning("There is no browser configured, disabling clickable_url and url hints"); + info->clickable_url = false; + } + if (info->clickable_url) { info->tag = vte_terminal_match_add_gregex(vte, @@ -1186,18 +1200,6 @@ static void set_config(GtkWindow *window, VteTerminal *vte, config_info *info, info->tag = -1; } - g_free(info->browser); - info->browser = nullptr; - - if (auto s = get_config_string(config, "options", "browser")) { - info->browser = *s; - } else { - info->browser = g_strdup(g_getenv("BROWSER")); - } - - if (!info->browser) - info->clickable_url = false; - if (auto s = get_config_string(config, "options", "font")) { vte_terminal_set_font_from_string(vte, *s); g_free(*s);