devs/cproof
1
2
Fork 1
Code Issues 42 Pull Requests 8 Actions Packages Projects 1 Releases Wiki Activity

Merge branch 'master' into stabber-tests

Browse Source
This commit is contained in:
James Booth
2015-06-02 20:32:15 +01:00
parent f278e0a466 f0f3a739f4
commit 78a4446023
13 changed files with 60 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/config/preferences.c
View File

@@ -507,6 +507,7 @@ _get_group(preference_t pref)
case PREF_MUC_PRIVILEGES:
case PREF_PRESENCE:
case PREF_WRAP:
case PREF_WINS_AUTO_TIDY:
case PREF_TIME:
case PREF_TIME_STATUSBAR:
case PREF_ROSTER:
@@ -654,6 +655,8 @@ _get_key(preference_t pref)
return "presence";
case PREF_WRAP:
return "wrap";
case PREF_WINS_AUTO_TIDY:
return "wins.autotidy";
case PREF_TIME:
return "time";
case PREF_TIME_STATUSBAR:
@@ -700,6 +703,7 @@ _get_default_boolean(preference_t pref)
case PREF_MUC_PRIVILEGES:
case PREF_PRESENCE:
case PREF_WRAP:
case PREF_WINS_AUTO_TIDY:
case PREF_INPBLOCK_DYNAMIC:
case PREF_RESOURCE_TITLE:
case PREF_RESOURCE_MESSAGE: