From 59f5b81b85e0af183489bc95414a57ba82005c0e Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Thu, 2 Jul 2020 10:32:00 +0200 Subject: cmd_url_*(): use gchar instead of char --- src/command/cmd_funcs.c | 6 +++--- src/config/preferences.c | 2 +- src/config/preferences.h | 2 +- src/ui/console.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/command/cmd_funcs.c b/src/command/cmd_funcs.c index 5f6d8e60..2395c622 100644 --- a/src/command/cmd_funcs.c +++ b/src/command/cmd_funcs.c @@ -8983,7 +8983,7 @@ cmd_url_open(ProfWin *window, const char *const command, gchar **args) } } - char **suffix_cmd_pref = prefs_get_string_list_with_option(PREF_URL_OPEN_CMD, NULL); + gchar **suffix_cmd_pref = prefs_get_string_list_with_option(PREF_URL_OPEN_CMD, NULL); if (suffix != NULL) { gchar *lowercase_suffix = g_ascii_strdown(suffix, -1); g_strfreev(suffix_cmd_pref); @@ -9158,7 +9158,7 @@ cmd_executable(ProfWin *window, const char *const command, gchar **args) return TRUE; } - char *str = g_strjoinv(" ", &args[3]); + gchar *str = g_strjoinv(" ", &args[3]); const gchar* const list[] = {args[2], str, NULL}; prefs_set_string_list_with_option(PREF_URL_OPEN_CMD, args[1], list); cons_show("`url open` command set to: %s for %s files", str, args[1]); @@ -9169,7 +9169,7 @@ cmd_executable(ProfWin *window, const char *const command, gchar **args) return TRUE; } - char *str = g_strjoinv(" ", &args[2]); + gchar *str = g_strjoinv(" ", &args[2]); prefs_set_string_with_option(PREF_URL_SAVE_CMD, args[1], str); cons_show("`url save` command set to: %s for scheme %s", str, args[1]); g_free(str); diff --git a/src/config/preferences.c b/src/config/preferences.c index fa81b353..bab53000 100644 --- a/src/config/preferences.c +++ b/src/config/preferences.c @@ -536,7 +536,7 @@ prefs_get_string_with_option(preference_t pref, gchar *option) } } -char** +gchar** prefs_get_string_list_with_option(preference_t pref, gchar *option) { const char *group = _get_group(pref); diff --git a/src/config/preferences.h b/src/config/preferences.h index 1823097a..0bd10d44 100644 --- a/src/config/preferences.h +++ b/src/config/preferences.h @@ -316,7 +316,7 @@ gboolean prefs_get_boolean(preference_t pref); void prefs_set_boolean(preference_t pref, gboolean value); char* prefs_get_string(preference_t pref); char* prefs_get_string_with_option(preference_t pref, gchar *option); -char **prefs_get_string_list_with_option(preference_t pref, gchar *option); +gchar **prefs_get_string_list_with_option(preference_t pref, gchar *option); void prefs_free_string(char *pref); void prefs_set_string(preference_t pref, char *value); void prefs_set_string_with_option(preference_t pref, char *option, char *value); diff --git a/src/ui/console.c b/src/ui/console.c index 759d6af3..f86dbfec 100644 --- a/src/ui/console.c +++ b/src/ui/console.c @@ -2070,7 +2070,7 @@ cons_executable_setting(void) cons_show("Default '/avatar open' command (/executable avatar) : %s", avatar); prefs_free_string(avatar); - char **urlopen = prefs_get_string_list_with_option(PREF_URL_OPEN_CMD, ""); + gchar **urlopen = prefs_get_string_list_with_option(PREF_URL_OPEN_CMD, ""); cons_show("Default '/url open' command (/executable urlopen) : %s", urlopen[1]); g_strfreev(urlopen); -- cgit 1.4.1-2-gfad0