[Adium-devl] Adium-svn rev 18741 - trunk/Source

[Colin Barrett]

On Jan 29, 2007, at 7:24 AM, Colin Barrett wrote:

> By patr1ck, yes.

Note: When I say "by patr1ck", I mean that he was on the receiving end  
of the IM conversation we had when the two of us tested it (meaning he  
saw the behavior in his client). I also meant that his implementation  
of the patch was tested, not mine.

Anyway, here is the new patch.

Index: Source/ESAuthorizationRequestWindowController.m
===================================================================
--- Source/ESAuthorizationRequestWindowController.m     (revision 18741)
+++ Source/ESAuthorizationRequestWindowController.m     (working copy)
@@ -62,7 +62,8 @@
         [button_deny setLocalizedString:AILocalizedString(@"Deny",  
nil)];

         // Hide the "Add to my Contact List" checkbox if the contact  
already exists in the list
-       if (![[adium contactController] existingContactWithService: 
[account service] account:account UID:[infoDict objectForKey:@"Remote  
Name"]]) {
+       AIListContact *contact = [[adium contactController]  
existingContactWithService:[account service] account:account UID: 
[infoDict objectForKey:@"Remote Name"]];
+       if (contact && ![contact isStranger]) {
                 [checkBox_addToList setState:NSOffState];
                 [checkBox_addToList setEnabled:NO];
                 [checkBox_addToList setHidden:YES];

Make sure I'm not crazy first, and I'll push this onto trunk.

This is precisely why code review is useful, btw. I nominate that we  
should not be merging changesets to branch (especially this late in  
the game) without at least one additional set of eyes, possibly more,  
looking over it.