1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00

Merge branch 'master' into osx-functional

This commit is contained in:
James Booth 2015-12-30 00:50:43 +00:00
commit 79b706b44c
5 changed files with 6 additions and 0 deletions

View File

@ -533,6 +533,8 @@ _load_preferences(void)
g_free(ch); g_free(ch);
} }
} }
_set_string_preference("console.muc", PREF_CONSOLE_MUC);
} }
static gchar* static gchar*

View File

@ -96,3 +96,4 @@ occupants.jid=
wins.autotidy= wins.autotidy=
otr.char= otr.char=
pgp.char= pgp.char=
console.muc=

View File

@ -96,3 +96,4 @@ wins.autotidy=true
otr.char=@ otr.char=@
pgp.char=% pgp.char=%
tls.show=true tls.show=true
console.muc=first

View File

@ -42,3 +42,4 @@ presence=true
intype=true intype=true
enc.warn=true enc.warn=true
tls.show=true tls.show=true
console.muc=all

View File

@ -36,3 +36,4 @@ intype=false
enc.warn=false enc.warn=false
wins.autotidy=false wins.autotidy=false
tls.show=false tls.show=false
console.muc=first