devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-28 10:46:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renamed PREF_CERT_PATH -> PREF_TLS_CERTPATH

Browse Source
This commit is contained in:
James Booth
2015-10-18 00:03:15 +01:00
parent b8c08f85cc
commit 31ecd41c8f
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/command/commands.c
View File

@@ -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)) { 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]); cons_show("Certificate path set to: %s", args[2]);
} else { } else {
cons_show("Directory %s does not exist.", args[2]); cons_show("Directory %s does not exist.", args[2]);
} }
return TRUE; return TRUE;
} else if (g_strcmp0(args[1], "clear") == 0) { } 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"); cons_show("Certificate path cleared");
return TRUE; return TRUE;
} else if (args[1] == NULL) { } else if (args[1] == NULL) {
char *path = prefs_get_string(PREF_CERT_PATH); char *path = prefs_get_string(PREF_TLS_CERTPATH);
if (path) { if (path) {
cons_show("Trusted certificate path: %s", path); cons_show("Trusted certificate path: %s", path);
prefs_free_string(path); prefs_free_string(path);

6
src/config/preferences.c
View File

@@ -634,7 +634,7 @@ _get_group(preference_t pref)
case PREF_CARBONS: case PREF_CARBONS:
case PREF_RECEIPTS_SEND: case PREF_RECEIPTS_SEND:
case PREF_RECEIPTS_REQUEST: case PREF_RECEIPTS_REQUEST:
case PREF_CERT_PATH: case PREF_TLS_CERTPATH:
return PREF_GROUP_CONNECTION; return PREF_GROUP_CONNECTION;
case PREF_OTR_LOG: case PREF_OTR_LOG:
case PREF_OTR_POLICY: case PREF_OTR_POLICY:
@@ -781,8 +781,8 @@ _get_key(preference_t pref)
return "enc.warn"; return "enc.warn";
case PREF_PGP_LOG: case PREF_PGP_LOG:
return "log"; return "log";
case PREF_CERT_PATH: case PREF_TLS_CERTPATH:
return "certpath"; return "tls.certpath";
case PREF_TLS_SHOW: case PREF_TLS_SHOW:
return "tls.show"; return "tls.show";
case PREF_LASTACTIVITY: case PREF_LASTACTIVITY:

2
src/config/preferences.h
View File

@@ -111,7 +111,7 @@ typedef enum {
PREF_INPBLOCK_DYNAMIC, PREF_INPBLOCK_DYNAMIC,
PREF_ENC_WARN, PREF_ENC_WARN,
PREF_PGP_LOG, PREF_PGP_LOG,
PREF_CERT_PATH, PREF_TLS_CERTPATH,
PREF_TLS_SHOW, PREF_TLS_SHOW,
PREF_LASTACTIVITY, PREF_LASTACTIVITY,
} preference_t; } preference_t;

2
src/xmpp/connection.c
View File

@@ -435,7 +435,7 @@ _jabber_connect(const char * const fulljid, const char * const passwd,
} }
#ifdef HAVE_LIBMESODE #ifdef HAVE_LIBMESODE
char *cert_path = prefs_get_string(PREF_CERT_PATH); char *cert_path = prefs_get_string(PREF_TLS_CERTPATH);
if (cert_path) { if (cert_path) {
xmpp_conn_tlscert_path(jabber_conn.conn, cert_path); xmpp_conn_tlscert_path(jabber_conn.conn, cert_path);
} }