Changes in protocols/nogaim.c [c98be00:dd89a55]
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
protocols/nogaim.c
rc98be00 rdd89a55 2 2 * BitlBee -- An IRC to other IM-networks gateway * 3 3 * * 4 * Copyright 2002-200 6Wilmer van der Gaast and others *4 * Copyright 2002-2004 Wilmer van der Gaast and others * 5 5 \********************************************************************/ 6 6 … … 13 13 * from scratch for BitlBee and doesn't contain any code from Gaim anymore 14 14 * (except for the function names). 15 * 16 * Copyright 2002-2006 Wilmer van der Gaast <wilmer@gaast.net> and others 15 17 */ 16 18 … … 248 250 * This fixes daemon mode breakage where IRC doesn't point to the currently active connection. 249 251 */ 250 gc->irc =user->irc;252 gc->irc=user->irc; 251 253 252 254 connections = g_slist_append( connections, gc ); … … 328 330 } 329 331 330 static gboolean send_keepalive( gpointer d , gint fd, b_input_condition cond)332 static gboolean send_keepalive( gpointer d ) 331 333 { 332 334 struct gaim_connection *gc = d; … … 352 354 serv_got_crap( gc, "Logged in" ); 353 355 354 gc->keepalive = b_timeout_add( 60000, send_keepalive, gc );356 gc->keepalive = g_timeout_add( 60000, send_keepalive, gc ); 355 357 gc->flags |= OPT_LOGGED_IN; 356 358 … … 360 362 } 361 363 362 gboolean auto_reconnect( gpointer data , gint fd, b_input_condition cond)364 gboolean auto_reconnect( gpointer data ) 363 365 { 364 366 account_t *a = data; … … 372 374 void cancel_auto_reconnect( account_t *a ) 373 375 { 374 /* while( b_event_remove_by_data( (gpointer) a ) ); */ 375 b_event_remove( a->reconnect ); 376 while( g_source_remove_by_user_data( (gpointer) a ) ); 376 377 a->reconnect = 0; 377 378 } … … 385 386 serv_got_crap( gc, "Signing off.." ); 386 387 387 b_event_remove( gc->keepalive );388 gaim_input_remove( gc->keepalive ); 388 389 gc->keepalive = 0; 389 390 gc->prpl->close( gc ); 390 b_event_remove( gc->inpa );391 gaim_input_remove( gc->inpa ); 391 392 392 393 while( u ) … … 415 416 { 416 417 int delay = set_getint( irc, "auto_reconnect_delay" ); 417 418 418 serv_got_crap( gc, "Reconnecting in %d seconds..", delay ); 419 a->reconnect = b_timeout_add( delay * 1000, auto_reconnect, a ); 419 420 a->reconnect = 1; 421 g_timeout_add( delay * 1000, auto_reconnect, a ); 420 422 } 421 423 … … 610 612 return; 611 613 } 612 return; 614 /* Why did we have this here.... 615 return; */ 613 616 } 614 617
Note: See TracChangeset
for help on using the changeset viewer.