Bump version to 0.8

2007-06-09 Xavier Claessens  <xclaesse@gmail.com>

	* configure.ac: Bump version to 0.8

	* libempathy-gtk/gossip-ui-utils.c: Fix usage of contact subscription
	property.

	* data/gtalk.profile:
	* data/jabber.profile:
	* data/msn.profile: Add VCardField and VCardDefault to profiles for
	eds-sync support.


svn path=/trunk/; revision=139

6 files changed, 23 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 112809f0a..f2da5d97f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2007-06-09 Xavier Claessens  <xclaesse@gmail.com>
 
+	* configure.ac: Bump version to 0.8
+
+	* libempathy-gtk/gossip-ui-utils.c: Fix usage of contact subscription
+	property.
+
+	* data/gtalk.profile:
+	* data/jabber.profile:
+	* data/msn.profile: Add VCardField and VCardDefault to profiles for
+	eds-sync support.
+
+2007-06-09 Xavier Claessens  <xclaesse@gmail.com>
+
 	* libempathy-gtk/empathy-contact-widget.c: Fix a warning.
 
 2007-06-09 Xavier Claessens  <xclaesse@gmail.com>
diff --git a/configure.ac b/configure.ac
index 7a6ade7a4..4371b6a7a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(Empathy, 0.7, http://bugzilla.gnome.org/browse.cgi?product=empathy)
+AC_INIT(Empathy, 0.8, http://bugzilla.gnome.org/browse.cgi?product=empathy)
 AC_PREREQ(2.59)
 AC_COPYRIGHT([Copyright (C) 2003-2007 Imendio AB])
 
diff --git a/data/gtalk.profile b/data/gtalk.profile
index 563710780..bed2224e5 100644
--- a/data/gtalk.profile
+++ b/data/gtalk.profile
@@ -5,6 +5,8 @@ DisplayName=Google Talk
 IconName = empathy-proto-google-talk
 ConfigurationUI = jabber
 Capabilities = chat-p2p, chat-room, chat-room-list, voice-p2p, split-account, supports-avatars, supports-alias
+SupportsInvisible = 0
+VCardField = X-Jabber
 DefaultAccountDomain = gmail.com
 Default-server = talk.google.com
 Default-port = 5223
@@ -12,4 +14,4 @@ Default-old-ssl = 1
 Default-fallback-conference-server = conference.jabber.org
 Default-randomize-resource = 1
 Default-ignore-ssl-errors = 1
-SupportsInvisible = 0
+
diff --git a/data/jabber.profile b/data/jabber.profile
index 7da8254f4..55a1e6978 100644
--- a/data/jabber.profile
+++ b/data/jabber.profile
@@ -7,3 +7,6 @@ ConfigurationUI = jabber
 Capabilities = chat-p2p, chat-room, chat-room-list, voice-p2p, split-account, registration-ui, supports-avatars, supports-alias
 DefaultAccountDomain = jabber.org
 SupportsInvisible = 0
+VCardField = X-Jabber
+VCardDefault = true
+
diff --git a/data/msn.profile b/data/msn.profile
index 44058fc15..5651c5639 100644
--- a/data/msn.profile
+++ b/data/msn.profile
@@ -6,3 +6,6 @@ IconName = empathy-proto-msn
 ConfigurationUI = msn
 SupportsInvisible = 1
 Capabilities = chat-p2p, split-account, supports-avatars, supports-alias
+VCardField = X-MSN
+VCardDefault = true
+
diff --git a/libempathy-gtk/gossip-ui-utils.c b/libempathy-gtk/gossip-ui-utils.c
index f834ceb0c..b17e5776b 100644
--- a/libempathy-gtk/gossip-ui-utils.c
+++ b/libempathy-gtk/gossip-ui-utils.c
@@ -383,15 +383,12 @@ gossip_icon_name_for_contact (GossipContact *contact)
 			      EMPATHY_IMAGE_OFFLINE);
 
 	presence = gossip_contact_get_presence (contact);
-
 	if (presence) {
 		return gossip_icon_name_for_presence (presence);
 	}
 
 	subscription = gossip_contact_get_subscription (contact);
-
-	if (subscription != GOSSIP_SUBSCRIPTION_BOTH &&
-	    subscription != GOSSIP_SUBSCRIPTION_TO) {
+	if (!(subscription & GOSSIP_SUBSCRIPTION_FROM)) {
 		return EMPATHY_IMAGE_PENDING;
 	}