Changeset 5898ef8 for protocols/msn/msn.c

Timestamp:

2006-06-15T12:46:31Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

10efa91

Parents:

c121f89 (diff), 79e826a (diff), 3af70b0 (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:

xml_save(), decent error handling and merging fixed autosaving.

File:

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

protocols/msn/msn.c

@@ -64 +64 @@
         GSList *l;
         
-        if( md->fd >= 0 )
-                closesocket( md->fd );
-        
-        if( md->handler )
-        {
-                if( md->handler->rxq ) g_free( md->handler->rxq );
-                if( md->handler->cmd_text ) g_free( md->handler->cmd_text );
-                g_free( md->handler );
-        }
-        
-        while( md->switchboards )
-                msn_sb_destroy( md->switchboards->data );
-        
-        if( md->msgq )
-        {
-                struct msn_message *m;
-                
-                for( l = md->msgq; l; l = l->next )
-                {
-                        m = l->data;
-                
-                        serv_got_crap( gc, "Warning: Closing down MSN connection with unsent message to %s, you'll have to resend it.", m->who );
-                        g_free( m->who );
-                        g_free( m->text );
-                        g_free( m );
-                }
-                g_slist_free( md->msgq );
+        if( md )
+        {
+                if( md->fd >= 0 )
+                        closesocket( md->fd );
+                
+                if( md->handler )
+                {
+                        if( md->handler->rxq ) g_free( md->handler->rxq );
+                        if( md->handler->cmd_text ) g_free( md->handler->cmd_text );
+                        g_free( md->handler );
+                }
+                
+                while( md->switchboards )
+                        msn_sb_destroy( md->switchboards->data );
+                
+                if( md->msgq )
+                {
+                        struct msn_message *m;
+                        
+                        for( l = md->msgq; l; l = l->next )
+                        {
+                                m = l->data;
+                        
+                                serv_got_crap( gc, "Warning: Closing down MSN connection with unsent message to %s, you'll have to resend it.", m->who );
+                                g_free( m->who );
+                                g_free( m->text );
+                                g_free( m );
+                        }
+                        g_slist_free( md->msgq );
+                }
+                
+                g_free( md );
         }
         
@@ -100 +105 @@
                 g_free( l->data );
         g_slist_free( gc->deny );
-        
-        g_free( md );
         
         msn_connections = g_slist_remove( msn_connections, gc );