Changeset 327af51

Timestamp:

2010-08-21T17:27:32Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

4022b68

Parents:

a366cca

Message:

Some general cleanup, plus fixing a bug in the memberlist parsing code:
the lists can come in in any order, so parse it *completely* before showing
auth requests.

Files:

• doc/CHANGES (modified) (3 diffs)
• lib/ssl_gnutls.c (modified) (2 diffs)
• lib/ssl_openssl.c (modified) (2 diffs)
• lib/xmltree.c (modified) (2 diffs)
• protocols/msn/soap.c (modified) (2 diffs)

doc/CHANGES

@@ -4 +4 @@
 http://bugs.bitlbee.org/bitlbee/timeline?daysback=90&changeset=on
 
-Version 1.3dev:
+Version ...
 - For the first time since 2007, a dev snapshot. Like then, this is pretty
   stable already (running on testing.bitlbee.org for weeks by now), but not
@@ -52 +52 @@
     for a list of supported protocols (works only in libpurple-enabled
     binaries).
+- Rewritten MSN module, implementing MSNP15 instead of the old MSNP8:
+  * MSNP8 support from MSN was getting pretty unreliable. There were issues
+    with remembering display names and adding contacts/auth requests.
+  * Support for sending offline messages.
+  * Support for setting and reading status messages.
 - Support for file transfers, in and out. /DCC SEND a file to a contact and
   it becomes a file transfer, and incoming file transfers become /DCC SENDs
@@ -59 +64 @@
   fixes issues with authorization requests.
 
-Finished 6 Aug 2010
+Finished ...
 
 Version 1.2.8:

lib/ssl_gnutls.c

@@ -189 +189 @@
                 ssl_errno = SSL_AGAIN;
         
-        if( getenv( "BITLBEE_DEBUG" ) && st > 0 ) write( 1, buf, st );
+        if( 0 && getenv( "BITLBEE_DEBUG" ) && st > 0 ) write( 1, buf, st );
         
         return st;
@@ -210 +210 @@
                 ssl_errno = SSL_AGAIN;
         
-        if( getenv( "BITLBEE_DEBUG" ) && st > 0 ) write( 1, buf, st );
+        if( 0 && getenv( "BITLBEE_DEBUG" ) && st > 0 ) write( 1, buf, st );
         
         return st;

lib/ssl_openssl.c

@@ -207 +207 @@
         }
         
-        if( getenv( "BITLBEE_DEBUG" ) && st > 0 ) write( 1, buf, st );
+        if( 0 && getenv( "BITLBEE_DEBUG" ) && st > 0 ) write( 1, buf, st );
         
         return st;
@@ -224 +224 @@
         st = SSL_write( ((struct scd*)conn)->ssl, buf, len );
         
-        if( getenv( "BITLBEE_DEBUG" ) && st > 0 ) write( 1, buf, st );
+        if( 0 && getenv( "BITLBEE_DEBUG" ) && st > 0 ) write( 1, buf, st );
         
         ssl_errno = SSL_OK;

lib/xmltree.c

@@ -338 +338 @@
         /* Print the attributes */
         for( i = 0; node->attr[i].key; i ++ )
-                printf( " %s=\"%s\"", node->attr[i].key, g_markup_escape_text( node->attr[i].value, -1 ) );
+        {
+                char *v = g_markup_escape_text( node->attr[i].value, -1 );
+                printf( " %s=\"%s\"", node->attr[i].key, v );
+                g_free( v );
+        }
         
         /* /> in case there's really *nothing* inside this tag, otherwise
@@ -358 +362 @@
                 for( i = 0; node->text[i] && isspace( node->text[i] ); i ++ );
                 if( node->text[i] )
-                        printf( "%s", g_markup_escape_text( node->text, -1 ) );
+                {
+                        char *v = g_markup_escape_text( node->text, -1 );
+                        printf( "%s", v );
+                        g_free( v );
+                }
         }
         

protocols/msn/soap.c

@@ -554 +554 @@
                 bd->flags |= MSN_BUDDY_BL;
         else if( strcmp( role, "Reverse" ) == 0 )
-        {
                 bd->flags |= MSN_BUDDY_RL;
-                msn_buddy_ask( bu );
-        }
         else if( strcmp( role, "Pending" ) == 0 )
-        {
                 bd->flags |= MSN_BUDDY_PL;
-                msn_buddy_ask( bu );
-        }
-        
-        printf( "%s %d\n", handle, bd->flags );
+        
+        printf( "%p %s %d\n", bu, handle, bd->flags );
         
         return XT_HANDLED;
@@ -783 +777 @@
 static int msn_soap_addressbook_handle_response( struct msn_soap_req_data *soap_req )
 {
+        GSList *l;
+        
+        for( l = soap_req->ic->bee->users; l; l = l->next )
+        {
+                struct bee_user *bu = l->data;
+                
+                if( bu->ic == soap_req->ic )
+                        msn_buddy_ask( bu );
+        }
+        
         msn_auth_got_contact_list( soap_req->ic );
+        
         return MSN_SOAP_OK;
 }