Changeset 8b01217

Timestamp:

2010-07-24T23:26:33Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

42acba1

Parents:

f1f7b5e

Message:

MSN supports having people in multiple groups and BitlBee does not. When
moving people between groups, make sure they *are* removed from their old
group.

Location:

protocols/msn

Files:

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

protocols/msn/msn.c

@@ -199 +199 @@
 static void msn_add_buddy( struct im_connection *ic, char *who, char *group )
 {
+        struct bee_user *bu = bee_user_by_handle( ic->bee, ic, who );
+        
         msn_buddy_list_add( ic, "FL", who, who, group );
+        if( bu && bu->group )
+                msn_buddy_list_remove( ic, "FL", who, bu->group->name );
 }
 
 static void msn_remove_buddy( struct im_connection *ic, char *who, char *group )
 {
-        msn_buddy_list_remove( ic, "FL", who );
+        msn_buddy_list_remove( ic, "FL", who, NULL );
 }
 
@@ -274 +278 @@
 static void msn_rem_permit( struct im_connection *ic, char *who )
 {
-        msn_buddy_list_remove( ic, "AL", who );
+        msn_buddy_list_remove( ic, "AL", who, NULL );
 }
 
@@ -292 +296 @@
 static void msn_rem_deny( struct im_connection *ic, char *who )
 {
-        msn_buddy_list_remove( ic, "BL", who );
+        msn_buddy_list_remove( ic, "BL", who, NULL );
 }
 

protocols/msn/msn.h

@@ -167 +167 @@
 int msn_logged_in( struct im_connection *ic );
 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 );
+int msn_buddy_list_remove( struct im_connection *ic, char *list, const char *who, const char *group );
 void msn_buddy_ask( struct im_connection *ic, char *handle, char *realname );
 char *msn_findheader( char *text, char *header, int len );

protocols/msn/msn_util.c

@@ -109 +109 @@
 }
 
-int msn_buddy_list_remove( struct im_connection *ic, char *list, char *who )
+int msn_buddy_list_remove( struct im_connection *ic, char *list, const char *who, const char *group )
 {
         struct msn_data *md = ic->proto_data;
-        char buf[1024];
-        
-        g_snprintf( buf, sizeof( buf ), "REM %d %s %s\r\n", ++md->trId, list, who );
+        char buf[1024], groupid[8];
+        
+        *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 ), "REM %d %s %s%s\r\n", ++md->trId, list, who, groupid );
         if( msn_write( ic, buf, strlen( buf ) ) )
                 return( 1 );