diff options
-rw-r--r-- | src/command/commands.c | 6 | ||||
-rw-r--r-- | src/config/preferences.c | 6 | ||||
-rw-r--r-- | src/config/preferences.h | 2 | ||||
-rw-r--r-- | src/xmpp/connection.c | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/command/commands.c b/src/command/commands.c index 808f573e..370c466c 100644 --- a/src/command/commands.c +++ b/src/command/commands.c @@ -168,18 +168,18 @@ cmd_tls(ProfWin *window, const char * const command, gchar **args) } if (g_file_test(args[2], G_FILE_TEST_IS_DIR)) { - prefs_set_string(PREF_CERT_PATH, args[2]); + prefs_set_string(PREF_TLS_CERTPATH, args[2]); cons_show("Certificate path set to: %s", args[2]); } else { cons_show("Directory %s does not exist.", args[2]); } return TRUE; } else if (g_strcmp0(args[1], "clear") == 0) { - prefs_set_string(PREF_CERT_PATH, NULL); + prefs_set_string(PREF_TLS_CERTPATH, NULL); cons_show("Certificate path cleared"); return TRUE; } else if (args[1] == NULL) { - char *path = prefs_get_string(PREF_CERT_PATH); + char *path = prefs_get_string(PREF_TLS_CERTPATH); if (path) { cons_show("Trusted certificate path: %s", path); prefs_free_string(path); diff --git a/src/config/preferences.c b/src/config/preferences.c index 746e76d4..283e9158 100644 --- a/src/config/preferences.c +++ b/src/config/preferences.c @@ -634,7 +634,7 @@ _get_group(preference_t pref) case PREF_CARBONS: case PREF_RECEIPTS_SEND: case PREF_RECEIPTS_REQUEST: - case PREF_CERT_PATH: + case PREF_TLS_CERTPATH: return PREF_GROUP_CONNECTION; case PREF_OTR_LOG: case PREF_OTR_POLICY: @@ -781,8 +781,8 @@ _get_key(preference_t pref) return "enc.warn"; case PREF_PGP_LOG: return "log"; - case PREF_CERT_PATH: - return "certpath"; + case PREF_TLS_CERTPATH: + return "tls.certpath"; case PREF_TLS_SHOW: return "tls.show"; case PREF_LASTACTIVITY: diff --git a/src/config/preferences.h b/src/config/preferences.h index bf5f1e46..46bdd550 100644 --- a/src/config/preferences.h +++ b/src/config/preferences.h @@ -111,7 +111,7 @@ typedef enum { PREF_INPBLOCK_DYNAMIC, PREF_ENC_WARN, PREF_PGP_LOG, - PREF_CERT_PATH, + PREF_TLS_CERTPATH, PREF_TLS_SHOW, PREF_LASTACTIVITY, } preference_t; diff --git a/src/xmpp/connection.c b/src/xmpp/connection.c index 2b7db8be..5a27a63e 100644 --- a/src/xmpp/connection.c +++ b/src/xmpp/connection.c @@ -435,7 +435,7 @@ _jabber_connect(const char * const fulljid, const char * const passwd, } #ifdef HAVE_LIBMESODE - char *cert_path = prefs_get_string(PREF_CERT_PATH); + char *cert_path = prefs_get_string(PREF_TLS_CERTPATH); if (cert_path) { xmpp_conn_tlscert_path(jabber_conn.conn, cert_path); } |