aniani/profanity
1
1
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2025-01-03 14:57:42 -05:00
Code

Merge branch 'master' into plugins

Browse Source
This commit is contained in:
James Booth 2014-02-10 23:20:35 +00:00
commit 5e56515f4f
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/otr.c
View File

@ -40,7 +40,7 @@ static gboolean data_loaded;
static OtrlPolicy
cb_policy(void *opdata, ConnContext *context)
{
return OTRL_POLICY_DEFAULT ;
return OTRL_POLICY_ALLOW_V1 | OTRL_POLICY_ALLOW_V2 ;
}
static int

1
src/xmpp/bookmark.c
View File

@ -89,7 +89,6 @@ _bookmark_add(const char *jid, const char *nick, gboolean autojoin)
xmpp_stanza_t *item = xmpp_stanza_new(ctx);
xmpp_stanza_set_name(item, STANZA_NAME_ITEM);
xmpp_stanza_set_attribute(item, STANZA_ATTR_ID, "current");
xmpp_stanza_add_child(publish, item);
xmpp_stanza_t *storage = xmpp_stanza_new(ctx);