# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1043039340 0
# Node ID 33e5c088346b46c88d1a076895bd2b5e492a9338
# Parent  dd6671b5378c0f327382da742798af6f9e24313f
[gaim-migrate @ 4620]
Thanks again to Aubin LaBrosse for a direct IM fix and a file transfer
clean up.

committer: Tailor Script <tailor@pidgin.im>

diff -r dd6671b5378c -r 33e5c088346b src/protocols/oscar/oscar.c
--- a/src/protocols/oscar/oscar.c	Mon Jan 20 03:13:50 2003 +0000
+++ b/src/protocols/oscar/oscar.c	Mon Jan 20 05:09:00 2003 +0000
@@ -216,7 +216,7 @@
 
 	while (d) {
 		m = (struct direct_im *)d->data;
-		if (aim_sncmp(who, m->name))
+		if (!aim_sncmp(who, m->name))
 			return m;
 		d = d->next;
 	}
@@ -2013,6 +2013,13 @@
 
 		od->file_transfers = g_slist_append(od->file_transfers, oft);
 
+		if (*(strrchr(args->info.sendfile.filename, '\\') + 1) == '*' ) {
+			/* last char of the ft req is a star, they are sending us a
+			 * directory -- remove the star and trailing slash so we dont save
+			 * directories that look like 'dirname\*'  -- arl */
+			*strrchr(args->info.sendfile.filename, '\\') = '\0';
+		}
+
 		oft->xfer = transfer_in_add(gc, userinfo->sn, 
 				args->info.sendfile.filename,
 				args->info.sendfile.totsize,