diff options
| author | James Booth <boothj5@gmail.com> | 2014-12-29 15:29:28 +0000 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2014-12-29 15:29:28 +0000 |
| commit | aebee209b2698eba40b1b220e162f87db23cc838 (patch) | |
| tree | f5396a26e24e5fbee16a20a832284304dfa080c6 /src/config | |
| parent | 1c35321cb315b7ce5bee3f5f281df103b0bc1f77 (diff) | |
| parent | 1dca023c9f56a8c1a30d1b8de08dc9878b161bf6 (diff) | |
| download | profani-tty-aebee209b2698eba40b1b220e162f87db23cc838.tar.gz | |
Merge remote-tracking branch 'incertia/connect-default'
Conflicts: CHANGELOG
Diffstat (limited to 'src/config')
| -rw-r--r-- | src/config/preferences.c | 3 | ||||
| -rw-r--r-- | src/config/preferences.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/config/preferences.c b/src/config/preferences.c index 7bc56999..fb4d3cca 100644 --- a/src/config/preferences.c +++ b/src/config/preferences.c @@ -539,6 +539,7 @@ _get_group(preference_t pref) case PREF_AUTOAWAY_MESSAGE: return PREF_GROUP_PRESENCE; case PREF_CONNECT_ACCOUNT: + case PREF_DEFAULT_ACCOUNT: return PREF_GROUP_CONNECTION; case PREF_OTR_WARN: case PREF_OTR_LOG: @@ -620,6 +621,8 @@ _get_key(preference_t pref) return "autoaway.message"; case PREF_CONNECT_ACCOUNT: return "account"; + case PREF_DEFAULT_ACCOUNT: + return "defaccount"; case PREF_OTR_LOG: return "log"; case PREF_OTR_WARN: diff --git a/src/config/preferences.h b/src/config/preferences.h index cc95c6e9..c8b206ef 100644 --- a/src/config/preferences.h +++ b/src/config/preferences.h @@ -90,6 +90,7 @@ typedef enum { PREF_AUTOAWAY_MODE, PREF_AUTOAWAY_MESSAGE, PREF_CONNECT_ACCOUNT, + PREF_DEFAULT_ACCOUNT, PREF_LOG_ROTATE, PREF_LOG_SHARED, PREF_OTR_LOG, |