diff options
| author | James Booth <boothj5@gmail.com> | 2015-04-12 02:16:13 +0100 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2015-04-12 02:16:13 +0100 |
| commit | bcfbbac49a0b031a16f61204955861fd2f7c6db8 (patch) | |
| tree | bc49794e02bcbbd0e07292d6f4fe7dc14744b253 /src/config | |
| parent | 7ba7e098fead9e7a9a72090e30bc64d9a12e87ee (diff) | |
| parent | 57dc5f14efec19c9532c2ec9a8742e90e4c964d2 (diff) | |
| download | profani-tty-bcfbbac49a0b031a16f61204955861fd2f7c6db8.tar.gz | |
Merge branch 'master' into pgp
Diffstat (limited to 'src/config')
| -rw-r--r-- | src/config/preferences.c | 3 | ||||
| -rw-r--r-- | src/config/preferences.h | 1 | ||||
| -rw-r--r-- | src/config/theme.c | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/src/config/preferences.c b/src/config/preferences.c index fdaae11f..3ca3a721 100644 --- a/src/config/preferences.c +++ b/src/config/preferences.c @@ -499,6 +499,7 @@ _get_group(preference_t pref) case PREF_HISTORY: case PREF_MOUSE: case PREF_OCCUPANTS: + case PREF_OCCUPANTS_JID: case PREF_STATUSES: case PREF_STATUSES_CONSOLE: case PREF_STATUSES_CHAT: @@ -589,6 +590,8 @@ _get_key(preference_t pref) return "mouse"; case PREF_OCCUPANTS: return "occupants"; + case PREF_OCCUPANTS_JID: + return "occupants.jid"; case PREF_MUC_PRIVILEGES: return "privileges"; case PREF_STATUSES: diff --git a/src/config/preferences.h b/src/config/preferences.h index a9413886..4455eca1 100644 --- a/src/config/preferences.h +++ b/src/config/preferences.h @@ -65,6 +65,7 @@ typedef enum { PREF_MOUSE, PREF_OCCUPANTS, PREF_OCCUPANTS_SIZE, + PREF_OCCUPANTS_JID, PREF_ROSTER, PREF_ROSTER_SIZE, PREF_ROSTER_OFFLINE, diff --git a/src/config/theme.c b/src/config/theme.c index 5b358ba3..1ee9836b 100644 --- a/src/config/theme.c +++ b/src/config/theme.c @@ -439,6 +439,7 @@ _load_preferences(void) _set_string_preference("statuses.muc", PREF_STATUSES_MUC); _set_boolean_preference("occupants", PREF_OCCUPANTS); + _set_boolean_preference("occupants.jid", PREF_OCCUPANTS_JID); if (g_key_file_has_key(theme, "ui", "occupants.size", NULL)) { gint occupants_size = g_key_file_get_integer(theme, "ui", "occupants.size", NULL); prefs_set_occupants_size(occupants_size); |