changeset 16867:28251f5bcd6a

merge of '069be2b4bd499fec1fb9220c617ecdd271e0fd16' and '8361a2a0d7435da94b196f8c77abe3b37d04d1e7'
author Stu Tomlinson <stu@nosnilmot.com>
date Fri, 04 May 2007 03:52:10 +0000
parents f5d699d95744 (current diff) 133932a97faa (diff)
children f51f1937d97f
files libpurple/protocols/msn/user.c
diffstat 2 files changed, 10 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/msn/msn.c	Fri May 04 03:44:00 2007 +0000
+++ b/libpurple/protocols/msn/msn.c	Fri May 04 03:52:10 2007 +0000
@@ -368,6 +368,14 @@
 					   data);
 }
 
+static gboolean
+msn_offline_message(const PurpleBuddy *buddy) {
+	if (buddy == NULL)
+		return FALSE;
+	MsnUser *user = buddy->proto_data;
+	return user && user->mobile;
+}
+
 static void
 initiate_chat_cb(PurpleBlistNode *node, gpointer data)
 {
@@ -2065,7 +2073,7 @@
 	msn_can_receive_file,	/* can_receive_file */
 	msn_send_file,			/* send_file */
 	msn_new_xfer,			/* new_xfer */
-	NULL,					/* offline_message */
+	msn_offline_message,			/* offline_message */
 	NULL,					/* whiteboard_prpl_ops */
 	NULL,					/* send_raw */
 	NULL,					/* roomlist_room_serialize */
--- a/libpurple/protocols/msn/user.c	Fri May 04 03:44:00 2007 +0000
+++ b/libpurple/protocols/msn/user.c	Fri May 04 03:52:10 2007 +0000
@@ -83,7 +83,7 @@
 
 	if (user->status != NULL) {
 		if (!strcmp(user->status, "offline") && user->mobile) {
-			purple_prpl_got_user_status(account, user->passport, "available", NULL);
+			purple_prpl_got_user_status(account, user->passport, "offline", NULL);
 			purple_prpl_got_user_status(account, user->passport, "mobile", NULL);
 		} else {
 			purple_prpl_got_user_status(account, user->passport, user->status, NULL);