diff src/protocols/msn/notification.c @ 9967:2f153f8cdf81

[gaim-migrate @ 10877] (21:12:31) KingAnt: What's up with MSN status stuff? (21:12:33) KingAnt: I want to compile (21:12:35) LSchiere: hey mark :-) (21:12:39) LSchiere: lack of patches (21:12:48) nosnilmot: http://nosnilmot.com/patches/gaim-1.0.0cvs-msn-status.patch (21:12:54) KingAnt: Ha ha (21:12:57) LSchiere: there we go :-D (21:12:58) nosnilmot: might be good enough, might not (21:13:06) KingAnt: I need to ask these kinds of questions more often committer: Tailor Script <[e-mail]>

--- a/src/protocols/msn/notification.c	Wed Sep 08 01:10:26 2004 +0000
+++ b/src/protocols/msn/notification.c	Wed Sep 08 01:16:14 2004 +0000
@@ -453,7 +453,7 @@
 
 	gc = cmdproc->session->account->gc;
 
-	serv_got_update(gc, cmd->params[0], FALSE, 0, 0, 0, 0);
+	serv_got_update(gc, cmd->params[0], FALSE, 0);
 }
 
 static void
@@ -463,10 +463,7 @@
 	GaimConnection *gc;
 	MsnUser *user;
 	MsnObject *msnobj;
-	int status = 0;
-	int idle = 0;
-	const char *state, *passport, *friendly;
-	GaimBuddy *b;
+	const char *status, *state, *passport, *friendly;
 
 	session = cmdproc->session;
 	gc = session->account->gc;
@@ -488,26 +485,30 @@
 		msn_user_set_object(user, msnobj);
 	}
 
+/*	what does this do?????
 	if ((b = gaim_find_buddy(gc->account, passport)) != NULL)
-		status |= ((((b->uc) >> 1) & 0xF0) << 1);
+		status |= ((((b->uc) >> 1) & 0xF0) << 1); */
 
 	if (!g_ascii_strcasecmp(state, "BSY"))
-		status |= UC_UNAVAILABLE | (MSN_BUSY << 1);
+		status = "busy";
 	else if (!g_ascii_strcasecmp(state, "IDL"))
 	{
-		status |= UC_UNAVAILABLE | (MSN_IDLE << 1);
-		idle = -1;
+		/* do something about idle time? */
+		status = "idle";
 	}
 	else if (!g_ascii_strcasecmp(state, "BRB"))
-		status |= UC_UNAVAILABLE | (MSN_BRB << 1);
+		status = "brb";
 	else if (!g_ascii_strcasecmp(state, "AWY"))
-		status |= UC_UNAVAILABLE | (MSN_AWAY << 1);
+		status = "away";
 	else if (!g_ascii_strcasecmp(state, "PHN"))
-		status |= UC_UNAVAILABLE | (MSN_PHONE << 1);
+		status = "phone";
 	else if (!g_ascii_strcasecmp(state, "LUN"))
-		status |= UC_UNAVAILABLE | (MSN_LUNCH << 1);
+		status = "lunch";
+	else
+		status = "available";
 
-	serv_got_update(gc, passport, TRUE, 0, 0, idle, status);
+	/* serv_got_update(gc, passport, TRUE, 0, 0, idle, status); */
+	gaim_prpl_got_user_status(gc->account, passport, status, NULL);
 }
 
 static void
@@ -535,8 +536,7 @@
 	const char *state;
 	const char *passport;
 	const char *friendly;
-	int status = 0;
-	int idle = 0;
+	const char *status;
 
 	session = cmdproc->session;
 	gc = session->account->gc;
@@ -567,22 +567,25 @@
 	}
 
 	if (!g_ascii_strcasecmp(state, "BSY"))
-		status |= UC_UNAVAILABLE | (MSN_BUSY << 1);
+		status = "busy";
 	else if (!g_ascii_strcasecmp(state, "IDL"))
 	{
-		status |= UC_UNAVAILABLE | (MSN_IDLE << 1);
-		idle = -1;
+		/* do something about idle time? */
+		status = "idle";
 	}
 	else if (!g_ascii_strcasecmp(state, "BRB"))
-		status |= UC_UNAVAILABLE | (MSN_BRB << 1);
+		status = "brb";
 	else if (!g_ascii_strcasecmp(state, "AWY"))
-		status |= UC_UNAVAILABLE | (MSN_AWAY << 1);
+		status = "away";
 	else if (!g_ascii_strcasecmp(state, "PHN"))
-		status |= UC_UNAVAILABLE | (MSN_PHONE << 1);
+		status = "phone";
 	else if (!g_ascii_strcasecmp(state, "LUN"))
-		status |= UC_UNAVAILABLE | (MSN_LUNCH << 1);
+		status = "lunch";
+	else
+		status = "available";
 
-	serv_got_update(gc, passport, TRUE, 0, 0, idle, status);
+	/* serv_got_update(gc, passport, TRUE, 0, 0, idle, status); */
+	gaim_prpl_got_user_status(gc->account, passport, status, NULL);
 }
 
 static void