Add hidden supprot. Fixes bug #455510 (Cosimo Cecchi).

2007-08-10 Xavier Claessens  <xclaesse@gmail.com>

	* libempathy-gtk/empathy-images.h:
	* libempathy-gtk/empathy-presence-chooser.c:
	* libempathy-gtk/empathy-ui-utils.c:
	* libempathy/empathy-presence.c: Add hidden supprot. Fixes bug #455510
	(Cosimo Cecchi).

	* data/gtalk.profile:
	* data/jabber.profile:
	* data/salut.profile:
	* data/irc.profile:
	* data/msn.profile: Updated to use SupportedPresences field.


svn path=/trunk/; revision=243

10 files changed, 33 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 1853d05bb..91f4cf8b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2007-08-10 Xavier Claessens  <xclaesse@gmail.com>
+
+	* libempathy-gtk/empathy-images.h:
+	* libempathy-gtk/empathy-presence-chooser.c:
+	* libempathy-gtk/empathy-ui-utils.c:
+	* libempathy/empathy-presence.c: Add hidden supprot. Fixes bug #455510
+	(Cosimo Cecchi).
+
+	* data/gtalk.profile:
+	* data/jabber.profile:
+	* data/salut.profile:
+	* data/irc.profile:
+	* data/msn.profile: Updated to use SupportedPresences field.
+
 2007-08-09 Xavier Claessens  <xclaesse@gmail.com>
 
 	* libempathy-gtk/empathy-presence-chooser.glade:
diff --git a/data/gtalk.profile b/data/gtalk.profile
index bed2224e5..6d32f0728 100644
--- a/data/gtalk.profile
+++ b/data/gtalk.profile
@@ -5,8 +5,10 @@ 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
+SupportedPresences = offline,available,away,extended-away,do-not-disturb
 VCardField = X-Jabber
+
+
 DefaultAccountDomain = gmail.com
 Default-server = talk.google.com
 Default-port = 5223
diff --git a/data/irc.profile b/data/irc.profile
index 5bc5cfd3f..22e13bbb7 100644
--- a/data/irc.profile
+++ b/data/irc.profile
@@ -4,5 +4,5 @@ Protocol=irc
 DisplayName=IRC
 IconName = empathy-proto-irc
 ConfigurationUI = irc
-Capabilities = chat-p2p, chat-room, chat-room-list, supports-alias
-SupportsInvisible = 0
+Capabilities = chat-p2p,chat-room,chat-room-list,supports-alias
+SupportedPresences = offline, away
diff --git a/data/jabber.profile b/data/jabber.profile
index c91691daa..1ad05075e 100644
--- a/data/jabber.profile
+++ b/data/jabber.profile
@@ -5,9 +5,10 @@ DisplayName=Jabber
 IconName = empathy-proto-jabber
 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
+SupportedPresences = offline,available,away,extended-away,do-not-disturb
 VCardField = X-Jabber
 VCardDefault = true
+
+DefaultAccountDomain = jabber.org
 Default-ignore-ssl-errors = 1
 
diff --git a/data/msn.profile b/data/msn.profile
index 5651c5639..554893dee 100644
--- a/data/msn.profile
+++ b/data/msn.profile
@@ -4,8 +4,8 @@ Protocol=msn
 DisplayName=MSN
 IconName = empathy-proto-msn
 ConfigurationUI = msn
-SupportsInvisible = 1
 Capabilities = chat-p2p, split-account, supports-avatars, supports-alias
+SupportedPresences = offline,available,away,extended-away,hidden,do-not-disturb
 VCardField = X-MSN
 VCardDefault = true
 
diff --git a/data/salut.profile b/data/salut.profile
index 08094128c..ec6b3f5fb 100644
--- a/data/salut.profile
+++ b/data/salut.profile
@@ -5,4 +5,4 @@ DisplayName=Salut
 IconName = empathy-proto-salut
 ConfigurationUI = salut
 Capabilities = chat-p2p, chat-room, chat-room-list, voice-p2p, supports-avatars, supports-alias
-
+SupportedPresences = offline,available,away,extended-away,do-not-disturb
diff --git a/libempathy-gtk/empathy-images.h b/libempathy-gtk/empathy-images.h
index ee92f0ab4..227ebe599 100644
--- a/libempathy-gtk/empathy-images.h
+++ b/libempathy-gtk/empathy-images.h
@@ -26,6 +26,7 @@
 G_BEGIN_DECLS
 
 #define EMPATHY_IMAGE_OFFLINE             "empathy-offline"
+#define EMPATHY_IMAGE_HIDDEN              "empathy-offline"
 #define EMPATHY_IMAGE_AVAILABLE           "empathy-available"
 #define EMPATHY_IMAGE_BUSY                "empathy-busy"
 #define EMPATHY_IMAGE_AWAY                "empathy-away"
diff --git a/libempathy-gtk/empathy-presence-chooser.c b/libempathy-gtk/empathy-presence-chooser.c
index 8cdc0b01a..f3097abce 100644
--- a/libempathy-gtk/empathy-presence-chooser.c
+++ b/libempathy-gtk/empathy-presence-chooser.c
@@ -96,6 +96,7 @@ static CustomMessageDialog *message_dialog = NULL;
 static guint states[] = {MC_PRESENCE_AVAILABLE, TRUE,
 			 MC_PRESENCE_DO_NOT_DISTURB, TRUE,
 			 MC_PRESENCE_AWAY, TRUE,
+			 MC_PRESENCE_HIDDEN, FALSE,
 			 MC_PRESENCE_OFFLINE, FALSE};
 
 static void            empathy_presence_chooser_class_init      (EmpathyPresenceChooserClass *klass);
@@ -678,12 +679,13 @@ empathy_presence_chooser_create_menu (void)
 			g_list_free (list);
 		}
 
-		/* Separator. */
-		item = gtk_menu_item_new ();
-		gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-		gtk_widget_show (item);
 	}
 
+	/* Separator. */
+	item = gtk_menu_item_new ();
+	gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+	gtk_widget_show (item);
+
 	/* Custom messages */
 	item = gtk_image_menu_item_new_with_label (_("Custom messages..."));
 	image = gtk_image_new_from_stock (GTK_STOCK_EDIT, GTK_ICON_SIZE_MENU);
diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c
index af7f72caa..fb491cc5e 100644
--- a/libempathy-gtk/empathy-ui-utils.c
+++ b/libempathy-gtk/empathy-ui-utils.c
@@ -351,6 +351,7 @@ empathy_icon_name_for_presence_state (McPresence state)
 	case MC_PRESENCE_EXTENDED_AWAY:
 		return EMPATHY_IMAGE_EXT_AWAY;
 	case MC_PRESENCE_HIDDEN:
+		return EMPATHY_IMAGE_HIDDEN;
 	case MC_PRESENCE_OFFLINE:
 	case MC_PRESENCE_UNSET:
 		return EMPATHY_IMAGE_OFFLINE;
diff --git a/libempathy/empathy-presence.c b/libempathy/empathy-presence.c
index 42c7f936b..b30fa6151 100644
--- a/libempathy/empathy-presence.c
+++ b/libempathy/empathy-presence.c
@@ -279,6 +279,7 @@ empathy_presence_state_get_default_status (McPresence state)
 	case MC_PRESENCE_EXTENDED_AWAY:
 		return _("Away");
 	case MC_PRESENCE_HIDDEN:
+		return _("Hidden");
 	case MC_PRESENCE_OFFLINE:
 	case MC_PRESENCE_UNSET:
 		return _("Offline");