[Gaim-commits] CVS: gaim/src/protocols/oscar oscar.c,1.550,1.551 util.c,1.17,1.18

[Mark D. <the...@us...>]

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

Modified Files:
	oscar.c util.c 
Log Message:
Small patch from evands to let you add @mac.com screen names to your 
buddy lists again.  I think I broke this after 0.75 was released.

Also add a check to make sure you're signing on with a valid 
screen name, but leave it commented out because it would break 
the string freeze.


Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.550
retrieving revision 1.551
diff -u -d -p -r1.550 -r1.551
--- oscar.c	12 Mar 2004 01:55:54 -0000	1.550
+++ oscar.c	12 Mar 2004 22:57:27 -0000	1.551
@@ -698,6 +698,15 @@ static void oscar_login(GaimAccount *acc
 
 	gaim_debug(GAIM_DEBUG_MISC, "oscar", "oscar_login: gc = %p\n", gc);
 
+#if 0
+	if (!aim_snvalid(gaim_account_get_username(account))) {
+		gchar *buf;
+		buf = g_strdup_printf(_("Unable to login: Could not sign on as %s because the screen name is invalid.  Screen names must either start with a letter and contain only letters, numbers and spaces, or contain only numbers."), name);
+		gaim_connection_error(gc, buf);
+		g_free(buf);
+	}
+#endif
+
 	if (isdigit(*(gaim_account_get_username(account)))) {
 		od->icq = TRUE;
 	} else {

Index: util.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/util.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -p -r1.17 -r1.18
--- util.c	13 Jan 2004 05:44:37 -0000	1.17
+++ util.c	12 Mar 2004 22:57:29 -0000	1.18
@@ -179,7 +179,7 @@ faim_export int aim_snvalid(const char *
 			if (!isdigit(sn[i]))
 				return 0;
 		} else {
-			if (!isalnum(sn[i]) && (sn[i] != ' '))
+			if (!isalnum(sn[i]) && (sn[i] != ' ') && (sn[i] != '@') && (sn[i] != '.'))
 				return 0;
 		}
 		i++;