Changeset 8e9e2b7 for protocols/nogaim.c

Timestamp:

2010-10-03T02:45:26Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

04f0c10

Parents:

88de0c9 (diff), 2af3e23 (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 mainline, which includes a huge msnp13 merge.

Not 100% sure about the OpenSSL merge, should double check that but I'm
currently offline.

File:

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

protocols/nogaim.c

@@ -252 +252 @@
                 serv_got_crap( ic, "Error: %s", text );
         else
-                serv_got_crap( ic, "Couldn't log in: %s", text );
+                serv_got_crap( ic, "Login error: %s", text );
         
         g_free( text );
@@ -325 +325 @@
         
         imcb_log( ic, "Signing off.." );
-        
-        b_event_remove( ic->keepalive );
-        ic->keepalive = 0;
-        ic->acc->prpl->logout( ic );
-        b_event_remove( ic->inpa );
-        
-        g_free( ic->away );
-        ic->away = NULL;
         
         for( l = bee->users; l; )
@@ -344 +336 @@
                 l = next;
         }
+        
+        b_event_remove( ic->keepalive );
+        ic->keepalive = 0;
+        ic->acc->prpl->logout( ic );
+        b_event_remove( ic->inpa );
+        
+        g_free( ic->away );
+        ic->away = NULL;
         
         query_del_by_conn( (irc_t*) ic->bee->ui_data, ic );