Changes in protocols/jabber/jabber.c [f9928cb:aea8b68]
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
protocols/jabber/jabber.c
rf9928cb raea8b68 58 58 char str[16]; 59 59 60 s = set_add( &acc->set, "activity_timeout", "600", set_eval_int, acc ); 61 60 62 g_snprintf( str, sizeof( str ), "%d", jabber_port_list[0] ); 61 63 s = set_add( &acc->set, "port", str, set_eval_int, acc ); … … 63 65 64 66 s = set_add( &acc->set, "priority", "0", set_eval_priority, acc ); 67 68 s = set_add( &acc->set, "proxy", "<local>;<auto>", NULL, acc ); 65 69 66 70 s = set_add( &acc->set, "resource", "BitlBee", NULL, acc ); … … 262 266 struct jabber_data *jd = ic->proto_data; 263 267 268 while( jd->filetransfers ) 269 imcb_file_canceled( ic, ( ( struct jabber_transfer *) jd->filetransfers->data )->ft, "Logging out" ); 270 271 while( jd->streamhosts ) 272 { 273 jabber_streamhost_t *sh = jd->streamhosts->data; 274 jd->streamhosts = g_slist_remove( jd->streamhosts, sh ); 275 g_free( sh->jid ); 276 g_free( sh->host ); 277 g_free( sh ); 278 } 279 264 280 if( jd->fd >= 0 ) 265 281 jabber_end_stream( ic ); 266 282 267 283 while( ic->groupchats ) 268 jabber_chat_free( ic->groupchats );284 jabber_chat_free( ic->groupchats->data ); 269 285 270 286 if( jd->r_inpa >= 0 ) … … 307 323 bud = jabber_buddy_by_ext_jid( ic, who, 0 ); 308 324 else 309 bud = jabber_buddy_by_jid( ic, who, 0);325 bud = jabber_buddy_by_jid( ic, who, GET_BUDDY_BARE_OK ); 310 326 311 327 node = xt_new_node( "body", message, NULL ); … … 352 368 static void jabber_get_info( struct im_connection *ic, char *who ) 353 369 { 354 struct jabber_data *jd = ic->proto_data;355 370 struct jabber_buddy *bud; 356 371 357 if( strchr( who, '/' ) ) 358 bud = jabber_buddy_by_jid( ic, who, 0 ); 359 else 360 { 361 char *s = jabber_normalize( who ); 362 bud = g_hash_table_lookup( jd->buddies, s ); 363 g_free( s ); 364 } 372 bud = jabber_buddy_by_jid( ic, who, GET_BUDDY_FIRST ); 365 373 366 374 while( bud ) … … 550 558 ret->send_typing = jabber_send_typing; 551 559 ret->handle_cmp = g_strcasecmp; 560 ret->transfer_request = jabber_si_transfer_request; 552 561 553 562 register_protocol( ret );
Note: See TracChangeset
for help on using the changeset viewer.