changeset 14284:d559d6dcb970

[gaim-migrate @ 16970] I managed to do it wrong. Turns out I hadn't signed up for the beta, and was trying to send messages to the LCS version of my hotmail email address. What is LCS anyway? So now I think we properly support sending messages to LCS and windows live, assuming you manage to add those buddies in another client. I don't know what to do about duplicate screen names, or actually adding them. committer: Tailor Script <tailor@pidgin.im>
author Tim Ringenbach <marv@pidgin.im>
date Tue, 22 Aug 2006 04:46:42 +0000
parents 22ad3b783bbe
children baf9f997746c
files libgaim/protocols/yahoo/yahoo.c libgaim/protocols/yahoo/yahoo_friend.h
diffstat 2 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/libgaim/protocols/yahoo/yahoo.c	Tue Aug 22 03:01:52 2006 +0000
+++ b/libgaim/protocols/yahoo/yahoo.c	Tue Aug 22 04:46:42 2006 +0000
@@ -513,9 +513,9 @@
 			yahoo_do_group_check(account, ht, norm_bud, grp);
 
 			break;
-		case 241: /* msn user */
-			if (f && *pair->value == '1')
-				f->msn = TRUE;
+		case 241: /* another protocol user */
+			if (f)
+				f->protocol = strtol(pair->value, NULL, 10);
 			break;
 		/* case 242: */ /* this seems related to 241 */
 			/* break; */
@@ -3190,8 +3190,8 @@
 	msg2 = yahoo_string_encode(gc, msg, &utf8);
 
 	yahoo_packet_hash(pkt, "ss", 1, gaim_connection_get_display_name(gc), 5, who);
-	if ((f = yahoo_friend_find(gc, who)) && f->msn)
-		yahoo_packet_hash_str(pkt, 241, "1");
+	if ((f = yahoo_friend_find(gc, who)) && f->protocol)
+		yahoo_packet_hash_int(pkt, 241, f->protocol);
 
 	if (utf8)
 		yahoo_packet_hash_str(pkt, 97, "1");
--- a/libgaim/protocols/yahoo/yahoo_friend.h	Tue Aug 22 03:01:52 2006 +0000
+++ b/libgaim/protocols/yahoo/yahoo_friend.h	Tue Aug 22 04:46:42 2006 +0000
@@ -47,7 +47,7 @@
 	char *ip;
 	gboolean bicon_sent_request;
 	YahooPresenceVisibility presence;
-	gboolean msn;
+	int protocol; /* 1=LCS, 2=MSN*/
 } YahooFriend;
 
 YahooFriend *yahoo_friend_find(GaimConnection *gc, const char *name);