From 96c877de80f5f208a41ba775c2dd13746a09d7fd Mon Sep 17 00:00:00 2001 From: Pierre Mazière Date: Sun, 7 Jun 2020 22:18:43 +0200 Subject: Refactor cmd_urlopen MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Pierre Mazière --- src/command/cmd_funcs.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/command/cmd_funcs.c b/src/command/cmd_funcs.c index 1c13d12f..03d60dbf 100644 --- a/src/command/cmd_funcs.c +++ b/src/command/cmd_funcs.c @@ -8939,27 +8939,27 @@ cmd_slashguard(ProfWin *window, const char *const command, gchar **args) gboolean cmd_urlopen(ProfWin *window, const char *const command, gchar **args) { - if (window->type == WIN_CHAT || - window->type == WIN_MUC || - window->type == WIN_PRIVATE) { - - if (args[0] == NULL) { - cons_bad_cmd_usage(command); - return TRUE; - } + if (window->type != WIN_CHAT && + window->type != WIN_MUC && + window->type != WIN_PRIVATE) { + cons_show("urlopen not supported in this window"); + return TRUE; + } - gchar* cmd = prefs_get_string(PREF_URL_OPEN_CMD); - gchar *argv[] = {cmd, args[0], NULL}; + if (args[0] == NULL) { + cons_bad_cmd_usage(command); + return TRUE; + } - if (!call_external(argv, NULL, NULL)) { - cons_show_error("Unable to open url: check the logs for more information."); - } + gchar* cmd = prefs_get_string(PREF_URL_OPEN_CMD); + gchar *argv[] = {cmd, args[0], NULL}; - g_free(cmd); - } else { - cons_show("urlopen not supported in this window"); + if (!call_external(argv, NULL, NULL)) { + cons_show_error("Unable to open url: check the logs for more information."); } + g_free(cmd); + return TRUE; } -- cgit 1.4.1-2-gfad0