Changeset 4452e69 for protocols/msn/msn.c

Timestamp:

2010-08-14T13:06:11Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

5848675

Parents:

d93c0eb9

Message:

Allow changing the display_name, now permanently!

File:

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

protocols/msn/msn.c

@@ -25 +25 @@
 
 #include "nogaim.h"
+#include "soap.h"
 #include "msn.h"
 
@@ -35 +36 @@
 static void msn_init( account_t *acc )
 {
-        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_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, "mail_notifications", "false", set_eval_bool, acc );
         set_add( &acc->set, "switchboard_keepalives", "false", set_eval_bool, acc );
@@ -203 +207 @@
 }
 
-static void msn_set_my_name( struct im_connection *ic, char *info )
-{
-        msn_set_display_name( ic, info );
-}
-
 static void msn_get_info(struct im_connection *ic, char *who) 
 {
@@ -332 +331 @@
         account_t *acc = set->data;
         struct im_connection *ic = acc->ic;
-        
-        /* Allow any name if we're offline. */
-        if( ic == NULL )
-                return value;
+        struct msn_data *md = ic->proto_data;
+        char buf[512];
+        char *fn;
         
         if( strlen( value ) > 129 )
@@ -343 +341 @@
         }
         
-        /* 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;
+        msn_soap_addressbook_set_display_name( ic, value );
+
+        fn = g_malloc( strlen( value ) * 3 + 1 );
+        strcpy( fn, value );
+        http_encode( fn );
+        g_snprintf( buf, sizeof( buf ), "PRP %d MFN %s\r\n",
+                    ++md->trId, fn );
+        g_free( fn );
+        
+        /* Note: We don't actually know if the server accepted the new name,
+           and won't give proper feedback yet if it doesn't. */
+        return msn_write( ic, buf, strlen( buf ) ) ? value : NULL;
 }
 
@@ -375 +381 @@
         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;