Changeset 46dca11 for protocols

Timestamp:

2008-01-06T12:32:27Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

43462708

Parents:

1febf5c

Message:

Changed warning message about unsent MSN messages. It should show the actual
message(s) now.

Location:

protocols/msn

Files:

• msn.c (modified) (1 diff)
• msn.h (modified) (1 diff)
• msn_util.c (modified) (1 diff)
• sb.c (modified) (7 diffs)

protocols/msn/msn.c

@@ -90 +90 @@
                         msn_sb_destroy( md->switchboards->data );
                 
-                if( md->msgq )
-                {
-                        struct msn_message *m;
-                        
-                        for( l = md->msgq; l; l = l->next )
-                        {
-                                m = l->data;
-                        
-                                imcb_log( ic, "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 );
-                }
+                msn_msgq_purge( ic, &md->msgq );
                 
                 while( md->groupcount > 0 )

protocols/msn/msn.h

@@ -158 +158 @@
 int msn_handler( struct msn_handler_data *h );
 char *msn_http_encode( const char *input );
+void msn_msgq_purge( struct im_connection *ic, GSList **list );
 
 /* tables.c */

protocols/msn/msn_util.c

@@ -339 +339 @@
         return ret;
 }
+
+void msn_msgq_purge( struct im_connection *ic, GSList **list )
+{
+        struct msn_message *m;
+        GString *ret;
+        GSList *l;
+        
+        l = *list;
+        if( l == NULL )
+                return;
+        
+        m = l->data;
+        ret = g_string_sized_new( 1024 );
+        g_string_printf( ret, "WARNING: Cleaning up MSN (switchboard) connection with unsent "
+                              "messages to %s:", m->who ? m->who : "unknown recipient" );
+        
+        while( l )
+        {
+                m = l->data;
+                
+                g_string_append_printf( ret, "\n%s", m->text );
+                
+                g_free( m->who );
+                g_free( m->text );
+                g_free( m );
+                
+                l = l->next;
+        }
+        g_slist_free( *list );
+        *list = NULL;
+        
+        imcb_log( ic, ret->str );
+        g_string_free( ret, TRUE );
+}

protocols/msn/sb.c

@@ -128 +128 @@
                 if( strcmp( text, TYPING_NOTIFICATION_MESSAGE ) != 0 )
                 {
-                        buf = g_new0( char, sizeof( MSN_MESSAGE_HEADERS ) + strlen( text ) * 2 );
+                        buf = g_new0( char, sizeof( MSN_MESSAGE_HEADERS ) + strlen( text ) * 2 + 1 );
                         i = strlen( MSN_MESSAGE_HEADERS );
                         
@@ -207 +207 @@
         debug( "Destroying switchboard: %s", sb->who ? sb->who : sb->key ? sb->key : "" );
         
-        if( sb->msgq )
-        {
-                struct msn_message *m;
-                GSList *l;
-                
-                for( l = sb->msgq; l; l = l->next )
-                {
-                        m = l->data;
-
-                        g_free( m->who );
-                        g_free( m->text );
-                        g_free( m );
-                }
-                g_slist_free( sb->msgq );
-                
-                imcb_log( ic, "Warning: Closing down MSN switchboard connection with "
-                                   "unsent message to %s, you'll have to resend it.",
-                                   sb->who ? sb->who : "(unknown)" );
-        }
+        msn_msgq_purge( ic, &sb->msgq );
         
         if( sb->key ) g_free( sb->key );
@@ -266 +248 @@
         if( source != sb->fd )
         {
-                debug( "ERROR %d while connecting to switchboard server", 1 );
+                debug( "Error %d while connecting to switchboard server", 1 );
                 msn_sb_destroy( sb );
                 return FALSE;
@@ -287 +269 @@
                 sb->inp = b_input_add( sb->fd, GAIM_INPUT_READ, msn_sb_callback, sb );
         else
-                debug( "ERROR %d while connecting to switchboard server", 2 );
+                debug( "Error %d while connecting to switchboard server", 2 );
         
         return FALSE;
@@ -298 +280 @@
         if( msn_handler( sb->handler ) == -1 )
         {
-                debug( "ERROR: Switchboard died" );
+                debug( "Error: Switchboard died" );
                 msn_sb_destroy( sb );
                 
@@ -555 +537 @@
                         if( sb->who )
                         {
-                                struct msn_message *m;
-                                GSList *l;
-                                
                                 /* Apparently some invitation failed. We might want to use this
                                    board later, so keep it as a spare. */
@@ -564 +543 @@
                                 
                                 /* Also clear the msgq, otherwise someone else might get them. */
-                                for( l = sb->msgq; l; l = l->next )
-                                {
-                                        m = l->data;
-                                        g_free( m->who );
-                                        g_free( m->text );
-                                        g_free( m );
-                                }
-                                g_slist_free( sb->msgq );
-                                sb->msgq = NULL;
+                                msn_msgq_purge( ic, &sb->msgq );
                         }