1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-09-29 19:56:07 -04:00

Merge branch 'master' into plugins

This commit is contained in:
James Booth 2014-05-12 23:34:23 +01:00
commit ea118e4a50
2 changed files with 4 additions and 0 deletions

1
.gitignore vendored
View File

@ -60,3 +60,4 @@ Profanity.project
Profanity.workspace
pageing.txt
cppcheck.out
gitpushall.sh

View File

@ -906,6 +906,7 @@ _cons_show_account(ProfAccount *account)
curr = curr->next;
}
cons_show(manual->str);
g_string_free(manual, TRUE);
}
if (g_list_length(account->otr_opportunistic) > 0) {
GString *opportunistic = g_string_new("OTR opportunistic : ");
@ -918,6 +919,7 @@ _cons_show_account(ProfAccount *account)
curr = curr->next;
}
cons_show(opportunistic->str);
g_string_free(opportunistic, TRUE);
}
if (g_list_length(account->otr_always) > 0) {
GString *always = g_string_new("OTR always : ");
@ -930,6 +932,7 @@ _cons_show_account(ProfAccount *account)
curr = curr->next;
}
cons_show(always->str);
g_string_free(always, TRUE);
}
cons_show ("Priority : chat:%d, online:%d, away:%d, xa:%d, dnd:%d",