Changeset bb09b3c for protocols/msn

Timestamp:

2010-06-03T21:13:57Z (15 years ago)

Author:

Sven Moritz Hallberg <pesco@…>

Branches:

master

Children:

1dd3470

Parents:

a6b2f13 (diff), df1ae622 (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:

merge in bitlbee 1.2.7

Location:

protocols/msn

Files:

• passport.c (modified) (1 diff)
• sb.c (modified) (2 diffs)

protocols/msn/passport.c

@@ -145 +145 @@
         char *s;
         
-        if( ( s = xt_find_attr( node, "Id" ) ) && strcmp( s, "PPToken1" ) == 0 )
+        if( ( s = xt_find_attr( node, "Id" ) ) &&
+            ( strncmp( s, "Compact", 7 ) == 0 ||
+              strncmp( s, "PPToken", 7 ) == 0 ) )
                 mad->token = g_memdup( node->text, node->text_len + 1 );
         

protocols/msn/sb.c

@@ -328 +328 @@
         struct msn_data *md = ic->proto_data;
         
-        if( msn_handler( sb->handler ) == -1 )
+        if( msn_handler( sb->handler ) != -1 )
+                return TRUE;
+        
+        if( sb->msgq != NULL )
         {
                 time_t now = time( NULL );
+                char buf[1024];
                 
                 if( now - md->first_sb_failure > 600 )
@@ -347 +351 @@
                                       "There might be problems delivering your messages." );
                 
-                if( sb->msgq != NULL )
-                {
-                        char buf[1024];
-                        
-                        if( md->msgq == NULL )
-                        {
-                                md->msgq = sb->msgq;
-                        }
-                        else
-                        {
-                                GSList *l;
-                                
-                                for( l = md->msgq; l->next; l = l->next );
-                                l->next = sb->msgq;
-                        }
-                        sb->msgq = NULL;
-                        
-                        debug( "Moved queued messages back to the main queue, creating a new switchboard to retry." );
-                        g_snprintf( buf, sizeof( buf ), "XFR %d SB\r\n", ++md->trId );
-                        if( !msn_write( ic, buf, strlen( buf ) ) )
-                                return FALSE;
-                }
-                
-                msn_sb_destroy( sb );
-                
-                return FALSE;
-        }
-        else
-        {
-                return TRUE;
-        }
+                if( md->msgq == NULL )
+                {
+                        md->msgq = sb->msgq;
+                }
+                else
+                {
+                        GSList *l;
+                        
+                        for( l = md->msgq; l->next; l = l->next );
+                        l->next = sb->msgq;
+                }
+                sb->msgq = NULL;
+                
+                debug( "Moved queued messages back to the main queue, "
+                       "creating a new switchboard to retry." );
+                g_snprintf( buf, sizeof( buf ), "XFR %d SB\r\n", ++md->trId );
+                if( !msn_write( ic, buf, strlen( buf ) ) )
+                        return FALSE;
+        }
+        
+        msn_sb_destroy( sb );
+        return FALSE;
 }