Changeset b72caac for protocols/nogaim.c
- Timestamp:
- 2006-06-21T16:34:33Z (18 years ago)
- Branches:
- master
- Children:
- 59f5c42a
- Parents:
- 3af70b0 (diff), df417ca (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
protocols/nogaim.c
r3af70b0 rb72caac 2 2 * BitlBee -- An IRC to other IM-networks gateway * 3 3 * * 4 * Copyright 2002-200 4Wilmer van der Gaast and others *4 * Copyright 2002-2006 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 others17 15 */ 18 16 … … 160 158 * This fixes daemon mode breakage where IRC doesn't point to the currently active connection. 161 159 */ 162 gc->irc =user->irc;160 gc->irc = user->irc; 163 161 164 162 connections = g_slist_append( connections, gc ); … … 240 238 } 241 239 242 static gboolean send_keepalive( gpointer d )240 static gboolean send_keepalive( gpointer d, gint fd, b_input_condition cond ) 243 241 { 244 242 struct gaim_connection *gc = d; … … 264 262 serv_got_crap( gc, "Logged in" ); 265 263 266 gc->keepalive = g_timeout_add( 60000, send_keepalive, gc );264 gc->keepalive = b_timeout_add( 60000, send_keepalive, gc ); 267 265 gc->flags |= OPT_LOGGED_IN; 268 266 … … 272 270 } 273 271 274 gboolean auto_reconnect( gpointer data )272 gboolean auto_reconnect( gpointer data, gint fd, b_input_condition cond ) 275 273 { 276 274 account_t *a = data; … … 284 282 void cancel_auto_reconnect( account_t *a ) 285 283 { 286 while( g_source_remove_by_user_data( (gpointer) a ) ); 284 /* while( b_event_remove_by_data( (gpointer) a ) ); */ 285 b_event_remove( a->reconnect ); 287 286 a->reconnect = 0; 288 287 } … … 295 294 296 295 serv_got_crap( gc, "Signing off.." ); 296 297 b_event_remove( gc->keepalive ); 297 298 gc->flags |= OPT_LOGGING_OUT; 298 299 gaim_input_remove( gc->keepalive );300 299 gc->keepalive = 0; 301 300 gc->prpl->close( gc ); 302 gaim_input_remove( gc->inpa );301 b_event_remove( gc->inpa ); 303 302 304 303 while( u ) … … 327 326 { 328 327 int delay = set_getint( irc, "auto_reconnect_delay" ); 328 329 329 serv_got_crap( gc, "Reconnecting in %d seconds..", delay ); 330 331 a->reconnect = 1; 332 g_timeout_add( delay * 1000, auto_reconnect, a ); 330 a->reconnect = b_timeout_add( delay * 1000, auto_reconnect, a ); 333 331 } 334 332
Note: See TracChangeset
for help on using the changeset viewer.