Ticket #6866: ticket6866-fix-rev0.diff

Source/AIAbstractLogViewerWindowController.h

@@ -144 +144 @@
-        NSNumber                        *allContactsIdentifier;
-        //Old
-        BOOL showEmoticons;
+        BOOL replaceUID;
-}
-
-+ (id)openForPlugin:(id)inPlugin;

Source/AIAbstractLogViewerWindowController.m

@@ -744 +743 @@
-                        }
-                }
-                
+                //Replace From- and To-UIDs with actual aliases
+                replaceUID = YES;
+                if (replaceUID) {
+                        // Get ListObject for to-UID
+                        AIListObject *listObject = [[adium contactController] existingListObjectWithUniqueID:[AIListObject internalObjectIDForServiceID:[theLog serviceClass]
+                                                                                                                                                                                                                                                                                UID:[theLog to]]];
+                        if (listObject) {
+                                // Replace TO-UID occurences
+                                NSString *aliasToString = [NSString stringWithFormat:@"%@", [listObject longDisplayName]];
+                                NSLog(@"(To) Replacing %@ with %@", [theLog to], aliasToString);
+                                
+                                [displayText replaceOccurrencesOfString:[theLog to] withString:aliasToString options:NSLiteralSearch range:NSMakeRange(0, [displayText length])];
+                        }
+                        
+                        // Replace TO-UID occurences
+                        NSString *aliasFromString = [NSString stringWithFormat:@"%@", [[[[adium accountController] accounts] objectAtIndex:0] displayName]];
+                        NSLog(@"(From) Replacing %@ with %@", [theLog from], aliasFromString);
+                        
+                        [displayText replaceOccurrencesOfString:[theLog from] withString:aliasFromString options:NSLiteralSearch range:NSMakeRange(0, [displayText length])];
+                }
+
-                appendedFirstLog = YES;
-                
-                [pool release];