diff src/protocols/msn/msn.c @ 4732:c15e0699acae

[gaim-migrate @ 5047] hopefully this doesn't break anything. - Capabilities are back in the tooltips - Jabber does the neat status thing in the buddy list - jabber "broken" buddies are gone! woohoo! - most of the right-click menu items moved back to where they used to live, but Get Info remains at the top, because that's where it should be. committer: Tailor Script <[e-mail]>

--- a/src/protocols/msn/msn.c	Thu Mar 13 00:10:56 2003 +0000
+++ b/src/protocols/msn/msn.c	Thu Mar 13 06:08:56 2003 +0000
@@ -418,7 +418,7 @@
 		char *usr = buf;
 
 		GET_NEXT(usr);
-		serv_got_update(gc, usr, 0, 0, 0, 0, 0, 0);
+		serv_got_update(gc, usr, 0, 0, 0, 0, 0);
 	} else if (!g_strncasecmp(buf, "GTC", 3)) {
 	} else if (!g_strncasecmp(buf, "INF", 3)) {
 	} else if (!g_strncasecmp(buf, "ILN", 3)) {
@@ -452,7 +452,7 @@
 			status |= UC_UNAVAILABLE | (MSN_LUNCH << 1);
 		}
 
-		serv_got_update(gc, user, 1, 0, 0, 0, status, 0);
+		serv_got_update(gc, user, 1, 0, 0, 0, status);
 	} else if (!g_strncasecmp(buf, "LST", 3)) {
 		char *which, *who, *friend, *tmp = buf;
 		struct msn_add_permit *ap; /* for any as yet undealt with buddies who've added you to their buddy list when you were off-line.  How dare they! */
@@ -596,7 +596,7 @@
 			status |= UC_UNAVAILABLE | (MSN_LUNCH << 1);
 		}
 
-		serv_got_update(gc, user, 1, 0, 0, 0, status, 0);
+		serv_got_update(gc, user, 1, 0, 0, 0, status);
 	} else if (!g_strncasecmp(buf, "OUT", 3)) {
 		char *tmp = buf;
 
@@ -1637,14 +1637,14 @@
 	mft->xfer = transfer_out_add(gc, mft->sn);
 }
 #endif
-static const char *msn_status_text(struct buddy *b) {
+static char *msn_status_text(struct buddy *b) {
 	if (b->uc & UC_UNAVAILABLE)
-		return msn_get_away_text(b->uc >> 1);
+		return strip_html(msn_get_away_text(b->uc >> 1));
 	return NULL;
 }
 
-static const char *msn_tooltip_text(struct buddy *b) {
-	return g_strdup(msn_get_away_text(b->uc >> 1));
+static char *msn_tooltip_text(struct buddy *b) {
+	return strip_html(msn_get_away_text(b->uc >> 1));
 }
 
 static GList *msn_buddy_menu(struct gaim_connection *gc, char *who)