Mercurial > pidgin
comparison libpurple/protocols/oscar/oscar.c @ 21723:b3e4b81456b0
Get rid of one little userfunc callback and just call aim_im_setparams()
directly from aim_im_paraminfo()
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Sun, 02 Dec 2007 08:39:31 +0000 |
parents | 665e04562de0 |
children | 86f62b1e2a5a |
comparison
equal
deleted
inserted
replaced
21722:5a0c058c10e6 | 21723:b3e4b81456b0 |
---|---|
174 static int purple_parse_msgerr (OscarData *, FlapConnection *, FlapFrame *, ...); | 174 static int purple_parse_msgerr (OscarData *, FlapConnection *, FlapFrame *, ...); |
175 static int purple_parse_mtn (OscarData *, FlapConnection *, FlapFrame *, ...); | 175 static int purple_parse_mtn (OscarData *, FlapConnection *, FlapFrame *, ...); |
176 static int purple_parse_locaterights(OscarData *, FlapConnection *, FlapFrame *, ...); | 176 static int purple_parse_locaterights(OscarData *, FlapConnection *, FlapFrame *, ...); |
177 static int purple_parse_buddyrights(OscarData *, FlapConnection *, FlapFrame *, ...); | 177 static int purple_parse_buddyrights(OscarData *, FlapConnection *, FlapFrame *, ...); |
178 static int purple_parse_locerr (OscarData *, FlapConnection *, FlapFrame *, ...); | 178 static int purple_parse_locerr (OscarData *, FlapConnection *, FlapFrame *, ...); |
179 static int purple_icbm_param_info (OscarData *, FlapConnection *, FlapFrame *, ...); | |
180 static int purple_parse_genericerr (OscarData *, FlapConnection *, FlapFrame *, ...); | 179 static int purple_parse_genericerr (OscarData *, FlapConnection *, FlapFrame *, ...); |
181 static int purple_memrequest (OscarData *, FlapConnection *, FlapFrame *, ...); | 180 static int purple_memrequest (OscarData *, FlapConnection *, FlapFrame *, ...); |
182 static int purple_selfinfo (OscarData *, FlapConnection *, FlapFrame *, ...); | 181 static int purple_selfinfo (OscarData *, FlapConnection *, FlapFrame *, ...); |
183 static int purple_offlinemsg (OscarData *, FlapConnection *, FlapFrame *, ...); | 182 static int purple_offlinemsg (OscarData *, FlapConnection *, FlapFrame *, ...); |
184 static int purple_offlinemsgdone (OscarData *, FlapConnection *, FlapFrame *, ...); | 183 static int purple_offlinemsgdone (OscarData *, FlapConnection *, FlapFrame *, ...); |
1226 oscar_data_addhandler(od, SNAC_FAMILY_FEEDBAG, SNAC_SUBTYPE_FEEDBAG_MOD, purple_ssi_parseaddmod, 0); | 1225 oscar_data_addhandler(od, SNAC_FAMILY_FEEDBAG, SNAC_SUBTYPE_FEEDBAG_MOD, purple_ssi_parseaddmod, 0); |
1227 oscar_data_addhandler(od, SNAC_FAMILY_FEEDBAG, SNAC_SUBTYPE_FEEDBAG_RECVAUTH, purple_ssi_authgiven, 0); | 1226 oscar_data_addhandler(od, SNAC_FAMILY_FEEDBAG, SNAC_SUBTYPE_FEEDBAG_RECVAUTH, purple_ssi_authgiven, 0); |
1228 oscar_data_addhandler(od, SNAC_FAMILY_FEEDBAG, SNAC_SUBTYPE_FEEDBAG_RECVAUTHREQ, purple_ssi_authrequest, 0); | 1227 oscar_data_addhandler(od, SNAC_FAMILY_FEEDBAG, SNAC_SUBTYPE_FEEDBAG_RECVAUTHREQ, purple_ssi_authrequest, 0); |
1229 oscar_data_addhandler(od, SNAC_FAMILY_FEEDBAG, SNAC_SUBTYPE_FEEDBAG_RECVAUTHREP, purple_ssi_authreply, 0); | 1228 oscar_data_addhandler(od, SNAC_FAMILY_FEEDBAG, SNAC_SUBTYPE_FEEDBAG_RECVAUTHREP, purple_ssi_authreply, 0); |
1230 oscar_data_addhandler(od, SNAC_FAMILY_FEEDBAG, SNAC_SUBTYPE_FEEDBAG_ADDED, purple_ssi_gotadded, 0); | 1229 oscar_data_addhandler(od, SNAC_FAMILY_FEEDBAG, SNAC_SUBTYPE_FEEDBAG_ADDED, purple_ssi_gotadded, 0); |
1231 oscar_data_addhandler(od, SNAC_FAMILY_ICBM, 0x0005, purple_icbm_param_info, 0); | |
1232 oscar_data_addhandler(od, SNAC_FAMILY_ICBM, SNAC_SUBTYPE_ICBM_INCOMING, purple_parse_incoming_im, 0); | 1230 oscar_data_addhandler(od, SNAC_FAMILY_ICBM, SNAC_SUBTYPE_ICBM_INCOMING, purple_parse_incoming_im, 0); |
1233 oscar_data_addhandler(od, SNAC_FAMILY_ICBM, SNAC_SUBTYPE_ICBM_MISSEDCALL, purple_parse_misses, 0); | 1231 oscar_data_addhandler(od, SNAC_FAMILY_ICBM, SNAC_SUBTYPE_ICBM_MISSEDCALL, purple_parse_misses, 0); |
1234 oscar_data_addhandler(od, SNAC_FAMILY_ICBM, SNAC_SUBTYPE_ICBM_CLIENTAUTORESP, purple_parse_clientauto, 0); | 1232 oscar_data_addhandler(od, SNAC_FAMILY_ICBM, SNAC_SUBTYPE_ICBM_CLIENTAUTORESP, purple_parse_clientauto, 0); |
1235 oscar_data_addhandler(od, SNAC_FAMILY_ICBM, SNAC_SUBTYPE_ICBM_ERROR, purple_parse_msgerr, 0); | 1233 oscar_data_addhandler(od, SNAC_FAMILY_ICBM, SNAC_SUBTYPE_ICBM_ERROR, purple_parse_msgerr, 0); |
1236 oscar_data_addhandler(od, SNAC_FAMILY_ICBM, SNAC_SUBTYPE_ICBM_MTN, purple_parse_mtn, 0); | 1234 oscar_data_addhandler(od, SNAC_FAMILY_ICBM, SNAC_SUBTYPE_ICBM_MTN, purple_parse_mtn, 0); |
3496 } | 3494 } |
3497 | 3495 |
3498 return 1; | 3496 return 1; |
3499 } | 3497 } |
3500 | 3498 |
3501 static int purple_icbm_param_info(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...) { | |
3502 struct aim_icbmparameters *params; | |
3503 va_list ap; | |
3504 | |
3505 va_start(ap, fr); | |
3506 params = va_arg(ap, struct aim_icbmparameters *); | |
3507 va_end(ap); | |
3508 | |
3509 /* XXX - evidently this crashes on solaris. i have no clue why | |
3510 purple_debug_misc("oscar", "ICBM Parameters: maxchannel = %hu, default flags = 0x%08lx, max msg len = %hu, " | |
3511 "max sender evil = %f, max receiver evil = %f, min msg interval = %u\n", | |
3512 params->maxchan, params->flags, params->maxmsglen, | |
3513 ((float)params->maxsenderwarn)/10.0, ((float)params->maxrecverwarn)/10.0, | |
3514 params->minmsginterval); | |
3515 */ | |
3516 | |
3517 /* Maybe senderwarn and recverwarn should be user preferences... */ | |
3518 params->flags = 0x0000000b; | |
3519 params->maxmsglen = 8000; | |
3520 params->minmsginterval = 0; | |
3521 | |
3522 aim_im_setparams(od, params); | |
3523 | |
3524 return 1; | |
3525 } | |
3526 | |
3527 static int purple_parse_locaterights(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...) | 3499 static int purple_parse_locaterights(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...) |
3528 { | 3500 { |
3529 PurpleConnection *gc = od->gc; | 3501 PurpleConnection *gc = od->gc; |
3530 PurpleAccount *account = purple_connection_get_account(gc); | 3502 PurpleAccount *account = purple_connection_get_account(gc); |
3531 va_list ap; | 3503 va_list ap; |