[Gaim-commits] CVS: gaim/src/protocols/oscar oscar.c,1.870,1.871

[Evan S. <ev...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/oscar
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2024

Modified Files:
	oscar.c 
Log Message:
Unescape HTML when sending messages to SMS (mobile) users over AIM


Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.870
retrieving revision 1.871
diff -u -d -p -r1.870 -r1.871
--- oscar.c	7 Feb 2006 14:51:28 -0000	1.870
+++ oscar.c	7 Feb 2006 19:29:57 -0000	1.871
@@ -6524,10 +6524,12 @@ static int oscar_send_im(GaimConnection 
 		args.destsn = name;
 
 		/*
-		 * If we're IMing an ICQ user from an ICQ account, then strip HTML
-		 * and use \r\n as the newline character.
-		 */
-		if (aim_sn_is_icq(gaim_account_get_username(account))) {
+		 * If we're IMing an SMS user or an ICQ user from an ICQ account, then strip HTML.
+ 		 */
+		if (aim_snvalid_sms(name)) {
+			/* Messaging an SMS (mobile) user */
+			tmp2 = gaim_unescape_html(tmp1);			
+		} else if (aim_sn_is_icq(gaim_account_get_username(account))) {
 			if (aim_sn_is_icq(name))
 				/* From ICQ to ICQ */
 				tmp2 = gaim_unescape_html(tmp1);