Changes in protocols/yahoo/yahoo.c [5a71d9c:dfbb056]
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
protocols/yahoo/yahoo.c
r5a71d9c rdfbb056 163 163 g_slist_free( yd->buddygroups ); 164 164 165 if( yd->logged_in ) 166 yahoo_logoff( yd->y2_id ); 167 else 168 yahoo_close( yd->y2_id ); 165 yahoo_logoff( yd->y2_id ); 169 166 170 167 g_free( yd ); … … 315 312 struct byahoo_data *yd = (struct byahoo_data *) c->ic->proto_data; 316 313 317 yahoo_conference_invite( yd->y2_id, NULL, c->data, c->title, msg );314 yahoo_conference_invite( yd->y2_id, NULL, c->data, c->title, msg ? msg : "" ); 318 315 } 319 316 … … 354 351 struct prpl *ret = g_new0(struct prpl, 1); 355 352 ret->name = "yahoo"; 356 ret->mms = 832; /* this guess taken from libotr UPGRADING file */357 353 ret->init = byahoo_init; 358 354 … … 454 450 { 455 451 struct byahoo_write_ready_data *d = data; 456 457 if( !byahoo_get_ic_by_id( d->id ) )458 /* WTF doesn't libyahoo clean this up? */459 return FALSE;460 452 461 453 yahoo_write_ready( d->id, d->fd, d->data ); … … 798 790 } 799 791 800 static void byahoo_accept_conf( gpointer w, struct byahoo_conf_invitation *inv ) 801 { 792 static void byahoo_accept_conf( void *data ) 793 { 794 struct byahoo_conf_invitation *inv = data; 795 802 796 yahoo_conference_logon( inv->yid, NULL, inv->members, inv->name ); 803 797 imcb_chat_add_buddy( inv->c, inv->ic->acc->user ); … … 806 800 } 807 801 808 static void byahoo_reject_conf( gpointer w, struct byahoo_conf_invitation *inv ) 809 { 802 static void byahoo_reject_conf( void *data ) 803 { 804 struct byahoo_conf_invitation *inv = data; 805 810 806 yahoo_conference_decline( inv->yid, NULL, inv->members, inv->name, "User rejected groupchat" ); 811 807 imcb_chat_free( inv->c );
Note: See TracChangeset
for help on using the changeset viewer.