Adium

Changeset 22629

Show
Ignore:
Timestamp:
02/17/2008 04:16:41 PM (9 months ago)
Author:
evands
Message:

Merged [22628]: Retry the connect if we get ssl handshake failed as the error message; it's not actually fatal. Fixes #9214

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/adium-1.2/Plugins/Purple Service/CBPurpleAccount.m

    r22503 r22629  
    17441744 
    17451745        } else if ([self lastDisconnectionReason] == PURPLE_CONNECTION_ERROR_INVALID_USERNAME) { 
     1746                [self setLastDisconnectionError:AILocalizedString(@"The name you entered is not registered. Check to ensure you typed it correctly.", nil)]; 
    17461747                reconnectDelayType = AIReconnectNever; 
    1747                 //Enable this after Adium 1.2, which is in string freeze as it is added. 
    1748                 /* *disconnectionError = AILocalizedString(@"The name you entered is not registered. Check to ensure you typed it correctly.", nil); */ 
     1748 
     1749        } else if (disconnectionError && [*disconnectionError isEqualToString:[NSString stringWithUT8String:_("SSL Handshake Failed")]]) { 
     1750                /* This particular message comes with PURPLE_CONNECTION_ERROR_ENCRYPTION_ERROR, which is a 'fatal' error according to libpurple. Other problems 
     1751                 * with that message may be fatal, but this one isn't. 
     1752                 */ 
     1753                reconnectDelayType = AIReconnectNormally; 
    17491754 
    17501755        } else if (purple_connection_error_is_fatal([self lastDisconnectionReason])) {