Changeset e0e1546 for protocols/msn/ns.c

Timestamp:

2010-08-15T18:46:10Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

80175a1

Parents:

9b01339

Message:

Making display name code a bit saner. Apparently PoS MSN is still suffering
from display_name amnesia a little bit though at least with Hotmail accounts.

File:

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

protocols/msn/ns.c

@@ -259 +259 @@
         {
                 msn_ns_send_adl_start( ic );
+                
+                if( md->adl_todo < 0 && !( ic->flags & OPT_LOGGED_IN ) )
+                        return msn_ns_set_display_name( ic, set_getstr( &ic->acc->set, "display_name" ) );
         }
         else if( strcmp( cmd[0], "ADL" ) == 0 )
@@ -268 +271 @@
                         if( md->adl_todo < 0 && !( ic->flags & OPT_LOGGED_IN ) )
                         {
-                                char buf[1024];
-                                char *fn_raw;
-                                char *fn;
-                                
-                                if( ( fn_raw = set_getstr( &ic->acc->set, "display_name" ) ) == NULL )
-                                        fn_raw = ic->acc->user;
-                                fn = g_malloc( strlen( fn_raw ) * 3 + 1 );
-                                strcpy( fn, fn_raw );
-                                http_encode( fn );
-                                
-                                g_snprintf( buf, sizeof( buf ), "PRP %d MFN %s\r\n",
-                                            ++md->trId, fn );
-                                g_free( fn );
-                                
-                                msn_write( ic, buf, strlen( buf ) );
+                                msn_ns_send_adl( ic );
+                                
+                                if( md->adl_todo < 0 && !( ic->flags & OPT_LOGGED_IN ) )
+                                        return msn_ns_set_display_name( ic, set_getstr( &ic->acc->set, "display_name" ) );
                         }
                 }