adium 4687:b434de4b7436: Merged

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/b434de4b7436
revision:	4687:b434de4b7436
branch:		(none)
author:		Thijs Alkemade <thijsalkemade at gmail.com>
date:		Sat Feb 11 21:30:44 2012 +0100

Merged

diffs (16 lines):

diff -r b668e55f19bd -r b434de4b7436 Source/AIXMLChatlogConverter.m
--- a/Source/AIXMLChatlogConverter.m	Fri Feb 10 23:26:45 2012 -0500
+++ b/Source/AIXMLChatlogConverter.m	Sat Feb 11 21:30:44 2012 +0100
@@ -229,7 +229,11 @@
                 //Find an account if one exists, and use its name
                 displayName = (myDisplayName ? myDisplayName : sender);
             } else {
-                AIListObject *listObject = [adium.contactController existingListObjectWithUniqueID:[AIListObject internalObjectIDForServiceID:service UID:sender]];
+				__block AIListObject *listObject;
+				
+				dispatch_sync(dispatch_get_main_queue(), ^{
+					listObject = [adium.contactController existingListObjectWithUniqueID:[AIListObject internalObjectIDForServiceID:service UID:sender]];
+				});
                 
                 displayName = listObject.displayName;
                 longDisplayName = [listObject longDisplayName];