Adium

Ticket #3479: patch.diff

File patch.diff, 2.6 kB (added by absinth, 3 years ago)

hacky patch that should work but doesn't seem to ;-<

  • Plugins/Gaim

    old new  
    138138 
    139139               secondSearchRange = [primaryString rangeOfString:@" to his or her buddy list."]; 
    140140               if (secondSearchRange.location == NSNotFound) { 
    141                        secondSearchRange = [primaryString rangeOfString:@" to their buddy list for the following reason:\n"]; 
     141                       secondSearchRange = [primaryString rangeOfString:@" to their buddy **** for the following reason:\n"]; 
    142142               } 
    143143 
    144144               //ICQ and MSN may have the friendly name or alias after the name; we want just the screen name 
    …… 
    188188 
    189189               if (reason && [reason length]) [infoDict setObject:reason forKey:@"Reason"]; 
    190190 
    191                requestController = [ESGaimAuthorizationRequestWindowController mainPerformSelector:@selector(showAuthorizationRequestWithDict:) 
     191               NSEnumerator    *enumerator; 
     192               AIAccount               *account; 
     193               NSMutableSet    *requestedServices = [NSMutableSet set]; 
     194 
     195               enumerator = [[[[AIObject sharedAdiumInstance] accountController] accountArray] objectEnumerator]; 
     196               while(account = [enumerator nextObject]){ 
     197                       if([account online] && 
     198                          [[[account UID] compactedString] isEqualToString:[accountName compactedString]] && 
     199                          ![requestedServices containsObject:[account service]]){ 
     200                               AIAccount <AIAccount_Privacy> *privacyAccount = (AIAccount <AIAccount_Privacy> *)account; 
     201 
     202                               if(![[privacyAccount listObjectIDsOnPrivacyList:PRIVACY_DENY] containsObject:remoteName]) 
     203                                       requestController = [ESGaimAuthorizationRequestWindowController mainPerformSelector:@selector(showAuthorizationRequestWithDict:) 
    192204                                                                                 withObject:infoDict 
    193205                                                                                returnValue:YES]; 
    194  
     206                       } 
     207               } 
    195208       } else if (primaryString && ([primaryString rangeOfString:@"Add buddy to your list?"].location != NSNotFound)) { 
    196209               /* This is the Jabber doing inelegantly what we elegantly handle in the authorization request window for all 
    197210               * services, asking if the user wants to add a contact which just added him.  We just ignore this request, as