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

2015-03-08 21:51:50 +00:00
parent 232bf9b7fc d89112e138
commit 945f29873e
17 changed files with 167 additions and 2 deletions
--- a/src/config/preferences.c
+++ b/src/config/preferences.c
@@ -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:
--- a/src/config/preferences.h
+++ b/src/config/preferences.h
@@ -59,6 +59,7 @@ typedef enum {
    PREF_FLASH,
    PREF_INTYPE,
    PREF_HISTORY,
+    PREF_CARBONS,
    PREF_MOUSE,
    PREF_OCCUPANTS,
    PREF_OCCUPANTS_SIZE,