# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1056848422 0
# Node ID 0878caaef952525727ce6bf3ef30c1b0733748a8
# Parent  730015652f4dd2daa359bfb57b2475fa97b07049
[gaim-migrate @ 6418]
I made ICQ people show up as ICQ people when signed on through TOC.

For some reason I changed the tabbing of stuff in an oscar file.

committer: Tailor Script <tailor@pidgin.im>

diff -r 730015652f4d -r 0878caaef952 src/protocols/oscar/im.c
--- a/src/protocols/oscar/im.c	Sat Jun 28 17:15:23 2003 +0000
+++ b/src/protocols/oscar/im.c	Sun Jun 29 01:00:22 2003 +0000
@@ -62,15 +62,14 @@
  *
  *
  * Heres the current collection:
- *  0501 0003 0101 0101 01	AOL Mobile Communicator, WinAIM 1.0.414
- *  0501 0003 0101 0201 01	WinAIM 2.0.847, 2.1.1187, 3.0.1464, 
+ *  0501 0003 0101 0101 01		AOL Mobile Communicator, WinAIM 1.0.414
+ *  0501 0003 0101 0201 01		WinAIM 2.0.847, 2.1.1187, 3.0.1464, 
  *					4.3.2229, 4.4.2286
  *  0501 0004 0101 0102 0101	WinAIM 4.1.2010, libfaim (right here)
- *  0501 0003 0101 02		WinAIM 5
- *  0501 0001 01		iChat x.x
- *  0501 0001 0101 01		AOL v6.0, CompuServe 2000 v6.0, any
- *				TOC client
- *  0501 0002 0106		WinICQ 5.45.1.3777.85
+ *  0501 0003 0101 02			WinAIM 5
+ *  0501 0001 01				iChat x.x, mobile buddies
+ *  0501 0001 0101 01			AOL v6.0, CompuServe 2000 v6.0, any TOC client
+ *  0501 0002 0106				WinICQ 5.45.1.3777.85
  *
  * Note that in this function, only the feature bytes are tested, since
  * the rest will always be the same.
diff -r 730015652f4d -r 0878caaef952 src/protocols/toc/toc.c
--- a/src/protocols/toc/toc.c	Sat Jun 28 17:15:23 2003 +0000
+++ b/src/protocols/toc/toc.c	Sun Jun 29 01:00:22 2003 +0000
@@ -1267,6 +1267,15 @@
 
 static const char *toc_list_icon(GaimAccount *a, struct buddy *b)
 {
+	if (!b || (b && b->name && b->name[0] == '+')) {
+		if (a != NULL && isdigit(*gaim_account_get_username(a))) 
+			return "icq";
+		else
+			return "aim";
+	}
+
+	if (b && b->name && isdigit(b->name[0]))
+		return "icq";
 	return "aim";
 }
 
@@ -1275,7 +1284,7 @@
 	char *emblems[4] = {NULL,NULL,NULL,NULL};
 	int i = 0;
 
-	if (b->present == GAIM_BUDDY_OFFLINE) {
+	if (!GAIM_BUDDY_IS_ONLINE(b)) {
 		*se = "offline";
 		return;
 	} else {