devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-08-01 07:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'oliverlemoal/xep-0280' into xep-0280

Browse Source
This commit is contained in:
James Booth
2015-03-08 21:51:50 +00:00
parent 232bf9b7fc d89112e138
commit 945f29873e
17 changed files with 167 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/config/preferences.c
View File

@@ -541,6 +541,7 @@ _get_group(preference_t pref)
return PREF_GROUP_PRESENCE;
case PREF_CONNECT_ACCOUNT:
case PREF_DEFAULT_ACCOUNT:
case PREF_CARBONS:
return PREF_GROUP_CONNECTION;
case PREF_OTR_LOG:
case PREF_OTR_POLICY:
@@ -575,6 +576,8 @@ _get_key(preference_t pref)
return "intype";
case PREF_HISTORY:
return "history";
case PREF_CARBONS:
return "carbons";
case PREF_MOUSE:
return "mouse";
case PREF_OCCUPANTS: