devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-26 15:06:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'lucian/master'

Browse Source
This commit is contained in:
James Booth
2014-04-22 23:53:15 +01:00
parent 2c15aba92a 1192e67cf7
commit 1a0f12b0e6
8 changed files with 83 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/config/preferences.c
View File

@@ -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;
}
}
}

3
src/config/preferences.h
View File

@@ -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 {