Changes in protocols/msn/msn.c [80175a1:daae10f]

File:

• protocols/msn/msn.c (modified) (16 diffs)

protocols/msn/msn.c

@@ -2 +2 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2010 Wilmer van der Gaast and others                *
+  * Copyright 2002-2004 Wilmer van der Gaast and others                *
   \********************************************************************/
 
@@ -25 +25 @@
 
 #include "nogaim.h"
-#include "soap.h"
 #include "msn.h"
 
@@ -36 +35 @@
 static void msn_init( account_t *acc )
 {
-        set_t *s;
-        
-        s = set_add( &acc->set, "display_name", NULL, set_eval_display_name, acc );
-        s->flags |= ACC_SET_NOSAVE | ACC_SET_ONLINE_ONLY;
-        
+        set_add( &acc->set, "display_name", NULL, set_eval_display_name, acc );
+        set_add( &acc->set, "local_display_name", "false", set_eval_bool, acc );
         set_add( &acc->set, "mail_notifications", "false", set_eval_bool, acc );
         set_add( &acc->set, "switchboard_keepalives", "false", set_eval_bool, acc );
-        
-        acc->flags |= ACC_FLAG_AWAY_MESSAGE | ACC_FLAG_STATUS_MESSAGE;
 }
 
@@ -74 +68 @@
         md->ic = ic;
         md->away_state = msn_away_state_list;
-        md->domaintree = g_tree_new( msn_domaintree_cmp );
         
         msn_connections = g_slist_append( msn_connections, ic );
@@ -83 +76 @@
         struct msn_data *md = ic->proto_data;
         GSList *l;
-        int i;
         
         if( md )
@@ -108 +100 @@
                 msn_msgq_purge( ic, &md->msgq );
                 
-                for( i = 0; i < sizeof( md->tokens ) / sizeof( md->tokens[0] ); i ++ )
-                        g_free( md->tokens[i] );
-                g_free( md->lock_key );
-                
-                while( md->groups )
-                {
-                        struct msn_group *mg = md->groups->data;
-                        g_free( mg->id );
-                        g_free( mg->name );
-                        g_free( mg );
-                        md->groups = g_slist_remove( md->groups, mg );
-                }
-                
-                g_tree_destroy( md->domaintree );
-                md->domaintree = NULL;
+                while( md->groupcount > 0 )
+                        g_free( md->grouplist[--md->groupcount] );
+                g_free( md->grouplist );
                 
                 while( md->grpq )
@@ -194 +174 @@
 {
         char buf[1024];
-        char *uux;
         struct msn_data *md = ic->proto_data;
         
@@ -203 +182 @@
         
         g_snprintf( buf, sizeof( buf ), "CHG %d %s\r\n", ++md->trId, md->away_state->code );
-        if( !msn_write( ic, buf, strlen( buf ) ) )
-                return;
-        
-        uux = g_markup_printf_escaped( "<Data><PSM>%s</PSM><CurrentMedia></CurrentMedia>"
-                                       "</Data>", message ? message : "" );
-        g_snprintf( buf, sizeof( buf ), "UUX %d %zd\r\n%s", ++md->trId, strlen( uux ), uux );
-        if( !msn_write( ic, buf, strlen( buf ) ) )
-                return;
+        msn_write( ic, buf, strlen( buf ) );
+}
+
+static void msn_set_my_name( struct im_connection *ic, char *info )
+{
+        msn_set_display_name( ic, info );
 }
 
@@ -223 +200 @@
         struct bee_user *bu = bee_user_by_handle( ic->bee, ic, who );
         
-        msn_buddy_list_add( ic, MSN_BUDDY_FL, who, who, group );
+        msn_buddy_list_add( ic, "FL", who, who, group );
         if( bu && bu->group )
-                msn_buddy_list_remove( ic, MSN_BUDDY_FL, who, bu->group->name );
+                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, MSN_BUDDY_FL, who, NULL );
+        msn_buddy_list_remove( ic, "FL", who, NULL );
 }
 
@@ -295 +272 @@
 static void msn_add_permit( struct im_connection *ic, char *who )
 {
-        msn_buddy_list_add( ic, MSN_BUDDY_AL, who, who, NULL );
+        msn_buddy_list_add( ic, "AL", who, who, NULL );
 }
 
 static void msn_rem_permit( struct im_connection *ic, char *who )
 {
-        msn_buddy_list_remove( ic, MSN_BUDDY_AL, who, NULL );
+        msn_buddy_list_remove( ic, "AL", who, NULL );
 }
 
@@ -307 +284 @@
         struct msn_switchboard *sb;
         
-        msn_buddy_list_add( ic, MSN_BUDDY_BL, who, who, NULL );
+        msn_buddy_list_add( ic, "BL", who, who, NULL );
         
         /* If there's still a conversation with this person, close it. */
@@ -318 +295 @@
 static void msn_rem_deny( struct im_connection *ic, char *who )
 {
-        msn_buddy_list_remove( ic, MSN_BUDDY_BL, who, NULL );
+        msn_buddy_list_remove( ic, "BL", who, NULL );
 }
 
@@ -337 +314 @@
         account_t *acc = set->data;
         struct im_connection *ic = acc->ic;
-        struct msn_data *md = ic->proto_data;
+        
+        /* Allow any name if we're offline. */
+        if( ic == NULL )
+                return value;
         
         if( strlen( value ) > 129 )
@@ -345 +325 @@
         }
         
-        if( md->flags & MSN_GOT_PROFILE_DN )
-                imcb_log( ic, "Warning: Persistent name changes for this account have to be done "
-                              "in the profile. BitlBee doesn't currently support this." );
-        
-        msn_soap_addressbook_set_display_name( ic, value );
-        return msn_ns_set_display_name( ic, value ) ? value : NULL;
-}
-
-static void msn_buddy_data_add( bee_user_t *bu )
-{
-        struct msn_data *md = bu->ic->proto_data;
-        bu->data = g_new0( struct msn_buddy_data, 1 );
-        g_tree_insert( md->domaintree, bu->handle, bu );
-}
-
-static void msn_buddy_data_free( bee_user_t *bu )
-{
-        struct msn_data *md = bu->ic->proto_data;
-        g_tree_remove( md->domaintree, bu->handle );
-        g_free( bu->data );
+        /* Returning NULL would be better, because the server still has to
+           confirm the name change. However, it looks a bit confusing to the
+           user. */
+        return msn_set_display_name( ic, value ) ? value : NULL;
 }
 
@@ -379 +343 @@
         ret->set_away = msn_set_away;
         ret->get_info = msn_get_info;
+        ret->set_my_name = msn_set_my_name;
         ret->add_buddy = msn_add_buddy;
         ret->remove_buddy = msn_remove_buddy;
@@ -392 +357 @@
         ret->send_typing = msn_send_typing;
         ret->handle_cmp = g_strcasecmp;
-        ret->buddy_data_add = msn_buddy_data_add;
-        ret->buddy_data_free = msn_buddy_data_free;
-        
         //ret->transfer_request = msn_ftp_transfer_request;