diff options
Diffstat (limited to 'src/ui')
-rw-r--r-- | src/ui/console.c | 21 | ||||
-rw-r--r-- | src/ui/window.c | 2 | ||||
-rw-r--r-- | src/ui/window.h | 2 |
3 files changed, 11 insertions, 14 deletions
diff --git a/src/ui/console.c b/src/ui/console.c index cb2bb888..306b13d5 100644 --- a/src/ui/console.c +++ b/src/ui/console.c @@ -2068,17 +2068,20 @@ cons_correction_setting(void) void cons_executable_setting(void) { - char* avatar = prefs_get_string(PREF_AVATAR_CMD); + gchar* avatar = prefs_get_string(PREF_AVATAR_CMD); cons_show("Default '/avatar open' command (/executable avatar) : %s", avatar); g_free(avatar); //TODO: there needs to be a way to get all the "locales"/schemes so we can - //display the defualt openers for all filetypes - 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); + //display the default openers for all filetypes + gchar* urlopen = prefs_get_string(PREF_URL_OPEN_CMD); + cons_show("Default '/url open' command (/executable urlopen) : %s", urlopen); + g_free(urlopen); - char* urlsave = prefs_get_string(PREF_URL_SAVE_CMD); + gchar* urlsave = prefs_get_string(PREF_URL_SAVE_CMD); + if (urlsave == NULL) { + urlsave = g_strdup("(built-in)"); + } cons_show("Default '/url save' command (/executable urlsave) : %s", urlsave); g_free(urlsave); } @@ -2192,12 +2195,6 @@ cons_show_omemo_prefs(void) cons_show("OMEMO char (/omemo char) : %s", ch); free(ch); - if (prefs_get_boolean(PREF_OMEMO_SENDFILE)) { - cons_show("Allow sending unencrypted files in an OMEMO session via /sendfile (/omemo sendfile): ON"); - } else { - cons_show("Allow sending unencrypted files in an OMEMO session via /sendfile (/omemo sendfile): OFF"); - } - cons_alert(NULL); } diff --git a/src/ui/window.c b/src/ui/window.c index 687af3b2..6f77f107 100644 --- a/src/ui/window.c +++ b/src/ui/window.c @@ -1390,7 +1390,7 @@ win_appendln_highlight(ProfWin* window, theme_item_t theme_item, const char* con } void -win_print_http_upload(ProfWin* window, const char* const message, char* url) +win_print_http_transfer(ProfWin* window, const char* const message, char* url) { win_print_outgoing_with_receipt(window, "!", NULL, message, url, NULL); } diff --git a/src/ui/window.h b/src/ui/window.h index c731d19b..7ff25a87 100644 --- a/src/ui/window.h +++ b/src/ui/window.h @@ -72,7 +72,7 @@ void win_println_incoming_muc_msg(ProfWin* window, char* show_char, int flags, c void win_print_outgoing_muc_msg(ProfWin* window, char* show_char, const char* const me, const char* const id, const char* const replace_id, const char* const message); void win_print_history(ProfWin* window, const ProfMessage* const message); -void win_print_http_upload(ProfWin* window, const char* const message, char* url); +void win_print_http_transfer(ProfWin* window, const char* const message, char* url); void win_newline(ProfWin* window); void win_redraw(ProfWin* window); |