Update of /cvsroot/gaim/gaim/src/protocols/oscar
In directory usw-pr-cvs1:/tmp/cvs-serv31872/src/protocols/oscar
Modified Files:
oscar.c txqueue.c
Log Message:
Some Image send fixes, and elimination of some compile warnings. There are still far too many (read: more than zero)
Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- oscar.c 14 Mar 2002 07:44:43 -0000 1.116
+++ oscar.c 15 Mar 2002 00:56:15 -0000 1.117
@@ -2423,6 +2423,7 @@
aim_send_typing(odata->sess, dim->conn, typing);
return 0;
}
+static void oscar_ask_direct_im(struct gaim_connection *gc, char *name);
static int oscar_send_im(struct gaim_connection *gc, char *name, char *message, int len, int imflags) {
struct oscar_data *odata = (struct oscar_data *)gc->proto_data;
Index: txqueue.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/txqueue.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- txqueue.c 14 Mar 2002 07:44:43 -0000 1.4
+++ txqueue.c 15 Mar 2002 00:56:15 -0000 1.5
@@ -241,7 +241,7 @@
(conn->subtype == AIM_CONN_SUBTYPE_OFT_DIRECTIM)) {
/* I strongly suspect that this is a horrible thing to do
* and I feel really guilty doing it. */
- char *sn = aim_directim_getsn(conn);
+ const char *sn = aim_directim_getsn(conn);
aim_rxcallback_t userfunc;
while (count - wrote > 1024) {
wrote = wrote + aim_send(conn->fd, bs->data + bs->offset + wrote, 1024);
|
