comparison libpurple/protocols/oscar/oscar.c @ 28588:8d5380556f12

Rename two variables based on insight from http://dev.aol.com/aim/oscar/#ICBM__CLIENT_EVENT
author Mark Doliner <mark@kingant.net>
date Sun, 06 Sep 2009 21:16:57 +0000
parents 98c5109a3d1f
children 3b820f5d7d6a
comparison
equal deleted inserted replaced
28587:98c5109a3d1f 28588:8d5380556f12
3228 } 3228 }
3229 3229
3230 static int purple_parse_mtn(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...) { 3230 static int purple_parse_mtn(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...) {
3231 PurpleConnection *gc = od->gc; 3231 PurpleConnection *gc = od->gc;
3232 va_list ap; 3232 va_list ap;
3233 guint16 type1, type2; 3233 guint16 channel, event;
3234 char *bn; 3234 char *bn;
3235 3235
3236 va_start(ap, fr); 3236 va_start(ap, fr);
3237 type1 = (guint16) va_arg(ap, unsigned int); 3237 channel = (guint16) va_arg(ap, unsigned int);
3238 bn = va_arg(ap, char *); 3238 bn = va_arg(ap, char *);
3239 type2 = (guint16) va_arg(ap, unsigned int); 3239 event = (guint16) va_arg(ap, unsigned int);
3240 va_end(ap); 3240 va_end(ap);
3241 3241
3242 switch (type2) { 3242 switch (event) {
3243 case 0x0000: { /* Text has been cleared */ 3243 case 0x0000: { /* Text has been cleared */
3244 serv_got_typing_stopped(gc, bn); 3244 serv_got_typing_stopped(gc, bn);
3245 } break; 3245 } break;
3246 3246
3247 case 0x0001: { /* Paused typing */ 3247 case 0x0001: { /* Paused typing */
3250 3250
3251 case 0x0002: { /* Typing */ 3251 case 0x0002: { /* Typing */
3252 serv_got_typing(gc, bn, 0, PURPLE_TYPING); 3252 serv_got_typing(gc, bn, 0, PURPLE_TYPING);
3253 } break; 3253 } break;
3254 3254
3255 case 0x000f: { /* Closed IM window */
3256 serv_got_typing_stopped(gc, bn);
3257 } break;
3258
3255 default: { 3259 default: {
3256 /* 3260 purple_debug_info("oscar", "Received unknown typing "
3257 * It looks like iChat sometimes sends typing notification 3261 "notification message from %s. Channel is 0x%04x "
3258 * with type1=0x0001 and type2=0x000f. Not sure why. 3262 "and event is 0x%04hx.\n", bn, channel, event);
3259 */
3260 purple_debug_info("oscar", "Received unknown typing notification message from %s. Type1 is 0x%04x and type2 is 0x%04hx.\n", bn, type1, type2);
3261 } break; 3263 } break;
3262 } 3264 }
3263 3265
3264 return 1; 3266 return 1;
3265 } 3267 }