[Gaim-commits] SF.net SVN: gaim: [16970] trunk/libgaim/protocols/yahoo

[<ma...@us...>]

Revision: 16970
Author:   marv_sf
Date:     2006-08-21 21:46:42 -0700 (Mon, 21 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16970&view=rev

Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/libgaim/protocols/yahoo/yahoo.c
    trunk/libgaim/protocols/yahoo/yahoo_friend.h
Modified: trunk/libgaim/protocols/yahoo/yahoo.c
===================================================================
--- trunk/libgaim/protocols/yahoo/yahoo.c	2006-08-22 03:01:52 UTC (rev 16969)
+++ trunk/libgaim/protocols/yahoo/yahoo.c	2006-08-22 04:46:42 UTC (rev 16970)
@@ -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");

Modified: trunk/libgaim/protocols/yahoo/yahoo_friend.h
===================================================================
--- trunk/libgaim/protocols/yahoo/yahoo_friend.h	2006-08-22 03:01:52 UTC (rev 16969)
+++ trunk/libgaim/protocols/yahoo/yahoo_friend.h	2006-08-22 04:46:42 UTC (rev 16970)
@@ -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);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.