Update profiles based on N810's.

svn path=/trunk/; revision=536

11 files changed, 84 insertions, 48 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index 87566981a..c2118a794 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -2,13 +2,16 @@ SUBDIRS = icons
 
 profiledir = $(datadir)/mission-control/profiles
 profile_DATA = 				\
+	aim.profile			\
+	icq.profile			\
 	jabber.profile			\
-	gtalk.profile			\
 	salut.profile			\
+	yahoo.profile			\
+	gtalk.profile			\
 	irc.profile			\
 	msn.profile			\
-	sofiasip.profile		\
-	aim.profile
+	msn-haze.profile		\
+	sofiasip.profile
 
 autostartdir = $(sysconfdir)/xdg/autostart
 autostart_in_files = empathy.desktop.in
diff --git a/data/aim.profile b/data/aim.profile
index 281e7bbaa..d92d1b2cd 100644
--- a/data/aim.profile
+++ b/data/aim.profile
@@ -1,7 +1,10 @@
 [Profile]
 Manager=haze
 Protocol=aim
+IconName = im-aim
 DisplayName=AIM
-ConfigurationUI = aim
-Capabilities = chat-p2p, supports-alias
-
+ConfigurationUI = haze
+Capabilities = chat-p2p, supports-alias, supports-avatars, supports-roster
+VCardDefault = 1
+VCardField = X-AIM
+SupportedPresences = away,hidden,do-not-disturb
diff --git a/data/gtalk.profile b/data/gtalk.profile
index edc2b40fa..7a087f27a 100644
--- a/data/gtalk.profile
+++ b/data/gtalk.profile
@@ -1,19 +1,15 @@
 [Profile]
-Manager=gabble
-Protocol=jabber
-DisplayName=Google Talk
+Manager = gabble
+Protocol = jabber
+DisplayName = Google Talk
 IconName = im-google-talk
 ConfigurationUI = jabber
-Capabilities = chat-p2p, chat-room, chat-room-list, voice-p2p, split-account, supports-avatars, supports-alias
-SupportedPresences = offline,available,away,extended-away,do-not-disturb
-VCardField = X-Jabber
-
-
-DefaultAccountDomain = gmail.com
+VCardDefault = 0
+VCardField = X-JABBER
+Capabilities = chat-p2p, voice-p2p, split-account, chat-room, chat-room-list, registration-ui, supports-avatars, supports-alias, supports-roster
+DefaultAccountDomain = gmail.com, googlemail.com
 Default-server = talk.google.com
 Default-port = 5223
 Default-old-ssl = 1
 Default-fallback-conference-server = conference.jabber.org
-Default-randomize-resource = 1
-Default-ignore-ssl-errors = 1
-
+SupportedPresences = away,extended-away,do-not-disturb
diff --git a/data/icq.profile b/data/icq.profile
new file mode 100644
index 000000000..c8776b520
--- /dev/null
+++ b/data/icq.profile
@@ -0,0 +1,11 @@
+[Profile]
+Manager=haze
+Protocol=icq
+IconName = im-icq
+DisplayName=ICQ
+ConfigurationUI = haze
+Capabilities = chat-p2p, supports-alias, supports-avatars, supports-roster
+VCardDefault = 1
+VCardField = X-ICQ
+SupportedPresences = away,hidden,do-not-disturb
+
diff --git a/data/irc.profile b/data/irc.profile
index a3fc7c4e8..05bf5ed5a 100644
--- a/data/irc.profile
+++ b/data/irc.profile
@@ -1,8 +1,9 @@
 [Profile]
-Manager=idle
-Protocol=irc
-DisplayName=IRC
+Manager = idle
+Protocol = irc
+DisplayName = IRC
 IconName = im-irc
 ConfigurationUI = irc
-Capabilities = chat-p2p,chat-room,chat-room-list,supports-alias
-SupportedPresences = offline,away
+VCardField = X-IRC
+Capabilities = chat-p2p, chat-room, chat-room-list
+SupportedPresences = away
diff --git a/data/jabber.profile b/data/jabber.profile
index 0dfd14a84..c3cb57aff 100644
--- a/data/jabber.profile
+++ b/data/jabber.profile
@@ -1,14 +1,12 @@
 [Profile]
-Manager=gabble
-Protocol=jabber
-DisplayName=Jabber
+Manager = gabble
+Protocol = jabber
+DisplayName = Jabber
 IconName = im-xmpp
 ConfigurationUI = jabber
-Capabilities = chat-p2p, chat-room, chat-room-list, voice-p2p, split-account, registration-ui, supports-avatars, supports-alias
-SupportedPresences = offline,available,away,extended-away,do-not-disturb
-VCardField = X-Jabber
-VCardDefault = true
-
+VCardDefault = 1
+VCardField = X-JABBER
+Capabilities = chat-p2p, chat-room, chat-room-list, voice-p2p, contact-search, split-account, registration-ui, supports-avatars, supports-alias, supports-roster
 DefaultAccountDomain = jabber.org
-Default-ignore-ssl-errors = 1
-
+Default-fallback-conference-server = conference.jabber.org
+SupportedPresences = away,extended-away,hidden,do-not-disturb
diff --git a/data/msn-haze.profile b/data/msn-haze.profile
new file mode 100644
index 000000000..840dd2c42
--- /dev/null
+++ b/data/msn-haze.profile
@@ -0,0 +1,12 @@
+[Profile]
+Manager=haze
+Protocol=msn
+DisplayName=MSN (Haze)
+IconName = im-msn
+ConfigurationUI = haze
+SupportsInvisible = 0
+Capabilities = chat-p2p, supports-alias, supports-avatars, supports-roster
+VCardDefault = 1
+VCardField = X-MSN
+SupportedPresences = away,hidden,do-not-disturb
+
diff --git a/data/msn.profile b/data/msn.profile
index 06860e64b..7ebd78118 100644
--- a/data/msn.profile
+++ b/data/msn.profile
@@ -4,8 +4,9 @@ Protocol=msn
 DisplayName=MSN
 IconName = im-msn
 ConfigurationUI = msn
+SupportsInvisible = 1
 Capabilities = chat-p2p, split-account, supports-avatars, supports-alias
-SupportedPresences = offline,available,away,extended-away,hidden,do-not-disturb
+VCardDefault = 1
 VCardField = X-MSN
-VCardDefault = true
+SupportedPresences = offline,available,away,extended-away,hidden,do-not-disturb
 
diff --git a/data/salut.profile b/data/salut.profile
index 873979209..acd483ccc 100644
--- a/data/salut.profile
+++ b/data/salut.profile
@@ -1,8 +1,9 @@
 [Profile]
-Manager=salut
-Protocol=local-xmpp
-DisplayName=Salut
+Manager = salut
+Protocol = local-xmpp
+DisplayName = Salut
 IconName = im-local-xmpp
 ConfigurationUI = local-xmpp
-Capabilities = chat-p2p, chat-room, chat-room-list, voice-p2p, supports-avatars, supports-alias
-SupportedPresences = offline,available,away,extended-away,do-not-disturb
+VCardField = X-LOCAL-XMPP
+Capabilities = chat-p2p, contact-search, supports-alias, supports-roster
+SupportedPresences = away,extended-away,hidden,do-not-disturb
diff --git a/data/sofiasip.profile b/data/sofiasip.profile
index 32018cfe6..e49f9a09d 100644
--- a/data/sofiasip.profile
+++ b/data/sofiasip.profile
@@ -1,11 +1,10 @@
 [Profile]
-Manager=sofiasip
-Protocol=sip
-DisplayName=SofiaSIP
+Manager = sofiasip
+Protocol = sip
+DisplayName = SIP
+IconName = im-sip
 ConfigurationUI = sofiasip
-Capabilities = chat-p2p, chat-room, chat-room-list, voice-p2p, split-account, registration-ui, supports-avatars, supports-alias
-DefaultAccountDomain = sip.org
-SupportsInvisible = 0
+VCardDefault = 1
 VCardField = X-SIP
-VCardDefault = true
-Default-ignore-ssl-errors = 1
+Capabilities = chat-p2p, voice-p2p, split-account
+
diff --git a/data/yahoo.profile b/data/yahoo.profile
new file mode 100644
index 000000000..10898d48b
--- /dev/null
+++ b/data/yahoo.profile
@@ -0,0 +1,11 @@
+[Profile]
+Manager=haze
+Protocol=yahoo
+DisplayName=Yahoo
+IconName = im-yahoo
+ConfigurationUI = haze
+Capabilities = chat-p2p, supports-alias, supports-avatars, supports-roster
+VCardDefault = 1
+VCardField = X-YAHOO
+SupportedPresences = away,hidden,do-not-disturb
+