Changeset fd03770 for protocols

Timestamp:

2006-06-25T19:43:14Z (19 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

c9f0c79

Parents:

6ee9d2d (diff), 9b63df6 (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 from devel/Jelmer.

Location:

protocols

Files:

• msn/msn.c (modified) (1 diff)
• nogaim.c (modified) (1 diff)

protocols/msn/msn.c

@@ -94 +94 @@
                         g_slist_free( md->msgq );
                 }
+                
+                g_free( md->grouplist );
                 
                 g_free( md );

protocols/nogaim.c

@@ -294 +294 @@
         
         serv_got_crap( gc, "Signing off.." );
+        
+        b_event_remove( gc->keepalive );
         gc->flags |= OPT_LOGGING_OUT;
         
-        b_event_remove( gc->keepalive );
         gc->keepalive = 0;
         gc->prpl->close( gc );