Menu
▾
▴
[Gaim-commits] CVS: gaim/src/protocols/oscar aim.h,1.58,1.59 icq.c,1.13,1.14 im.c,1.33,1.34 oscar.c,1.192,1.193
|
From: Mark D. <the...@us...> - 2003-01-02 22:22:55
|
Update of /cvsroot/gaim/gaim/src/protocols/oscar
In directory sc8-pr-cvs1:/tmp/cvs-serv8648/src/protocols/oscar
Modified Files:
aim.h icq.c im.c oscar.c
Log Message:
So type is actually 1 byte, and not 2.
Something about an ass out of u and me.
This should make multi-recipient ICQ messages work.
It also fixes a little mistake that caused ICQ URLs,
auth requests, pager messages, emails, and ICQ cotact
sending thingies to not show up. I don't think that
bug existed for more than a more days.
Index: aim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/aim.h,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- aim.h 29 Dec 2002 17:12:05 -0000 1.58
+++ aim.h 2 Jan 2003 22:22:32 -0000 1.59
@@ -913,7 +913,8 @@
struct aim_incomingim_ch4_args {
fu32_t uin; /* Of the sender of the ICBM */
- fu16_t type;
+ fu8_t type;
+ fu8_t flags;
char *msg; /* Reason for auth request, deny, or accept */
int msglen;
};
@@ -1170,7 +1171,8 @@
fu32_t sender;
fu16_t year;
fu8_t month, day, hour, minute;
- fu16_t type;
+ fu8_t type;
+ fu8_t flags;
char *msg;
int msglen;
};
Index: icq.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/icq.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- icq.c 31 Dec 2002 02:27:21 -0000 1.13
+++ icq.c 2 Jan 2003 22:22:34 -0000 1.14
@@ -221,7 +221,8 @@
msg.day = aimbs_getle8(&qbs);
msg.hour = aimbs_getle8(&qbs);
msg.minute = aimbs_getle8(&qbs);
- msg.type = aimbs_getle16(&qbs);
+ msg.type = aimbs_getle8(&qbs);
+ msg.flags = aimbs_getle8(&qbs);
msg.msglen = aimbs_getle16(&qbs);
msg.msg = aimbs_getstr(&qbs, msg.msglen);
Index: im.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/im.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- im.c 31 Dec 2002 02:27:21 -0000 1.33
+++ im.c 2 Jan 2003 22:22:36 -0000 1.34
@@ -1860,7 +1860,8 @@
aim_bstream_init(&meat, block->value, block->length);
args.uin = aimbs_getle32(&meat);
- args.type = aimbs_getle16(&meat);
+ args.type = aimbs_getle8(&meat);
+ args.flags = aimbs_getle8(&meat);
args.msglen = aimbs_getle16(&meat);
args.msg = aimbs_getraw(&meat, args.msglen);
Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -d -r1.192 -r1.193
--- oscar.c 2 Jan 2003 01:18:21 -0000 1.192
+++ oscar.c 2 Jan 2003 22:22:38 -0000 1.193
@@ -2078,7 +2078,7 @@
debug_printf("Received a channel 4 message of type %d.\n", args->type);
/* Split up the message at the delimeter character, then convert each string to UTF-8 */
- msg1 = g_strsplit(args->msg, "\177", 0);
+ msg1 = g_strsplit(args->msg, "\376", 0);
msg2 = (gchar **)g_malloc(10*sizeof(gchar *)); /* AAA */
for (i=0; msg1[i]; i++) {
strip_linefeed(msg1[i]);
@@ -2089,7 +2089,7 @@
msg2[i] = NULL;
switch (args->type) {
- case 0x0001: { /* MacICQ message or basic offline message */
+ case 0x01: { /* MacICQ message or basic offline message */
if (i >= 1) {
gchar *uin = g_strdup_printf("%lu", args->uin);
if (t) { /* This is an offline message */
@@ -2102,7 +2102,7 @@
}
} break;
- case 0x0004: { /* Someone sent you a URL */
+ case 0x04: { /* Someone sent you a URL */
if (i >= 2) {
gchar *uin = g_strdup_printf("%lu", args->uin);
gchar *message = g_strdup_printf("<A HREF=\"%s\">%s</A>", msg2[1], msg2[0]);
@@ -2112,7 +2112,7 @@
}
} break;
- case 0x0006: { /* Someone requested authorization */
+ case 0x06: { /* Someone requested authorization */
if (i >= 6) {
struct channel4_data *data = g_new(struct channel4_data, 1);
char *dialog_msg = g_strdup_printf(_("The user %lu wants to add you to their buddy list for the following reason: %s"), args->uin, msg2[5] ? msg2[5] : _("No reason given."));
@@ -2124,7 +2124,7 @@
}
} break;
- case 0x0007: { /* Someone has denied you authorization */
+ case 0x07: { /* Someone has denied you authorization */
if (i >= 1) {
char *dialog_msg = g_strdup_printf(_("The user %lu has denied your request to add them to your contact list for the following reason:\n%s"), args->uin, msg2[0] ? msg2[0] : _("No reason given."));
do_error_dialog(_("ICQ authorization denied."), dialog_msg, GAIM_ERROR);
@@ -2132,13 +2132,13 @@
}
} break;
- case 0x0008: { /* Someone has granted you authorization */
+ case 0x08: { /* Someone has granted you authorization */
char *dialog_msg = g_strdup_printf(_("The user %lu has granted your request to add them to your contact list."), args->uin);
do_error_dialog("ICQ authorization accepted.", dialog_msg, GAIM_INFO);
g_free(dialog_msg);
} break;
- case 0x000d: { /* Someone has sent you a pager message from http://www.icq.com/your_uin */
+ case 0x0d: { /* Someone has sent you a pager message from http://www.icq.com/your_uin */
if (i >= 6) {
char *dialog_msg = g_strdup_printf(_("You have received an ICQ page\n\nFrom: %s [%s]\n%s"), msg2[0], msg2[3], msg2[5]);
do_error_dialog("ICQ Page", dialog_msg, GAIM_INFO);
@@ -2146,7 +2146,7 @@
}
} break;
- case 0x000e: { /* Someone has emailed you at you...@pa... */
+ case 0x0e: { /* Someone has emailed you at you...@pa... */
if (i >= 6) {
char *dialog_msg = g_strdup_printf(_("You have received an ICQ email\n\n1=%s\n2=%s\n3=%s\n4=%s\n5=%s\n6=%s\n"), msg2[0], msg2[1], msg2[2], msg2[3], msg2[4], msg2[5]);
do_error_dialog("ICQ Email", dialog_msg, GAIM_INFO);
@@ -2154,14 +2154,15 @@
}
} break;
- case 0x0012: {
+ case 0x12: {
/* Ack for authorizing/denying someone. Or possibly an ack for sending any system notice */
+ /* Someone added you to their contact list? */
} break;
- case 0x0013: { /* Someone has sent you some ICQ contacts */
+ case 0x13: { /* Someone has sent you some ICQ contacts */
int i, num;
gchar **text;
- text = g_strsplit(args->msg, "\177", 0);
+ text = g_strsplit(args->msg, "\376", 0);
if (text) {
num = 0;
for (i=0; i<strlen(text[0]); i++)
@@ -2179,12 +2180,12 @@
}
} break;
- case 0x001a: { /* Someone has sent you a greeting card or requested contacts? */
+ case 0x1a: { /* Someone has sent you a greeting card or requested contacts? */
/* This is boring and silly. */
} break;
default: {
- debug_printf("Received a channel 4 message of unknown type (type 0x%04d).\n", args->type);
+ debug_printf("Received a channel 4 message of unknown type (type 0x%02d).\n", args->type);
} break;
}
@@ -3268,6 +3269,7 @@
debug_printf("Received offline message. Converting to channel 4 ICBM...\n");
args.uin = msg->sender;
args.type = msg->type;
+ args.flags = msg->flags;
args.msglen = msg->msglen;
args.msg = msg->msg;
t = get_time(msg->year, msg->month, msg->day, msg->hour, msg->minute, 0);
|