# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1037231650 0
# Node ID 7ba5f2e13ee84790270d6a3cd3efbbbd991159a9
# Parent  9c2d8579ff3e0b87fa5c274c12e4ccbb0211bbec
[gaim-migrate @ 4142]
Small oscar corrections.  I don't think anything is really affected.

committer: Tailor Script <tailor@pidgin.im>

diff -r 9c2d8579ff3e -r 7ba5f2e13ee8 src/protocols/oscar/ft.c
--- a/src/protocols/oscar/ft.c	Wed Nov 13 23:53:13 2002 +0000
+++ b/src/protocols/oscar/ft.c	Wed Nov 13 23:54:10 2002 +0000
@@ -16,11 +16,9 @@
 #include <netinet/in.h>
 #include <sys/utsname.h> /* for aim_directim_initiate */
 #include <arpa/inet.h> /* for inet_ntoa */
+#define G_DIR_SEPARATOR '/'
 #endif
 
-/* XXX - I really don't think this should include gaim.h */
-#include "gaim.h"
-
 #ifdef _WIN32
 #include "win32dep.h"
 #endif
@@ -1493,16 +1491,6 @@
 
 	aim_tx_enqueue(sess, newoft);
 
-	/*
-	 * Throw away the resource fork, in case we are receiving from a Mac.
-	 */
-	if (ft->fh.rfsize) {
-		char *buf = malloc(ft->fh.rfsize);
-		if (!buf)
-			return -1;
-		aim_recv(conn->fd, buf, ft->fh.rfsize);
-	}
-
 	if ( (userfunc = aim_callhandler(sess, conn, AIM_CB_FAM_OFT, AIM_CB_OFT_SENDFILEFILEREQ)) == NULL)
 		return 1;
 
@@ -1522,7 +1510,7 @@
 /* 
  * These were originally described by Josh Myer:
  * http://www.geocrawler.com/archives/3/896/2000/9/0/4291064/
- * XXX this doesn't actualy work yet
+ * XXX this doesn't actually work yet
  * -- wtm
  */
 static int handlehdr_sendfile_resume(aim_session_t *sess, aim_conn_t *conn, aim_bstream_t *bs) {
@@ -2124,9 +2112,9 @@
 	fh->compress = 0x0000;
 	fh->totfiles = numfiles;
 	fh->filesleft = numfiles - filesdone;
-	fh->totparts = 0x0001;
+	fh->totparts = 0x0001; /* set to 0x0002 sending Mac resource forks */
 	fh->partsleft = 0x0001;
-	fh->totsize = totsize; /* set to 0x0002 sending Mac resource forks */
+	fh->totsize = totsize;
 	fh->size = size;
 	fh->modtime = (int)time(NULL); /* we'll go with current time for now */
 	/* fh->checksum set above */
diff -r 9c2d8579ff3e -r 7ba5f2e13ee8 src/protocols/oscar/rxqueue.c
--- a/src/protocols/oscar/rxqueue.c	Wed Nov 13 23:53:13 2002 +0000
+++ b/src/protocols/oscar/rxqueue.c	Wed Nov 13 23:54:10 2002 +0000
@@ -129,7 +129,7 @@
 }
 
 /*
- * Read a rendevouz header from conn into fr, and return the number of bytes in the payload.
+ * Read a rendezvous header from conn into fr, and return the number of bytes in the payload.
  */
 static int aim_get_command_rendezvous(aim_session_t *sess, aim_conn_t *conn, aim_frame_t *fr)
 {