aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Fixed compiler errors

Browse Source
This commit is contained in:
James Booth 2016-04-27 22:10:27 +01:00
parent df30d4ba52
commit d4789ac375
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/otr/otr.c
View File

@ -138,7 +138,7 @@ cb_write_fingerprints(void *opdata)
GString *fpsfilename = g_string_new(basedir->str); GString *fpsfilename = g_string_new(basedir->str);
g_string_append(fpsfilename, "fingerprints.txt"); g_string_append(fpsfilename, "fingerprints.txt");
err = otrl_privkey_write_fingerprints(user_state, fpsfilename->str); err = otrl_privkey_write_fingerprints(user_state, fpsfilename->str);
if (!err == GPG_ERR_NO_ERROR) { if (err != GPG_ERR_NO_ERROR) {
log_error("Failed to write fingerprints file"); log_error("Failed to write fingerprints file");
cons_show_error("Failed to create fingerprints file"); cons_show_error("Failed to create fingerprints file");
} }
@ -243,7 +243,7 @@ otr_on_connect(ProfAccount *account)
} else { } else {
log_info("Loading OTR private key %s", keysfilename->str); log_info("Loading OTR private key %s", keysfilename->str);
err = otrl_privkey_read(user_state, keysfilename->str); err = otrl_privkey_read(user_state, keysfilename->str);
if (!err == GPG_ERR_NO_ERROR) { if (err != GPG_ERR_NO_ERROR) {
log_warning("Failed to read OTR private key file: %s", keysfilename->str); log_warning("Failed to read OTR private key file: %s", keysfilename->str);
cons_show_error("Failed to read OTR private key file: %s", keysfilename->str); cons_show_error("Failed to read OTR private key file: %s", keysfilename->str);
g_string_free(basedir, TRUE); g_string_free(basedir, TRUE);
@ -271,7 +271,7 @@ otr_on_connect(ProfAccount *account)
} else { } else {
log_info("Loading OTR fingerprints %s", fpsfilename->str); log_info("Loading OTR fingerprints %s", fpsfilename->str);
err = otrl_privkey_read_fingerprints(user_state, fpsfilename->str, NULL, NULL); err = otrl_privkey_read_fingerprints(user_state, fpsfilename->str, NULL, NULL);
if (!err == GPG_ERR_NO_ERROR) { if (err != GPG_ERR_NO_ERROR) {
log_error("Failed to load OTR fingerprints file: %s", fpsfilename->str); log_error("Failed to load OTR fingerprints file: %s", fpsfilename->str);
g_string_free(basedir, TRUE); g_string_free(basedir, TRUE);
g_string_free(keysfilename, TRUE); g_string_free(keysfilename, TRUE);
@ -415,7 +415,7 @@ otr_keygen(ProfAccount *account)
cons_show("Moving the mouse randomly around the screen may speed up the process!"); cons_show("Moving the mouse randomly around the screen may speed up the process!");
ui_update(); ui_update();
err = otrl_privkey_generate(user_state, keysfilename->str, account->jid, "xmpp"); err = otrl_privkey_generate(user_state, keysfilename->str, account->jid, "xmpp");
if (!err == GPG_ERR_NO_ERROR) { if (err != GPG_ERR_NO_ERROR) {
g_string_free(basedir, TRUE); g_string_free(basedir, TRUE);
g_string_free(keysfilename, TRUE); g_string_free(keysfilename, TRUE);
log_error("Failed to generate private key"); log_error("Failed to generate private key");
@ -430,7 +430,7 @@ otr_keygen(ProfAccount *account)
g_string_append(fpsfilename, "fingerprints.txt"); g_string_append(fpsfilename, "fingerprints.txt");
log_debug("Generating fingerprints file %s for %s", fpsfilename->str, jid); log_debug("Generating fingerprints file %s for %s", fpsfilename->str, jid);
err = otrl_privkey_write_fingerprints(user_state, fpsfilename->str); err = otrl_privkey_write_fingerprints(user_state, fpsfilename->str);
if (!err == GPG_ERR_NO_ERROR) { if (err != GPG_ERR_NO_ERROR) {
g_string_free(basedir, TRUE); g_string_free(basedir, TRUE);
g_string_free(keysfilename, TRUE); g_string_free(keysfilename, TRUE);
log_error("Failed to create fingerprints file"); log_error("Failed to create fingerprints file");
@ -440,7 +440,7 @@ otr_keygen(ProfAccount *account)
log_info("Fingerprints file created"); log_info("Fingerprints file created");
err = otrl_privkey_read(user_state, keysfilename->str); err = otrl_privkey_read(user_state, keysfilename->str);
if (!err == GPG_ERR_NO_ERROR) { if (err != GPG_ERR_NO_ERROR) {
g_string_free(basedir, TRUE); g_string_free(basedir, TRUE);
g_string_free(keysfilename, TRUE); g_string_free(keysfilename, TRUE);
log_error("Failed to load private key"); log_error("Failed to load private key");
@ -449,7 +449,7 @@ otr_keygen(ProfAccount *account)
} }
err = otrl_privkey_read_fingerprints(user_state, fpsfilename->str, NULL, NULL); err = otrl_privkey_read_fingerprints(user_state, fpsfilename->str, NULL, NULL);
if (!err == GPG_ERR_NO_ERROR) { if (err != GPG_ERR_NO_ERROR) {
g_string_free(basedir, TRUE); g_string_free(basedir, TRUE);
g_string_free(keysfilename, TRUE); g_string_free(keysfilename, TRUE);
log_error("Failed to load fingerprints"); log_error("Failed to load fingerprints");