Changeset 87f525e for protocols/nogaim.c

Timestamp:

2008-08-10T10:42:52Z (16 years ago)

Author:

ulim <a.sporto+bee@…>

Branches:

master

Children:

a2b99ec

Parents:

8661caa (diff), a830512 (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.

Message:

Merged in upstream r416 which includes my msn_write_msg patch. w00t! ;)

File:

• protocols/nogaim.c (modified) (3 diffs)

protocols/nogaim.c

@@ -267 +267 @@
            protocols. */
         imc_set_away( ic, u->away );
+        
+        /* Apparently we're connected successfully, so reset the
+           exponential backoff timer. */
+        ic->acc->auto_reconnect_delay = 0;
 }
 
@@ -290 +294 @@
         user_t *t, *u;
         account_t *a;
+        int delay;
         
         /* Nested calls might happen sometimes, this is probably the best
@@ -329 +334 @@
         }
         else if( allow_reconnect && set_getbool( &irc->set, "auto_reconnect" ) &&
-                 set_getbool( &a->set, "auto_reconnect" ) )
-        {
-                int delay = set_getint( &irc->set, "auto_reconnect_delay" );
-                
+                 set_getbool( &a->set, "auto_reconnect" ) &&
+                 ( delay = account_reconnect_delay( a ) ) > 0 )
+        {
                 imcb_log( ic, "Reconnecting in %d seconds..", delay );
                 a->reconnect = b_timeout_add( delay * 1000, auto_reconnect, a );