Changeset 0fd8559 for protocols/nogaim.c

Timestamp:

2007-02-18T17:48:04Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

0f4c1bb5

Parents:

8de63c3 (diff), c7d0f41 (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:

Merging new Jabber module. See the massive changelog for all the cool
improvements. :-)

File:

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

protocols/nogaim.c

@@ -280 +280 @@
         account_t *a;
         
+        /* Nested calls might happen sometimes, this is probably the best
+           place to catch them. */
+        if( gc->flags & OPT_LOGGING_OUT )
+                return;
+        else
+                gc->flags |= OPT_LOGGING_OUT;
+        
         serv_got_crap( gc, "Signing off.." );
         
         b_event_remove( gc->keepalive );
-        gc->flags |= OPT_LOGGING_OUT;
-        
         gc->keepalive = 0;
         gc->acc->prpl->close( gc );
@@ -1014 +1019 @@
         }
         
-        g_list_free( ms );
-        
         return( 1 );
 }