Changeset 6acc033

Timestamp:

2010-06-09T00:35:13Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

95c3ea9

Parents:

46d215d

Message:

Moving MSN contacts between groups is now possible, but no support yet for
creating new groups.

Location:

protocols/msn

Files:

• msn.c (modified) (3 diffs)
• msn.h (modified) (1 diff)
• msn_util.c (modified) (3 diffs)
• ns.c (modified) (1 diff)

protocols/msn/msn.c

@@ -182 +182 @@
 static void msn_add_buddy( struct im_connection *ic, char *who, char *group )
 {
-        msn_buddy_list_add( ic, "FL", who, who );
+        msn_buddy_list_add( ic, "FL", who, who, group );
 }
 
@@ -252 +252 @@
 static void msn_add_permit( struct im_connection *ic, char *who )
 {
-        msn_buddy_list_add( ic, "AL", who, who );
+        msn_buddy_list_add( ic, "AL", who, who, NULL );
 }
 
@@ -264 +264 @@
         struct msn_switchboard *sb;
         
-        msn_buddy_list_add( ic, "BL", who, who );
+        msn_buddy_list_add( ic, "BL", who, who, NULL );
         
         /* If there's still a conversation with this person, close it. */

protocols/msn/msn.h

@@ -160 +160 @@
 int msn_write( struct im_connection *ic, char *s, int len );
 int msn_logged_in( struct im_connection *ic );
-int msn_buddy_list_add( struct im_connection *ic, char *list, char *who, char *realname );
+int msn_buddy_list_add( struct im_connection *ic, const char *list, const char *who, const char *realname_, const char *group );
 int msn_buddy_list_remove( struct im_connection *ic, char *list, char *who );
 void msn_buddy_ask( struct im_connection *ic, char *handle, char *realname );

protocols/msn/msn_util.c

@@ -51 +51 @@
 }
 
-int msn_buddy_list_add( struct im_connection *ic, char *list, char *who, char *realname_ )
+int msn_buddy_list_add( struct im_connection *ic, const char *list, const char *who, const char *realname_, const char *group )
 {
         struct msn_data *md = ic->proto_data;
-        char buf[1024], *realname;
+        char buf[1024], *realname, groupid[8];
         
         realname = msn_http_encode( realname_ );
         
-        g_snprintf( buf, sizeof( buf ), "ADD %d %s %s %s\r\n", ++md->trId, list, who, realname );
+        *groupid = '\0';
+        if( group )
+        {
+                int i;
+                for( i = 0; i < md->groupcount; i ++ )
+                        if( g_strcasecmp( md->grouplist[i], group ) == 0 )
+                        {
+                                g_snprintf( groupid, sizeof( groupid ), " %d", i );
+                                break;
+                        }
+        }
+        
+        g_snprintf( buf, sizeof( buf ), "ADD %d %s %s %s%s\r\n", ++md->trId, list, who, realname, groupid );
         if( msn_write( ic, buf, strlen( buf ) ) )
         {
@@ -94 +106 @@
         struct msn_buddy_ask_data *bla = data;
         
-        msn_buddy_list_add( bla->ic, "AL", bla->handle, bla->realname );
+        msn_buddy_list_add( bla->ic, "AL", bla->handle, bla->realname, NULL );
         
         imcb_ask_add( bla->ic, bla->handle, NULL );
@@ -107 +119 @@
         struct msn_buddy_ask_data *bla = data;
         
-        msn_buddy_list_add( bla->ic, "BL", bla->handle, bla->realname );
+        msn_buddy_list_add( bla->ic, "BL", bla->handle, bla->realname, NULL );
         
         g_free( bla->handle );

protocols/msn/ns.c

@@ -533 +533 @@
                 else if( num_parts >= 6 && strcmp( cmd[2], "FL" ) == 0 )
                 {
+                        const char *group = NULL;
+                        int num;
+                        
+                        if( cmd[6] != NULL && sscanf( cmd[6], "%d", &num ) == 1 && num < md->groupcount )
+                                group = md->grouplist[num];
+                        
                         http_decode( cmd[5] );
-                        imcb_add_buddy( ic, cmd[4], NULL );
+                        imcb_add_buddy( ic, cmd[4], group );
                         imcb_rename_buddy( ic, cmd[4], cmd[5] );
                 }