Changeset 601e813 for protocols/msn/ns.c

Timestamp:

2006-05-24T23:04:18Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

80c1e4d

Parents:

46ad029 (diff), fc630f9 (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] Wilmer

File:

• protocols/msn/ns.c (modified) (6 diffs)

protocols/msn/ns.c

@@ -257 +257 @@
                 {
                         md->buddycount = atoi( cmd[3] );
+                        md->groupcount = atoi( cmd[4] );
+                        if( md->groupcount > 0 )
+                                md->grouplist = g_new0( char *, md->groupcount );
                         
                         if( !*cmd[3] || md->buddycount == 0 )
@@ -269 +272 @@
                 }
         }
-        else if( strcmp( cmd[0], "GTC" ) == 0 )
-        {
-        }
-        else if( strcmp( cmd[0], "BLP" ) == 0 )
-        {
-        }
-        else if( strcmp( cmd[0], "PRP" ) == 0 )
-        {
-        }
-        else if( strcmp( cmd[0], "LSG" ) == 0 )
-        {
-        }
         else if( strcmp( cmd[0], "LST" ) == 0 )
         {
@@ -297 +288 @@
                 if( list & 1 ) /* FL */
                 {
-                        add_buddy( gc, NULL, cmd[1], cmd[2] );
+                        char *group = NULL;
+                        int num;
+                        
+                        if( cmd[4] != NULL && sscanf( cmd[4], "%d", &num ) == 1 )
+                                group = md->grouplist[num];
+                        
+                        add_buddy( gc, group, cmd[1], cmd[2] );
                 }
                 if( list & 2 ) /* AL */
@@ -327 +324 @@
                 }
         }
-        else if( strcmp( cmd[0], "BPR" ) == 0 )
-        {
-        }
-        else if( strcmp( cmd[0], "CHG" ) == 0 )
-        {
+        else if( strcmp( cmd[0], "LSG" ) == 0 )
+        {
+                int num;
+                
+                if( num_parts != 4 )
+                {
+                        hide_login_progress_error( gc, "Syntax error" );
+                        signoff( gc );
+                        return( 0 );
+                }
+                
+                http_decode( cmd[2] );
+                num = atoi( cmd[1] );
+                
+                if( num < md->groupcount )
+                        md->grouplist[num] = g_strdup( cmd[2] );
         }
         else if( strcmp( cmd[0], "CHL" ) == 0 )
@@ -357 +365 @@
                 return( msn_write( gc, buf, strlen( buf ) ) );
         }
-        else if( strcmp( cmd[0], "QRY" ) == 0 )
-        {
-        }
-        else if( strcmp( cmd[0], "QNG" ) == 0 )
-        {
-        }
         else if( strcmp( cmd[0], "ILN" ) == 0 )
         {
@@ -478 +480 @@
                         msn_buddy_ask( gc, cmd[4], cmd[5] );
                 }
-        }
-        else if( strcmp( cmd[0], "REM" ) == 0 )
-        {
         }
         else if( strcmp( cmd[0], "OUT" ) == 0 )