Changeset ed0589c

Timestamp:

2010-11-13T13:01:40Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

6b96de6

Parents:

70d7795

Message:

Fixed issue with logging in to unverified MSN accounts.

Location:

protocols/msn

Files:

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

protocols/msn/msn.c

@@ -331 +331 @@
                 imcb_log( ic, "Warning: Persistent name changes for this account have to be done "
                               "in the profile. BitlBee doesn't currently support this." );
+        
+        if( md->flags & MSN_EMAIL_UNVERIFIED )
+                imcb_log( ic, "Warning: Your e-mail address is unverified. MSN doesn't allow "
+                              "changing your display name until your e-mail address if verified." );
         
         msn_soap_addressbook_set_display_name( ic, value );

protocols/msn/msn.h

@@ -82 +82 @@
         MSN_DONE_ADL = 4,
         MSN_REAUTHING = 8,
+        MSN_EMAIL_UNVERIFIED = 16,
 } msn_flags_t;
 

protocols/msn/ns.c

@@ -278 +278 @@
                 else if( strcmp( cmd[2], "OK" ) == 0 )
                 {
+                        /* If the number after the handle is 0, the e-mail
+                           address is unverified, which means we can't change
+                           the display name. */
+                        if( cmd[4][0] == '0' )
+                                md->flags |= MSN_EMAIL_UNVERIFIED;
+                        
                         imcb_log( ic, "Authenticated, getting buddy list" );
                         msn_soap_memlist_request( ic );
@@ -870 +876 @@
         
         if( ( md->flags & MSN_DONE_ADL ) && ( md->flags & MSN_GOT_PROFILE ) )
-                return msn_ns_set_display_name( ic, set_getstr( &ic->acc->set, "display_name" ) );
-        else
-                return 1;
-}
+        {
+                if( md->flags & MSN_EMAIL_UNVERIFIED )
+                        imcb_connected( ic );
+                else
+                        return msn_ns_set_display_name( ic, set_getstr( &ic->acc->set, "display_name" ) );
+        }
+        
+        return 1;
+}