[telepathy-haze/master] Update haze.manager to match libpurple 2.6.0

[Will Thompson]

I haven't added all of the new options here, because this might break
haze when running with older libpurples. But SILC and Yahoo! Japan have
been added, and a couple of defaults have changed.
---
 data/haze.manager |   98 ++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 71 insertions(+), 27 deletions(-)

diff --git a/data/haze.manager b/data/haze.manager
index d87c918..309775d 100644
--- a/data/haze.manager
+++ b/data/haze.manager
@@ -7,14 +7,14 @@ param-account=s required
 param-password=s required
 param-server=s
 param-port=i
-param-use_ssl=b
+param-use-ssl=b
 param-always-use-rv-proxy=b
-param-allow_multiple_logins=b
+param-allow-multiple-logins=b
 default-server=login.messaging.aol.com
 default-port=5190
-default-use_ssl=false
+default-use-ssl=false
 default-always-use-rv-proxy=false
-default-allow_multiple_logins=true
+default-allow-multiple-logins=true
 
 [Protocol gadugadu]
 param-account=s required
@@ -34,15 +34,15 @@ param-account=s required
 param-password=s required
 param-server=s
 param-port=i
-param-use_ssl=b
+param-use-ssl=b
 param-always-use-rv-proxy=b
-param-allow_multiple_logins=b
+param-allow-multiple-logins=b
 param-charset=s
 default-server=login.messaging.aol.com
 default-port=5190
-default-use_ssl=false
+default-use-ssl=false
 default-always-use-rv-proxy=false
-default-allow_multiple_logins=true
+default-allow-multiple-logins=true
 default-charset=UTF-8
 
 [Protocol irc]
@@ -50,13 +50,13 @@ param-account=s required
 param-password=s
 param-port=i
 param-charset=s
-param-autodetect_utf8=b
+param-autodetect-utf8=b
 param-username=s
 param-realname=s
 param-ssl=b
 default-port=6667
 default-charset=UTF-8
-default-autodetect_utf8=false
+default-autodetect-utf8=false
 default-ssl=false
 
 [Protocol jabber]
@@ -68,13 +68,13 @@ param-auth-plain-in-clear=b
 param-port=i
 param-server=s
 param-ft-proxies=s
-param-custom_smileys=b
-default-require-encryption=false
+param-custom-smileys=b
+default-require-encryption=true
 default-old-ssl=false
 default-auth-plain-in-clear=false
 default-port=5222
-default-ft-proxies=proxy.jabber.org
-default-custom_smileys=true
+default-ft-proxies=proxy.eu.jabber.org
+default-custom-smileys=true
 
 [Protocol local-xmpp]
 param-account=s required
@@ -112,21 +112,21 @@ default-port=1863
 param-account=s required
 param-password=s required
 param-server=s
-param-client_version=s
+param-client-version=s
 param-use-tcp=b
-param-show_notice=b
-param-show_news=b
-param-show_chat=b
-param-keep_alive_interval=i
-param-update_interval=i
+param-show-notice=b
+param-show-news=b
+param-show-chat=b
+param-keep-alive-interval=i
+param-update-interval=i
 default-server=auto
-default-client_version=qq2005
+default-client-version=qq2005
 default-use-tcp=true
-default-show_notice=true
-default-show_news=true
-default-show_chat=true
-default-keep_alive_interval=60
-default-update_interval=300
+default-show-notice=true
+default-show-news=true
+default-show-chat=true
+default-keep-alive-interval=60
+default-update-interval=300
 
 [Protocol sametime]
 param-account=s required
@@ -139,6 +139,32 @@ default-port=1533
 default-force-login=false
 default-fake-client-id=false
 
+[Protocol silc]
+param-account=s required
+param-password=s
+param-server=s
+param-port=i
+param-public-key=s
+param-private-key=s
+param-cipher=s
+param-hmac=s
+param-pfs=b
+param-pubkey-auth=b
+param-block-ims=b
+param-block-wb=b
+param-open-wb=b
+param-sign-verify=b
+default-server=silc.silcnet.org
+default-port=706
+default-cipher=aes-256-ctr
+default-hmac=hmac-sha256-96
+default-pfs=false
+default-pubkey-auth=false
+default-block-ims=false
+default-block-wb=false
+default-open-wb=false
+default-sign-verify=false
+
 [Protocol simple]
 param-account=s required
 param-password=s required
@@ -164,7 +190,7 @@ param-xfer-port=i
 param-room-list-locale=s
 param-ignore-invites=b
 param-charset=s
-default-server=scs.msg.yahoo.com
+default-server=scsa.msg.yahoo.com
 default-port=5050
 default-xfer-host=filetransfer.msg.yahoo.com
 default-xfer-port=80
@@ -172,6 +198,24 @@ default-room-list-locale=us
 default-ignore-invites=false
 default-charset=UTF-8
 
+[Protocol yahoojp]
+param-account=s required
+param-password=s required
+param-server=s
+param-port=i
+param-xfer-host=s
+param-xfer-port=i
+param-room-list-locale=s
+param-ignore-invites=b
+param-charset=s
+default-server=cs.yahoo.co.jp
+default-port=5050
+default-xfer-host=filetransfer.msg.yahoo.co.jp
+default-xfer-port=80
+default-room-list-locale=ja
+default-ignore-invites=false
+default-charset=UTF-8
+
 [Protocol zephyr]
 param-account=s required
 param-use-tzc=b
-- 
1.5.6.5