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

Merge branch 'master' into pgp

Browse Source 
Conflicts:
	src/config/account.h
This commit is contained in:
James Booth
2015-04-23 23:48:43 +01:00
parent 5f2c6cbd28 bc9e6b79cd
commit 7a44e17141
5 changed files with 79 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/config/account.h
View File

@@ -70,9 +70,8 @@ ProfAccount* account_new(const gchar * const name, const gchar * const jid,
const gchar * const muc_service, const gchar * const muc_nick,
const gchar * const otr_policy, GList *otr_manual, GList *otr_opportunistic,
GList *otr_always, const gchar * const pgp_keyid);
char* account_create_full_jid(ProfAccount *account);
gboolean account_eval_password(ProfAccount *account);
void account_free(ProfAccount *account);
#endif