Merge remote-tracking branch 'incertia/connect-default'

Conflicts: CHANGELOG
2014-12-29 15:29:28 +00:00
parent 1c35321cb3 1dca023c9f
commit aebee209b2
5 changed files with 81 additions and 8 deletions
--- 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,