diff options
| author | James Booth <boothj5@gmail.com> | 2014-04-22 23:53:15 +0100 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2014-04-22 23:53:15 +0100 |
| commit | 1a0f12b0e6d7f191f1d765e426dd0d53d411741a (patch) | |
| tree | 72e7bcd273022db9439249ccec2fb39122e11f37 /src/config | |
| parent | 2c15aba92a8288e41bea6e12933a14ffe390e1f4 (diff) | |
| parent | 1192e67cf76ba953031f420e5ac790989a81530c (diff) | |
| download | profani-tty-1a0f12b0e6d7f191f1d765e426dd0d53d411741a.tar.gz | |
Merge remote-tracking branch 'lucian/master'
Diffstat (limited to 'src/config')
| -rw-r--r-- | src/config/preferences.c | 9 | ||||
| -rw-r--r-- | src/config/preferences.h | 3 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/config/preferences.c b/src/config/preferences.c index 9cc91cb6..2d6aee79 100644 --- a/src/config/preferences.c +++ b/src/config/preferences.c @@ -45,6 +45,7 @@ #define PREF_GROUP_PRESENCE "presence" #define PREF_GROUP_CONNECTION "connection" #define PREF_GROUP_ALIAS "alias" +#define PREF_GROUP_OTR_POLICY "policy" static gchar *prefs_loc; static GKeyFile *prefs; @@ -396,6 +397,8 @@ _get_group(preference_t pref) case PREF_LOG_ROTATE: case PREF_LOG_SHARED: return PREF_GROUP_LOGGING; + case PREF_OTR_POLICY: + return PREF_GROUP_OTR_POLICY; case PREF_AUTOAWAY_CHECK: case PREF_AUTOAWAY_MODE: case PREF_AUTOAWAY_MESSAGE: @@ -466,6 +469,8 @@ _get_key(preference_t pref) return "otr"; case PREF_OTR_WARN: return "otr.warn"; + case PREF_OTR_POLICY: + return "otr.policy"; case PREF_LOG_ROTATE: return "rotate"; case PREF_LOG_SHARED: @@ -500,6 +505,8 @@ _get_default_string(preference_t pref) return "off"; case PREF_OTR_LOG: return "redact"; + case PREF_OTR_POLICY: + return "manual"; case PREF_STATUSES_CONSOLE: case PREF_STATUSES_CHAT: case PREF_STATUSES_MUC: @@ -507,4 +514,4 @@ _get_default_string(preference_t pref) default: return NULL; } -} +} \ No newline at end of file diff --git a/src/config/preferences.h b/src/config/preferences.h index 310b9032..48748883 100644 --- a/src/config/preferences.h +++ b/src/config/preferences.h @@ -64,7 +64,8 @@ typedef enum { PREF_OTR_LOG, PREF_OTR_WARN, PREF_LOG_ROTATE, - PREF_LOG_SHARED + PREF_LOG_SHARED, + PREF_OTR_POLICY } preference_t; typedef struct prof_alias_t { |