adium 5660:81ba03432185: Add an autorelease to match the other c...

commits at adium.im commits at adium.im
Sat Jul 13 17:11:45 UTC 2013


details:	http://hg.adium.im/adium/rev/81ba03432185
revision:	5660:81ba03432185
branch:		adium-1.5.8
author:		Frank Dowsett <wixardy at adium.im>
date:		Fri Jul 12 17:27:08 2013 -0400

Add an autorelease to match the other constructors.
Subject: adium 5661:cc5903df1cbc: This isn't being used.

details:	http://hg.adium.im/adium/rev/cc5903df1cbc
revision:	5661:cc5903df1cbc
branch:		(none)
author:		Frank Dowsett <wixardy at adium.im>
date:		Sat Jul 13 12:01:17 2013 -0400

This isn't being used.
Subject: adium 5662:8d9afb2f8f49: Add an int cast when bounds checking some enums.

details:	http://hg.adium.im/adium/rev/8d9afb2f8f49
revision:	5662:8d9afb2f8f49
branch:		(none)
author:		Frank Dowsett <wixardy at adium.im>
date:		Sat Jul 13 12:17:18 2013 -0400

Add an int cast when bounds checking some enums.
Subject: adium 5663:61c90f48b221: Move these lines into the safety of a non-nil self.

details:	http://hg.adium.im/adium/rev/61c90f48b221
revision:	5663:61c90f48b221
branch:		(none)
author:		Frank Dowsett <wixardy at adium.im>
date:		Sat Jul 13 12:31:39 2013 -0400

Move these lines into the safety of a non-nil self.
Subject: adium 5664:554440dd29ca: merge adium-1.5.8 into adium-1.6

details:	http://hg.adium.im/adium/rev/554440dd29ca
revision:	5664:554440dd29ca
branch:		adium-1.6
author:		Frank Dowsett <wixardy at adium.im>
date:		Sat Jul 13 12:46:57 2013 -0400

merge adium-1.5.8 into adium-1.6
Subject: adium 5665:b998e327b5fd: merge adium-1.6 into default

details:	http://hg.adium.im/adium/rev/b998e327b5fd
revision:	5665:b998e327b5fd
branch:		(none)
author:		Frank Dowsett <wixardy at adium.im>
date:		Sat Jul 13 13:01:04 2013 -0400

merge adium-1.6 into default

diffs (truncated from 2804150 to 1000 lines):

diff -r 5f9e1c0da3dd -r b998e327b5fd .hgtags
--- a/.hgtags	Thu Jul 11 02:43:01 2013 +0200
+++ b/.hgtags	Sat Jul 13 13:01:04 2013 -0400
@@ -1,5 +1,6 @@
 4151ac3a3b1f9847b8d958f1c7d57a345d442266 1.5
-5efcd11df6947cf82c763a8024229d5a326d9c56 adium-1.5.4
+64b4f46272118a2d4d721123fbcb9f485913ff35 1.5.1
+8d4ed0d28f89a09c3deb3b4b1952e21cd4a5e563 1.5.2
 c436f536180fc12b1c2f70ae31e29a2b32b4529f 1.5.4
 5efcd11df6947cf82c763a8024229d5a326d9c56 adium-1.5.4
 0000000000000000000000000000000000000000 adium-1.5.4
diff -r 5f9e1c0da3dd -r b998e327b5fd Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj	Thu Jul 11 02:43:01 2013 +0200
+++ b/Adium.xcodeproj/project.pbxproj	Sat Jul 13 13:01:04 2013 -0400
@@ -46,7 +46,7 @@
 		071C56330827933100399C0F /* Shared Dock Icon Images in Resources */ = {isa = PBXBuildFile; fileRef = 071C56310827933000399C0F /* Shared Dock Icon Images */; };
 		073475F10C4C9632009ACC43 /* AdiumMenuBarIcons.icns in Resources */ = {isa = PBXBuildFile; fileRef = 073475F00C4C9632009ACC43 /* AdiumMenuBarIcons.icns */; };
 		074DDB5D07CB413F0033AFF7 /* CBContactLastSeenPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 074DDB5C07CB413F0033AFF7 /* CBContactLastSeenPlugin.m */; };
-		07632BF30949E10B00FFABD8 /* ListThemeSheet.nib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB42B080870A200E27095 /* ListThemeSheet.nib */; };
+		07632BF30949E10B00FFABD8 /* ListThemeSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB42B080870A200E27095 /* ListThemeSheet.xib */; };
 		0779934F08221D9700F698DC /* Service Icons in Resources */ = {isa = PBXBuildFile; fileRef = 4BAFD5E806E00D1700FF7FBC /* Service Icons */; };
 		07C6EA890C06676400B79CBD /* AdiumHelp in Resources */ = {isa = PBXBuildFile; fileRef = 07C6EA3C0C06676400B79CBD /* AdiumHelp */; };
 		07E179780C657B5E005DDA3D /* ConfirmationDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 07E179770C657B5E005DDA3D /* ConfirmationDefaults.plist */; };
@@ -59,13 +59,13 @@
 		11000D041098863B0096A1E2 /* AIDefaultFontRemovalPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 11000D031098863B0096A1E2 /* AIDefaultFontRemovalPlugin.m */; };
 		110763F608676CC9005987A5 /* RAFBlockEditorPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 110763F208676CC9005987A5 /* RAFBlockEditorPlugin.m */; };
 		110763F808676CC9005987A5 /* RAFBlockEditorWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 110763F408676CC9005987A5 /* RAFBlockEditorWindowController.m */; };
-		110763FA08676D05005987A5 /* BlockEditorWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = 110763F908676D04005987A5 /* BlockEditorWindow.nib */; };
+		110763FA08676D05005987A5 /* BlockEditorWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 110763F908676D04005987A5 /* BlockEditorWindow.xib */; };
 		11077B6F0DE647C100A4DD25 /* AIStatusItemView.m in Sources */ = {isa = PBXBuildFile; fileRef = 11077B6E0DE647C100A4DD25 /* AIStatusItemView.m */; };
-		1109634C0F61C1D00064CA0E /* AITwitterReplyWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = 1109634B0F61C1D00064CA0E /* AITwitterReplyWindow.nib */; };
+		1109634C0F61C1D00064CA0E /* AITwitterReplyWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1109634B0F61C1D00064CA0E /* AITwitterReplyWindow.xib */; };
 		1109661A0F61D3E70064CA0E /* AITwitterReplyWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 110966190F61D3E70064CA0E /* AITwitterReplyWindowController.m */; };
-		1111B2300F8478500068CE51 /* Filter Bar.nib in Resources */ = {isa = PBXBuildFile; fileRef = 1111B22F0F8478500068CE51 /* Filter Bar.nib */; };
+		1111B2300F8478500068CE51 /* Filter Bar.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1111B22F0F8478500068CE51 /* Filter Bar.xib */; };
 		1111B2680F847CAD0068CE51 /* AIFilterBarView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1111B2670F847CAD0068CE51 /* AIFilterBarView.m */; };
-		111256060F8DA2B200E76177 /* ESBonjourAccountView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34F4675B080F46AC007800AB /* ESBonjourAccountView.nib */; };
+		111256060F8DA2B200E76177 /* ESBonjourAccountView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34F4675B080F46AC007800AB /* ESBonjourAccountView.xib */; };
 		111256070F8DA2BF00E76177 /* AWEzv.m in Sources */ = {isa = PBXBuildFile; fileRef = 4947F5D30655E90C00B791E5 /* AWEzv.m */; };
 		111256080F8DA2BF00E76177 /* AWEzvContact.m in Sources */ = {isa = PBXBuildFile; fileRef = 4947F5D50655E90C00B791E5 /* AWEzvContact.m */; };
 		111256090F8DA2BF00E76177 /* AWEzvSupportRoutines.m in Sources */ = {isa = PBXBuildFile; fileRef = 4947F5EF0655E90D00B791E5 /* AWEzvSupportRoutines.m */; };
@@ -96,8 +96,6 @@
 		111E89020F93FE3900A5F18B /* AIUserHostTooltip.m in Sources */ = {isa = PBXBuildFile; fileRef = 111E89000F93FE3900A5F18B /* AIUserHostTooltip.m */; };
 		1121B29A0F896A720047EC66 /* AIContactVisibilityControlPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 1121B2990F896A720047EC66 /* AIContactVisibilityControlPlugin.m */; };
 		112523190F5F7F86003FC58A /* AITwitterURLHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 112523180F5F7F86003FC58A /* AITwitterURLHandler.m */; };
-		112939020FD5AC1B00FA8F53 /* AIConfirmationsAdvancedPreferences.nib in Resources */ = {isa = PBXBuildFile; fileRef = 112939010FD5AC1B00FA8F53 /* AIConfirmationsAdvancedPreferences.nib */; };
-		112939100FD5AE1400FA8F53 /* AIConfirmationsAdvancedPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 1129390F0FD5AE1400FA8F53 /* AIConfirmationsAdvancedPreferences.m */; };
 		112B47240F82DC2300690E84 /* AIGroupChatStatusIcons.h in Headers */ = {isa = PBXBuildFile; fileRef = 112B47220F82DC2300690E84 /* AIGroupChatStatusIcons.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		112B47250F82DC2300690E84 /* AIGroupChatStatusIcons.m in Sources */ = {isa = PBXBuildFile; fileRef = 112B47230F82DC2300690E84 /* AIGroupChatStatusIcons.m */; };
 		112B47670F82E0FC00690E84 /* AIXtraInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 112B47650F82E0FC00690E84 /* AIXtraInfo.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -105,22 +103,21 @@
 		112B483F0F82E91200690E84 /* Group Chat Status Icons in Resources */ = {isa = PBXBuildFile; fileRef = 112B483E0F82E91200690E84 /* Group Chat Status Icons */; };
 		112B490A0F82FB1700690E84 /* AIGroupChatStatusTooltipPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 112B49090F82FB1700690E84 /* AIGroupChatStatusTooltipPlugin.m */; };
 		112B4A250F83194700690E84 /* AIMentionAdvancedPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 112B4A240F83194700690E84 /* AIMentionAdvancedPreferences.m */; };
-		112B4A3E0F831A4400690E84 /* AIMentionAdvancedPreferences.nib in Resources */ = {isa = PBXBuildFile; fileRef = 112B4A3D0F831A4400690E84 /* AIMentionAdvancedPreferences.nib */; };
+		112B4A3E0F831A4400690E84 /* AIMentionAdvancedPreferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = 112B4A3D0F831A4400690E84 /* AIMentionAdvancedPreferences.xib */; };
 		112E7FA60FC86BB400657119 /* AITwitterActionsHTMLFilter.m in Sources */ = {isa = PBXBuildFile; fileRef = 112E7FA50FC86BB400657119 /* AITwitterActionsHTMLFilter.m */; };
 		1130EA99109B445500FB3454 /* pref-defaultclient.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 1130EA98109B445500FB3454 /* pref-defaultclient.tiff */; };
 		1130EA9D109B445D00FB3454 /* pref-mention.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 1130EA9B109B445D00FB3454 /* pref-mention.tiff */; };
-		1130EA9E109B445D00FB3454 /* pref-messagealerts.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 1130EA9C109B445D00FB3454 /* pref-messagealerts.tiff */; };
 		113892270F6B70CA00A7D7DC /* laconica-small.png in Resources */ = {isa = PBXBuildFile; fileRef = 113892250F6B70CA00A7D7DC /* laconica-small.png */; };
 		113892280F6B70CA00A7D7DC /* laconica.png in Resources */ = {isa = PBXBuildFile; fileRef = 113892260F6B70CA00A7D7DC /* laconica.png */; };
-		113900B10F85BEF60081A418 /* AIURLHandlerPreferences.nib in Resources */ = {isa = PBXBuildFile; fileRef = 113900B00F85BEF60081A418 /* AIURLHandlerPreferences.nib */; };
-		113900B40F85BF880081A418 /* AIURLHandlerAdvancedPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 113900B30F85BF880081A418 /* AIURLHandlerAdvancedPreferences.m */; };
+		113900B10F85BEF60081A418 /* AIURLHandlerPreferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = 113900B00F85BEF60081A418 /* AIURLHandlerPreferences.xib */; };
+		113900B40F85BF880081A418 /* AIURLHandlerWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 113900B30F85BF880081A418 /* AIURLHandlerWindowController.m */; };
 		1139011C0F85C9450081A418 /* AIURLHandlerPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 1139011B0F85C9450081A418 /* AIURLHandlerPlugin.m */; };
 		1139FFAA0F85260E0081A418 /* AIIRCChannelLinker.m in Sources */ = {isa = PBXBuildFile; fileRef = 1139FFA90F85260E0081A418 /* AIIRCChannelLinker.m */; };
 		114849B90F7841C600EA5264 /* AIAuthorizationRequestsWindowController.h in Headers */ = {isa = PBXBuildFile; fileRef = 114849B70F7841C600EA5264 /* AIAuthorizationRequestsWindowController.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		114849BA0F7841C600EA5264 /* AIAuthorizationRequestsWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 114849B80F7841C600EA5264 /* AIAuthorizationRequestsWindowController.m */; };
-		114849BC0F78420300EA5264 /* AIAuthorizationRequestsWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = 114849BB0F78420300EA5264 /* AIAuthorizationRequestsWindow.nib */; };
-		1150A9960FBE48D600E0BD31 /* ESIRCAccountView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 1150A9950FBE48D600E0BD31 /* ESIRCAccountView.nib */; };
-		1154F50A12E1476900B8CA27 /* AILogByAccountWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = 1154F50712E1476900B8CA27 /* AILogByAccountWindow.nib */; };
+		114849BC0F78420300EA5264 /* AIAuthorizationRequestsWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 114849BB0F78420300EA5264 /* AIAuthorizationRequestsWindow.xib */; };
+		1150A9960FBE48D600E0BD31 /* ESIRCAccountView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1150A9950FBE48D600E0BD31 /* ESIRCAccountView.xib */; };
+		1154F50A12E1476900B8CA27 /* AILogByAccountWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1154F50712E1476900B8CA27 /* AILogByAccountWindow.xib */; };
 		1154F50B12E1476900B8CA27 /* AILogByAccountWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1154F50912E1476900B8CA27 /* AILogByAccountWindowController.m */; };
 		1163F0EC0F6C7A8300F12F5D /* AIURLShortenerPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 1163F0EB0F6C7A8300F12F5D /* AIURLShortenerPlugin.m */; };
 		1164A90D0F7AD4AB00110AE4 /* AIContentTopic.h in Headers */ = {isa = PBXBuildFile; fileRef = 1164A90B0F7AD4AB00110AE4 /* AIContentTopic.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -129,7 +126,7 @@
 		116E373310B729E9002EDB0F /* Growl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7E9A8CB2104DEBC400F210CC /* Growl.framework */; };
 		117009A70F7E7D720078D6AB /* AIIRCServicesPasswordPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 117009A10F7E7D3A0078D6AB /* AIIRCServicesPasswordPlugin.m */; };
 		11700A350F7E8BE80078D6AB /* AISpecialPasswordPromptController.m in Sources */ = {isa = PBXBuildFile; fileRef = 11700A340F7E8BE80078D6AB /* AISpecialPasswordPromptController.m */; };
-		11700A440F7E8CB60078D6AB /* AISpecialPasswordPrompt.nib in Resources */ = {isa = PBXBuildFile; fileRef = 11700A430F7E8CB60078D6AB /* AISpecialPasswordPrompt.nib */; };
+		11700A440F7E8CB60078D6AB /* AISpecialPasswordPrompt.xib in Resources */ = {isa = PBXBuildFile; fileRef = 11700A430F7E8CB60078D6AB /* AISpecialPasswordPrompt.xib */; };
 		1172FBCB0CDAA8D400B8E233 /* libglib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1172FBC30CDAA8D400B8E233 /* libglib.framework */; };
 		1172FBCC0CDAA8D400B8E233 /* libgmodule.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1172FBC40CDAA8D400B8E233 /* libgmodule.framework */; };
 		1172FBCD0CDAA8D400B8E233 /* libgobject.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1172FBC50CDAA8D400B8E233 /* libgobject.framework */; };
@@ -137,24 +134,14 @@
 		1172FBCF0CDAA8D400B8E233 /* libintl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1172FBC70CDAA8D400B8E233 /* libintl.framework */; };
 		1172FBD00CDAA8D400B8E233 /* libmeanwhile.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1172FBC80CDAA8D400B8E233 /* libmeanwhile.framework */; };
 		1172FBD10CDAA8D400B8E233 /* libpurple.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1172FBC90CDAA8D400B8E233 /* libpurple.framework */; };
-		117866DE0EC759B9003E9B97 /* FTProgressResend_Selected.tif in Resources */ = {isa = PBXBuildFile; fileRef = 117866D80EC759B9003E9B97 /* FTProgressResend_Selected.tif */; };
-		117866DF0EC759B9003E9B97 /* FTProgressResend.tif in Resources */ = {isa = PBXBuildFile; fileRef = 117866D90EC759B9003E9B97 /* FTProgressResend.tif */; };
-		117866E00EC759B9003E9B97 /* FTProgressResendPressed_Selected.tif in Resources */ = {isa = PBXBuildFile; fileRef = 117866DA0EC759B9003E9B97 /* FTProgressResendPressed_Selected.tif */; };
-		117866E10EC759B9003E9B97 /* FTProgressResendPressed.tif in Resources */ = {isa = PBXBuildFile; fileRef = 117866DB0EC759B9003E9B97 /* FTProgressResendPressed.tif */; };
-		117866E20EC759B9003E9B97 /* FTProgressResendRollover_Selected.tif in Resources */ = {isa = PBXBuildFile; fileRef = 117866DC0EC759B9003E9B97 /* FTProgressResendRollover_Selected.tif */; };
-		117866E30EC759B9003E9B97 /* FTProgressResendRollover.tif in Resources */ = {isa = PBXBuildFile; fileRef = 117866DD0EC759B9003E9B97 /* FTProgressResendRollover.tif */; };
 		117D6DC00BC5F0C40080D02B /* msg-request-attention.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 117D6DBF0BC5F0C40080D02B /* msg-request-attention.tiff */; };
 		11819A1B10D0B95D003E8ECA /* AIMediaControllerProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 11819A0910D0B90E003E8ECA /* AIMediaControllerProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		118A44500FEEA828008153C0 /* libjson-glib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 118A444F0FEEA828008153C0 /* libjson-glib.framework */; };
-		118A44510FEEA828008153C0 /* libjson-glib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 118A444F0FEEA828008153C0 /* libjson-glib.framework */; };
-		118A44540FEEA82E008153C0 /* libjson-glib.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 118A444F0FEEA828008153C0 /* libjson-glib.framework */; };
 		1192E6D90FD3056F003CAEF5 /* AIAnnoyingIRCMessagesHiderPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 1192E6B10FD30307003CAEF5 /* AIAnnoyingIRCMessagesHiderPlugin.h */; };
 		1192E6DA0FD30578003CAEF5 /* AIAnnoyingIRCMessagesHiderPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 1192E6B20FD30307003CAEF5 /* AIAnnoyingIRCMessagesHiderPlugin.m */; };
 		1197F6710FCF8D180032F19B /* AITwitterStatusFollowup.m in Sources */ = {isa = PBXBuildFile; fileRef = 1197F6700FCF8D180032F19B /* AITwitterStatusFollowup.m */; };
 		1199AB0610BE13E600646322 /* Authorize.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 1199AB0310BE13E600646322 /* Authorize.tiff */; };
 		1199AB0710BE13E600646322 /* Deny.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 1199AB0410BE13E600646322 /* Deny.tiff */; };
 		1199AB0810BE13E600646322 /* Ignore.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 1199AB0510BE13E600646322 /* Ignore.tiff */; };
-		11A2F10A0FC8FC1A00C3F05C /* AIMessageAlertsAdvancedPreferences.nib in Resources */ = {isa = PBXBuildFile; fileRef = 11A2F1090FC8FC1A00C3F05C /* AIMessageAlertsAdvancedPreferences.nib */; };
 		11A2F1220FC8FC9D00C3F05C /* AIMessageAlertsAdvancedPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 11A2F1210FC8FC9D00C3F05C /* AIMessageAlertsAdvancedPreferences.m */; };
 		11AA10130FCE0969003908B6 /* AIProgressDataUploader.h in Headers */ = {isa = PBXBuildFile; fileRef = 11AA10110FCE0969003908B6 /* AIProgressDataUploader.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		11AA10140FCE0969003908B6 /* AIProgressDataUploader.m in Sources */ = {isa = PBXBuildFile; fileRef = 11AA10120FCE0969003908B6 /* AIProgressDataUploader.m */; };
@@ -166,14 +153,12 @@
 		11BD73D30F5A54BB007D438A /* twitter-small.png in Resources */ = {isa = PBXBuildFile; fileRef = 11BD73D10F5A54BB007D438A /* twitter-small.png */; };
 		11BD73D40F5A54BB007D438A /* twitter.png in Resources */ = {isa = PBXBuildFile; fileRef = 11BD73D20F5A54BB007D438A /* twitter.png */; };
 		11BE28DF0FCC7D2B000E6A10 /* AIImageUploaderPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 11BE28DE0FCC7D2B000E6A10 /* AIImageUploaderPlugin.m */; };
-		11BE29640FCCA8DA000E6A10 /* ImageUploaderProgress.nib in Resources */ = {isa = PBXBuildFile; fileRef = 11BE29630FCCA8DA000E6A10 /* ImageUploaderProgress.nib */; };
+		11BE29640FCCA8DA000E6A10 /* ImageUploaderProgress.xib in Resources */ = {isa = PBXBuildFile; fileRef = 11BE29630FCCA8DA000E6A10 /* ImageUploaderProgress.xib */; };
 		11BE29680FCCA9E3000E6A10 /* AIImageUploaderWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 11BE29670FCCA9E3000E6A10 /* AIImageUploaderWindowController.m */; };
 		11C7CAF30BB58F4100296D7F /* AINudgeBuzzHandlerPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 11C7CAF10BB58F4100296D7F /* AINudgeBuzzHandlerPlugin.m */; };
 		11C97DFD0F7D26C200E8DD37 /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = 11C97DFC0F7D26C200E8DD37 /* dsa_pub.pem */; };
 		11CA00100C35EC5100A6BB8D /* SS_PreferencePaneProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 344836910BC8510B0083723B /* SS_PreferencePaneProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		11CA00110C35EC5200A6BB8D /* SS_PrefsController.h in Headers */ = {isa = PBXBuildFile; fileRef = 344836920BC8510B0083723B /* SS_PrefsController.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		11CA00120C35EC5200A6BB8D /* SS_PrefsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 344836900BC8510B0083723B /* SS_PrefsController.m */; };
-		11D135D90FBE4C65000B0A5E /* AITwitterAccountView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 11D135D80FBE4C65000B0A5E /* AITwitterAccountView.nib */; };
+		11D135D90FBE4C65000B0A5E /* AITwitterAccountView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 11D135D80FBE4C65000B0A5E /* AITwitterAccountView.xib */; };
 		11D9156F0FFC0FEB00B39713 /* AIImageShackImageUploader.m in Sources */ = {isa = PBXBuildFile; fileRef = 11D915580FFC0E9C00B39713 /* AIImageShackImageUploader.m */; };
 		11D915720FFC100700B39713 /* AIGenericMultipartImageUploader.m in Sources */ = {isa = PBXBuildFile; fileRef = 11D915710FFC100700B39713 /* AIGenericMultipartImageUploader.m */; };
 		11E786810F8860210014612E /* AIJumpControlPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 11E7867F0F8860210014612E /* AIJumpControlPlugin.m */; };
@@ -208,14 +193,12 @@
 		318EA69C0D7A659900EDB105 /* TestColorAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 318EA69B0D7A659900EDB105 /* TestColorAdditions.m */; };
 		319B29800CE8EC6F00C65398 /* TestDateAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 319B297F0CE8EC6E00C65398 /* TestDateAdditions.m */; };
 		31A764B90DA572B8000AC729 /* AutoHyperlinks.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3496A8EA07CE6CA30055BBAB /* AutoHyperlinks.framework */; };
-		31DDDA7112BDD5CE0048F6C0 /* scandate.m in Sources */ = {isa = PBXBuildFile; fileRef = 31DDDA6F12BDD5CE0048F6C0 /* scandate.m */; };
-		31DDDA7A12BDD6E90048F6C0 /* TestScandate.m in Sources */ = {isa = PBXBuildFile; fileRef = 31DDDA7912BDD6E90048F6C0 /* TestScandate.m */; };
 		31E0CD810C5EEF5200271DB1 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 31E0CD800C5EEF5200271DB1 /* CoreAudio.framework */; };
 		31FA804C0D4A8EB200ABE634 /* Adium.sdef in Resources */ = {isa = PBXBuildFile; fileRef = 0CAC6A130C0C657A0090AE95 /* Adium.sdef */; };
-		3402D5A5080DBC91004E50B4 /* SortConfiguration.nib in Resources */ = {isa = PBXBuildFile; fileRef = 347E791D07CAA52300350507 /* SortConfiguration.nib */; };
-		3402E01B07CB0CED0044F818 /* ESFileTransferProgressView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 3402E01A07CB0CEC0044F818 /* ESFileTransferProgressView.nib */; };
-		3402E02407CB0D1B0044F818 /* ProxyPasswordPrompt.nib in Resources */ = {isa = PBXBuildFile; fileRef = 3402E02307CB0D1B0044F818 /* ProxyPasswordPrompt.nib */; };
-		3402E02607CB0D1B0044F818 /* PasswordPrompt.nib in Resources */ = {isa = PBXBuildFile; fileRef = 3402E02507CB0D1B0044F818 /* PasswordPrompt.nib */; };
+		3402D5A5080DBC91004E50B4 /* SortConfiguration.xib in Resources */ = {isa = PBXBuildFile; fileRef = 347E791D07CAA52300350507 /* SortConfiguration.xib */; };
+		3402E01B07CB0CED0044F818 /* ESFileTransferProgressView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3402E01A07CB0CEC0044F818 /* ESFileTransferProgressView.xib */; };
+		3402E02407CB0D1B0044F818 /* ProxyPasswordPrompt.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3402E02307CB0D1B0044F818 /* ProxyPasswordPrompt.xib */; };
+		3402E02607CB0D1B0044F818 /* PasswordPrompt.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3402E02507CB0D1B0044F818 /* PasswordPrompt.xib */; };
 		3402E02E07CB0DBB0044F818 /* AboutBox.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3402E02D07CB0DBB0044F818 /* AboutBox.xib */; };
 		3402E04207CB0E4D0044F818 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 3402E04107CB0E4D0044F818 /* Localizable.strings */; };
 		3403F4D60D2EFE53006B08FB /* AICachedUserIconSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 3403F4D40D2EFE53006B08FB /* AICachedUserIconSource.h */; };
@@ -226,28 +209,21 @@
 		3403F56C0D2F0BDE006B08FB /* AIServersideUserIconSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 3403F56A0D2F0BDE006B08FB /* AIServersideUserIconSource.m */; };
 		34064D100F21B34200AA6FE3 /* PurpleFacebookAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34064D0E0F21B34200AA6FE3 /* PurpleFacebookAccountViewController.m */; };
 		34064D110F21B34200AA6FE3 /* PurpleFacebookAccountViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 34064D0F0F21B34200AA6FE3 /* PurpleFacebookAccountViewController.h */; };
-		340670A90A55A4B4004E22AC /* ESGlassSplitView.m in Sources */ = {isa = PBXBuildFile; fileRef = 340670A70A55A4B4004E22AC /* ESGlassSplitView.m */; };
 		34082675075B079800703011 /* Dock Icons in Copy Built-in Xtras */ = {isa = PBXBuildFile; fileRef = 3408254D075B078B00703011 /* Dock Icons */; };
 		340C1ABF0BD58FAB00D09235 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 340C1ABE0BD58FAB00D09235 /* Security.framework */; };
 		340C1E770BD59A0500D09235 /* GBImportPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 340C1E750BD59A0500D09235 /* GBImportPlugin.m */; };
-		340D859B0ADC82D100D05B3F /* sourceListBackground.png in Resources */ = {isa = PBXBuildFile; fileRef = 340670790A55A044004E22AC /* sourceListBackground.png */; };
 		34107B4C09E9923D001CC042 /* AIGuestAccountWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34107B4A09E9923D001CC042 /* AIGuestAccountWindowController.m */; };
-		34107B5609E992DA001CC042 /* GuestAccountWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34107B5509E992DA001CC042 /* GuestAccountWindow.nib */; };
-		34167FED081D706300E35678 /* DualWindowMessageAdvanced.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34167FEC081D706200E35678 /* DualWindowMessageAdvanced.nib */; };
+		34107B5609E992DA001CC042 /* GuestAccountWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34107B5509E992DA001CC042 /* GuestAccountWindow.xib */; };
 		3419DE730A81042F00C3FC68 /* AccountPrefs.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D8326107CBD598006466F2 /* AccountPrefs.plist */; };
 		3419DE740A81042F00C3FC68 /* BuiltInStatusStates.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D8327507CBD5B3006466F2 /* BuiltInStatusStates.plist */; };
 		3419DE750A81042F00C3FC68 /* ContactPrefs.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D8326607CBD598006466F2 /* ContactPrefs.plist */; };
 		3419DE760A81042F00C3FC68 /* default-icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 34D8326707CBD598006466F2 /* default-icon.png */; };
 		3419DE770A81042F00C3FC68 /* DockPrefs.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D8326207CBD598006466F2 /* DockPrefs.plist */; };
-		3419DE780A81042F00C3FC68 /* emoticon32.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 3428B33E0815E1FB00C0D3DC /* emoticon32.tiff */; };
-		3419DE790A81042F00C3FC68 /* emoticon32_transparent.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 345F590608199746001F733C /* emoticon32_transparent.tiff */; };
-		3419DE7A0A81042F00C3FC68 /* FontPanelAccessoryView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34B995D9092A832700E31E91 /* FontPanelAccessoryView.nib */; };
+		3419DE7A0A81042F00C3FC68 /* FontPanelAccessoryView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34B995D9092A832700E31E91 /* FontPanelAccessoryView.xib */; };
 		3419DE7C0A81042F00C3FC68 /* lock-locked.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 34DFF53007A62EB100B92233 /* lock-locked.tiff */; };
 		3419DE7D0A81042F00C3FC68 /* lock-unlocked.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 34DFF52607A62EB000B92233 /* lock-unlocked.tiff */; };
-		3419DE7E0A81042F00C3FC68 /* remove.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 347E787507CA975900350507 /* remove.tiff */; };
 		3419DE7F0A81042F00C3FC68 /* msg-send-file.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 34D8326307CBD598006466F2 /* msg-send-file.tiff */; };
 		3419DE820A81042F00C3FC68 /* ToolbarPrefs.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D8327607CBD5B3006466F2 /* ToolbarPrefs.plist */; };
-		3419DF3B0A8119BF00C3FC68 /* AICalendarDate.m in Sources */ = {isa = PBXBuildFile; fileRef = 340D0A000A7DD1F40059A3AF /* AICalendarDate.m */; };
 		3419E2DF0A81445800C3FC68 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 3419E2DE0A81445800C3FC68 /* Localizable.strings */; };
 		3419F7760531512200C68BA3 /* Adium.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34BD9DE105314751000AB133 /* Adium.framework */; };
 		3419FE230531586A00C68BA3 /* Adium.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 34BD9DE105314751000AB133 /* Adium.framework */; };
@@ -258,9 +234,8 @@
 		341BD5610965E97F00CF83F5 /* ESOTRUnknownFingerprintController.m in Sources */ = {isa = PBXBuildFile; fileRef = 341BD5590965E97F00CF83F5 /* ESOTRUnknownFingerprintController.m */; };
 		341BD5630965E97F00CF83F5 /* ESOTRFingerprintDetailsWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 341BD55B0965E97F00CF83F5 /* ESOTRFingerprintDetailsWindowController.m */; };
 		341BD56C0965E9A500CF83F5 /* AdiumOTREncryption.m in Sources */ = {isa = PBXBuildFile; fileRef = 341BD56A0965E9A500CF83F5 /* AdiumOTREncryption.m */; };
-		341BD5700965EC3500CF83F5 /* OTRFingerprintDetailsWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = 341BD56E0965EC3500CF83F5 /* OTRFingerprintDetailsWindow.nib */; };
-		341BD5710965EC3500CF83F5 /* OTRPrivateKeyGenerationWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = 341BD56F0965EC3500CF83F5 /* OTRPrivateKeyGenerationWindow.nib */; };
-		341BD57B0965EC4700CF83F5 /* OTRPrefs.nib in Resources */ = {isa = PBXBuildFile; fileRef = 341BD5790965EC4700CF83F5 /* OTRPrefs.nib */; };
+		341BD5700965EC3500CF83F5 /* OTRFingerprintDetailsWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 341BD56E0965EC3500CF83F5 /* OTRFingerprintDetailsWindow.xib */; };
+		341BD5710965EC3500CF83F5 /* OTRPrivateKeyGenerationWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 341BD56F0965EC3500CF83F5 /* OTRPrivateKeyGenerationWindow.xib */; };
 		342353D709D45726009FF634 /* AILogViewerWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 342353D509D45725009FF634 /* AILogViewerWindowController.m */; };
 		3428328907D2643F004F01C9 /* ESStatusPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 3428328507D2643F004F01C9 /* ESStatusPreferences.m */; };
 		3428328B07D2643F004F01C9 /* ESStatusPreferencesPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 3428328707D2643F004F01C9 /* ESStatusPreferencesPlugin.m */; };
@@ -271,10 +246,7 @@
 		342F88D10A2A74EB0001DB29 /* SGHotKeyCenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 342F88CB0A2A74EA0001DB29 /* SGHotKeyCenter.m */; };
 		342F88D30A2A74EB0001DB29 /* SGHotKey.m in Sources */ = {isa = PBXBuildFile; fileRef = 342F88CD0A2A74EB0001DB29 /* SGHotKey.m */; };
 		3430222A0AB4766E0082CF7C /* AINulRemovalPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 343022280AB4766E0082CF7C /* AINulRemovalPlugin.m */; };
-		34333FF3127F6E77007050E8 /* TemporaryIRCAccountWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34333FF2127F6E77007050E8 /* TemporaryIRCAccountWindow.nib */; };
-		343700A70A9C1E170028604E /* AIAdvancedPreferencePane.h in Headers */ = {isa = PBXBuildFile; fileRef = 343700A50A9C1E170028604E /* AIAdvancedPreferencePane.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		343700A80A9C1E170028604E /* AIAdvancedPreferencePane.m in Sources */ = {isa = PBXBuildFile; fileRef = 343700A60A9C1E170028604E /* AIAdvancedPreferencePane.m */; };
-		343700A90A9C1E170028604E /* AIAdvancedPreferencePane.h in Headers */ = {isa = PBXBuildFile; fileRef = 343700A50A9C1E170028604E /* AIAdvancedPreferencePane.h */; };
+		34333FF3127F6E77007050E8 /* TemporaryIRCAccountWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34333FF2127F6E77007050E8 /* TemporaryIRCAccountWindow.xib */; };
 		34382CEA0A50386C004BF6A2 /* DCMessageContextDisplayPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34382CE60A50386C004BF6A2 /* DCMessageContextDisplayPlugin.m */; };
 		34382CEF0A50387A004BF6A2 /* MessageContextDisplayDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34382CEE0A50387A004BF6A2 /* MessageContextDisplayDefaults.plist */; };
 		343BB5020C96CB2000506F9B /* AINewBookmarkWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A970670C965F6900F46006 /* AINewBookmarkWindowController.m */; };
@@ -287,25 +259,20 @@
 		343BB5C40C96D57900506F9B /* PurpleDefaultsMySpace.plist in Resources */ = {isa = PBXBuildFile; fileRef = 343BB5C30C96D57900506F9B /* PurpleDefaultsMySpace.plist */; };
 		343BB63B0C96DC1100506F9B /* MySpace-small.png in Resources */ = {isa = PBXBuildFile; fileRef = 343BB6390C96DC1100506F9B /* MySpace-small.png */; };
 		343BB63C0C96DC1100506F9B /* MySpace-large.png in Resources */ = {isa = PBXBuildFile; fileRef = 343BB63A0C96DC1100506F9B /* MySpace-large.png */; };
-		343EB3FE08086D2F00E27095 /* AccountProxy.nib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB3FD08086D2F00E27095 /* AccountProxy.nib */; };
-		343EB40208086D9000E27095 /* AppearancePrefs.nib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB40108086D9000E27095 /* AppearancePrefs.nib */; };
-		343EB41708086D9100E27095 /* StatusSortConfiguration.nib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB41608086D9100E27095 /* StatusSortConfiguration.nib */; };
-		343EC6920809DD3400E27095 /* ListLayoutSheet.nib in Resources */ = {isa = PBXBuildFile; fileRef = 343EC6910809DD3400E27095 /* ListLayoutSheet.nib */; };
-		343EC6C1096F7DEA00349098 /* StatusPreferencesAdvanced.nib in Resources */ = {isa = PBXBuildFile; fileRef = 343EC6C0096F7DEA00349098 /* StatusPreferencesAdvanced.nib */; };
-		343EC6C8096F7E1700349098 /* ESStatusAdvancedPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 343EC6C6096F7E1700349098 /* ESStatusAdvancedPreferences.m */; };
+		343EB3FE08086D2F00E27095 /* AccountProxy.xib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB3FD08086D2F00E27095 /* AccountProxy.xib */; };
+		343EB41708086D9100E27095 /* StatusSortConfiguration.xib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB41608086D9100E27095 /* StatusSortConfiguration.xib */; };
+		343EC6920809DD3400E27095 /* ListLayoutSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 343EC6910809DD3400E27095 /* ListLayoutSheet.xib */; };
 		343EC9810970C29400349098 /* OfflineContactHidingDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 343EC9800970C29400349098 /* OfflineContactHidingDefaults.plist */; };
 		343ECBEB0971B18200349098 /* ESShowContactInfoPromptController.m in Sources */ = {isa = PBXBuildFile; fileRef = 343ECBE90971B18200349098 /* ESShowContactInfoPromptController.m */; };
-		343ECBEE0971B18E00349098 /* ShowContactInfoPrompt.nib in Resources */ = {isa = PBXBuildFile; fileRef = 343ECBED0971B18E00349098 /* ShowContactInfoPrompt.nib */; };
+		343ECBEE0971B18E00349098 /* ShowContactInfoPrompt.xib in Resources */ = {isa = PBXBuildFile; fileRef = 343ECBED0971B18E00349098 /* ShowContactInfoPrompt.xib */; };
 		343ECBFC0971B92100349098 /* AIBorderlessListController.m in Sources */ = {isa = PBXBuildFile; fileRef = 343ECBFA0971B92100349098 /* AIBorderlessListController.m */; };
 		344458F0070B5BEF00D8E932 /* ESDebugWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 344458EE070B5BEF00D8E932 /* ESDebugWindowController.m */; };
 		344499E90B23CA5D0054B761 /* adiumPurpleAccounts.h in Headers */ = {isa = PBXBuildFile; fileRef = 344499E70B23CA5D0054B761 /* adiumPurpleAccounts.h */; };
 		344499EA0B23CA5D0054B761 /* adiumPurpleAccounts.m in Sources */ = {isa = PBXBuildFile; fileRef = 344499E80B23CA5D0054B761 /* adiumPurpleAccounts.m */; };
-		344838690BC85EF70083723B /* AccountListPreferences.nib in Resources */ = {isa = PBXBuildFile; fileRef = 4B8C3CE80825F60B004B9F45 /* AccountListPreferences.nib */; };
+		344838690BC85EF70083723B /* AccountListPreferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4B8C3CE80825F60B004B9F45 /* AccountListPreferences.xib */; };
 		344838B50BC860770083723B /* AIAccountListPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B8C3C980825EAF9004B9F45 /* AIAccountListPreferences.m */; };
 		344839380BC862780083723B /* pref-messages.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 34D8336707CBD807006466F2 /* pref-messages.tiff */; };
 		3448399A0BC8644C0083723B /* AIAdvancedPreferencesPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 344839980BC8644C0083723B /* AIAdvancedPreferencesPlugin.m */; };
-		344839A00BC864610083723B /* AIAdvancedPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 3448399E0BC864610083723B /* AIAdvancedPreferences.m */; };
-		34483A990BC869680083723B /* AdvancedPreferences.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34483A980BC869680083723B /* AdvancedPreferences.nib */; };
 		3448758E06D1EBDF00DA778C /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3448758D06D1EBDF00DA778C /* Cocoa.framework */; };
 		3448761406D1EC0C00DA778C /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3448758D06D1EBDF00DA778C /* Cocoa.framework */; };
 		344D974F0C3C442600498CA1 /* InstantMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 344D97410C3C442500498CA1 /* InstantMessage.m */; };
@@ -314,14 +281,14 @@
 		345623200A3771E100E7FC97 /* AIChatLog.m in Sources */ = {isa = PBXBuildFile; fileRef = 3456231E0A3771E100E7FC97 /* AIChatLog.m */; };
 		3456232A0A3771F400E7FC97 /* AILogToGroup.m in Sources */ = {isa = PBXBuildFile; fileRef = 345623240A3771F300E7FC97 /* AILogToGroup.m */; };
 		3456232C0A3771F400E7FC97 /* AILogFromGroup.m in Sources */ = {isa = PBXBuildFile; fileRef = 345623260A3771F400E7FC97 /* AILogFromGroup.m */; };
-		3456232F0A37723400E7FC97 /* LogViewer.nib in Resources */ = {isa = PBXBuildFile; fileRef = 3456232E0A37723400E7FC97 /* LogViewer.nib */; };
+		3456232F0A37723400E7FC97 /* LogViewer.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3456232E0A37723400E7FC97 /* LogViewer.xib */; };
 		345623380A3773C300E7FC97 /* LoggingDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 345623370A3773C300E7FC97 /* LoggingDefaults.plist */; };
 		3456233F0A3773D100E7FC97 /* AILoggerPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 3456233D0A3773D000E7FC97 /* AILoggerPlugin.m */; };
-		34575E3707CBA874004A4FFF /* DebugWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34575E3607CBA874004A4FFF /* DebugWindow.nib */; };
+		34575E3707CBA874004A4FFF /* DebugWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34575E3607CBA874004A4FFF /* DebugWindow.xib */; };
 		34575E3907CBA88E004A4FFF /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34575E3807CBA88E004A4FFF /* MainMenu.xib */; };
 		3459CBED0A25FFBF00ECC256 /* GetMetadataForHTMLLog.m in Sources */ = {isa = PBXBuildFile; fileRef = 3459CBE90A25FFBE00ECC256 /* GetMetadataForHTMLLog.m */; };
 		3459CBEF0A25FFBF00ECC256 /* GetMetadataForFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 3459CBEB0A25FFBE00ECC256 /* GetMetadataForFile.m */; };
-		345ACC970811C20F008E4D22 /* AwayStatusWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = 345ACC960811C20F008E4D22 /* AwayStatusWindow.nib */; };
+		345ACC970811C20F008E4D22 /* AwayStatusWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 345ACC960811C20F008E4D22 /* AwayStatusWindow.xib */; };
 		345AFAEE0A5D9A5F00D7DA6F /* AINoisyTableColumn.m in Sources */ = {isa = PBXBuildFile; fileRef = 345AFAEC0A5D9A5F00D7DA6F /* AINoisyTableColumn.m */; };
 		345D68990F1FD56B002F2D01 /* facebook.png in Resources */ = {isa = PBXBuildFile; fileRef = 345D68950F1FD563002F2D01 /* facebook.png */; };
 		345D689A0F1FD56B002F2D01 /* facebook-small.png in Resources */ = {isa = PBXBuildFile; fileRef = 345D68960F1FD563002F2D01 /* facebook-small.png */; };
@@ -332,7 +299,7 @@
 		345DA0680CA09AD0009F1989 /* Statuses.strings in Resources */ = {isa = PBXBuildFile; fileRef = 345DA0660CA09AD0009F1989 /* Statuses.strings */; };
 		345EE2DF0AD057FA003F396A /* AIContactInfoImageViewWithImagePicker.m in Sources */ = {isa = PBXBuildFile; fileRef = 345EE2DD0AD057FA003F396A /* AIContactInfoImageViewWithImagePicker.m */; };
 		345F566B08178356001F733C /* AdiumServiceIcons.icns in Resources */ = {isa = PBXBuildFile; fileRef = 345F566A08178356001F733C /* AdiumServiceIcons.icns */; };
-		345F57400817FF80001F733C /* pref-contactList.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 345F573F0817FF80001F733C /* pref-contactList.tiff */; };
+		345F57400817FF80001F733C /* pref-contact-list.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 345F573F0817FF80001F733C /* pref-contact-list.tiff */; };
 		345F583E08197E74001F733C /* AdiumStatusIcons.icns in Resources */ = {isa = PBXBuildFile; fileRef = 345F583D08197E74001F733C /* AdiumStatusIcons.icns */; };
 		345F58C7081990FF001F733C /* msg-log-viewer.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 345F58C6081990FF001F733C /* msg-log-viewer.tiff */; };
 		34607EE909B228FE000DB3D2 /* AIContactListNameButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 34607EE709B228FE000DB3D2 /* AIContactListNameButton.m */; };
@@ -343,8 +310,6 @@
 		3461621706FB482D009181D8 /* UserList Layout.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3461621306FB482D009181D8 /* UserList Layout.plist */; };
 		346196F20D31607500763051 /* SRSnapback.png in Resources */ = {isa = PBXBuildFile; fileRef = 346196F10D31607500763051 /* SRSnapback.png */; };
 		346371080BCA0A5400AD57AD /* AIMessageTabSplitView.m in Sources */ = {isa = PBXBuildFile; fileRef = 346371060BCA0A5400AD57AD /* AIMessageTabSplitView.m */; };
-		346544DB0C8F686B0046ED68 /* AMPurpleJabberXMLConsole.nib in Resources */ = {isa = PBXBuildFile; fileRef = 346544D90C8F686B0046ED68 /* AMPurpleJabberXMLConsole.nib */; };
-		346544DC0C8F686B0046ED68 /* AMPurpleJabberDiscoveryBrowser.nib in Resources */ = {isa = PBXBuildFile; fileRef = 346544DA0C8F686B0046ED68 /* AMPurpleJabberDiscoveryBrowser.nib */; };
 		3465451C0C8F6A670046ED68 /* AMPurpleJabberServiceDiscoveryBrowserController.h in Headers */ = {isa = PBXBuildFile; fileRef = 3465451A0C8F6A670046ED68 /* AMPurpleJabberServiceDiscoveryBrowserController.h */; };
 		3465451D0C8F6A670046ED68 /* AMPurpleJabberServiceDiscoveryBrowserController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3465451B0C8F6A670046ED68 /* AMPurpleJabberServiceDiscoveryBrowserController.m */; };
 		346545250C8F6AAD0046ED68 /* AMPurpleJabberNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 346545230C8F6AAD0046ED68 /* AMPurpleJabberNode.h */; };
@@ -356,11 +321,10 @@
 		346935D60BA6C89D00E1CF7E /* AIFileTransferProgressOutlineView.m in Sources */ = {isa = PBXBuildFile; fileRef = 346935D40BA6C89D00E1CF7E /* AIFileTransferProgressOutlineView.m */; };
 		346BA33F0774C27400628F06 /* ESGlobalEventsPreferencesPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 346BA33D0774C27400628F06 /* ESGlobalEventsPreferencesPlugin.m */; };
 		346BA3450774C2D200628F06 /* ESGlobalEventsPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 346BA3430774C2D200628F06 /* ESGlobalEventsPreferences.m */; };
-		346BA3640774C35500628F06 /* GlobalEventsPreferences.nib in Resources */ = {isa = PBXBuildFile; fileRef = 346BA3630774C35400628F06 /* GlobalEventsPreferences.nib */; };
+		346BA3640774C35500628F06 /* GlobalEventsPreferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = 346BA3630774C35400628F06 /* GlobalEventsPreferences.xib */; };
 		346F5D3208A43E7B0055C610 /* CurrentTunes.scpt in Resources */ = {isa = PBXBuildFile; fileRef = 346F5CB308A418FB0055C610 /* CurrentTunes.scpt */; };
 		347374BD0AA9206B00AD18E3 /* ShortcutRecorder.strings in Resources */ = {isa = PBXBuildFile; fileRef = 347374BB0AA9206B00AD18E3 /* ShortcutRecorder.strings */; };
 		3474E000082550FD00BF30F0 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 3474DFFF082550FD00BF30F0 /* Credits.rtf */; };
-		3474E0910825634300BF30F0 /* StatusPreferences.nib in Resources */ = {isa = PBXBuildFile; fileRef = 3474E0900825634300BF30F0 /* StatusPreferences.nib */; };
 		347933F30C861017007ADCAA /* AIColorStringTransformer.h in Headers */ = {isa = PBXBuildFile; fileRef = 347933F10C861017007ADCAA /* AIColorStringTransformer.h */; };
 		347933F40C861017007ADCAA /* AIColorStringTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 347933F20C861017007ADCAA /* AIColorStringTransformer.m */; };
 		347C6943080C8F2B00E69674 /* ESAwayStatusWindowPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 347C6941080C8F2B00E69674 /* ESAwayStatusWindowPlugin.m */; };
@@ -368,22 +332,21 @@
 		347E39DC0A98AA4A00961B0E /* missing_image.png in Resources */ = {isa = PBXBuildFile; fileRef = 347E39DB0A98AA4A00961B0E /* missing_image.png */; };
 		347E77F407CA94FF00350507 /* ESAccountEvents.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E77F207CA94FE00350507 /* ESAccountEvents.m */; };
 		347E781407CA961300350507 /* ESUserIconHandlingPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E781207CA961300350507 /* ESUserIconHandlingPlugin.m */; };
-		347E781A07CA962100350507 /* events-contact.png in Resources */ = {isa = PBXBuildFile; fileRef = 347E781907CA962100350507 /* events-contact.png */; };
 		347E782907CA964600350507 /* AIContactSortSelectionPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E782507CA964600350507 /* AIContactSortSelectionPlugin.m */; };
 		347E782A07CA964700350507 /* ESContactSortConfigurationWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E782607CA964600350507 /* ESContactSortConfigurationWindowController.m */; };
 		347E783407CA967100350507 /* SortingDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 347E783307CA967100350507 /* SortingDefaults.plist */; };
 		347E784C07CA96D700350507 /* AIContactListEditorPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E784A07CA96D600350507 /* AIContactListEditorPlugin.m */; };
 		347E785407CA96E200350507 /* AINewContactWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E785207CA96E200350507 /* AINewContactWindowController.m */; };
 		347E786007CA970500350507 /* AINewGroupWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E785E07CA970500350507 /* AINewGroupWindowController.m */; };
-		347E786B07CA972100350507 /* AddContact.nib in Resources */ = {isa = PBXBuildFile; fileRef = 347E786907CA972100350507 /* AddContact.nib */; };
-		347E786C07CA972100350507 /* AddGroup.nib in Resources */ = {isa = PBXBuildFile; fileRef = 347E786A07CA972100350507 /* AddGroup.nib */; };
+		347E786B07CA972100350507 /* AddContact.xib in Resources */ = {isa = PBXBuildFile; fileRef = 347E786907CA972100350507 /* AddContact.xib */; };
+		347E786C07CA972100350507 /* AddGroup.xib in Resources */ = {isa = PBXBuildFile; fileRef = 347E786A07CA972100350507 /* AddGroup.xib */; };
 		347E787807CA975900350507 /* msg-add-contact.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 347E787207CA975900350507 /* msg-add-contact.tiff */; };
 		347E788907CA978E00350507 /* CBActionSupportPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E788707CA978D00350507 /* CBActionSupportPlugin.m */; };
 		347E791307CAA51500350507 /* AIManualSort.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E790D07CAA51400350507 /* AIManualSort.m */; };
 		347E791507CAA51500350507 /* ESStatusSort.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E790F07CAA51400350507 /* ESStatusSort.m */; };
 		347E791807CAA51500350507 /* AIAlphabeticalSort.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E791207CAA51400350507 /* AIAlphabeticalSort.m */; };
 		347E792307CAA52300350507 /* StatusSortDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 347E791E07CAA52300350507 /* StatusSortDefaults.plist */; };
-		347E792507CAA52300350507 /* AlphabeticalSortConfiguration.nib in Resources */ = {isa = PBXBuildFile; fileRef = 347E792007CAA52300350507 /* AlphabeticalSortConfiguration.nib */; };
+		347E792507CAA52300350507 /* AlphabeticalSortConfiguration.xib in Resources */ = {isa = PBXBuildFile; fileRef = 347E792007CAA52300350507 /* AlphabeticalSortConfiguration.xib */; };
 		347E792607CAA52300350507 /* AlphabeticalSortDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 347E792107CAA52300350507 /* AlphabeticalSortDefaults.plist */; };
 		347E7A9007CAF88200350507 /* AIContactAwayPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E7A8E07CAF88200350507 /* AIContactAwayPlugin.m */; };
 		347E7A9907CAF8AF00350507 /* ESContactClientPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E7A9407CAF8AE00350507 /* ESContactClientPlugin.m */; };
@@ -435,10 +398,10 @@
 		3485DB5C09EBCE7400232CC4 /* ESPurpleGaduGaduAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 34416071059FC27D0019246B /* ESPurpleGaduGaduAccount.m */; };
 		3485DB5D09EBCE7400232CC4 /* DCPurpleGaduGaduJoinChatViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E4D961C06B73B38005235E9 /* DCPurpleGaduGaduJoinChatViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		3485DB5E09EBCE7400232CC4 /* DCPurpleGaduGaduJoinChatViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E4D961D06B73B38005235E9 /* DCPurpleGaduGaduJoinChatViewController.m */; };
-		3485DB5F09EBCE7400232CC4 /* DCPurpleGaduGaduJoinChatView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 6E4D961B06B73B38005235E9 /* DCPurpleGaduGaduJoinChatView.nib */; };
+		3485DB5F09EBCE7400232CC4 /* DCPurpleGaduGaduJoinChatView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6E4D961B06B73B38005235E9 /* DCPurpleGaduGaduJoinChatView.xib */; };
 		3485DB6009EBCE7400232CC4 /* ESPurpleGaduGaduAccountViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 34416085059FC2A30019246B /* ESPurpleGaduGaduAccountViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		3485DB6109EBCE7400232CC4 /* ESPurpleGaduGaduAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34416086059FC2A30019246B /* ESPurpleGaduGaduAccountViewController.m */; };
-		3485DB6209EBCE7400232CC4 /* ESPurpleGaduGaduAccountView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB40308086D9000E27095 /* ESPurpleGaduGaduAccountView.nib */; };
+		3485DB6209EBCE7400232CC4 /* ESPurpleGaduGaduAccountView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB40308086D9000E27095 /* ESPurpleGaduGaduAccountView.xib */; };
 		3485DB6309EBCE7400232CC4 /* PurpleDefaultsGadu-Gadu.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4B76473F07A07B620021CCD7 /* PurpleDefaultsGadu-Gadu.plist */; };
 		3485DB6409EBCE7400232CC4 /* ESJabberService.h in Headers */ = {isa = PBXBuildFile; fileRef = 34416171059FC55A0019246B /* ESJabberService.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		3485DB6509EBCE7400232CC4 /* ESJabberService.m in Sources */ = {isa = PBXBuildFile; fileRef = 34416172059FC55A0019246B /* ESJabberService.m */; };
@@ -446,10 +409,10 @@
 		3485DB6709EBCE7400232CC4 /* ESPurpleJabberAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 344160C4059FC3080019246B /* ESPurpleJabberAccount.m */; };
 		3485DB6809EBCE7400232CC4 /* DCPurpleJabberJoinChatViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E4D962206B73BE0005235E9 /* DCPurpleJabberJoinChatViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		3485DB6909EBCE7400232CC4 /* DCPurpleJabberJoinChatViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E4D962306B73BE0005235E9 /* DCPurpleJabberJoinChatViewController.m */; };
-		3485DB6A09EBCE7400232CC4 /* DCPurpleJabberJoinChatView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB41808086D9100E27095 /* DCPurpleJabberJoinChatView.nib */; };
+		3485DB6A09EBCE7400232CC4 /* DCPurpleJabberJoinChatView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB41808086D9100E27095 /* DCPurpleJabberJoinChatView.xib */; };
 		3485DB6B09EBCE7400232CC4 /* ESPurpleJabberAccountViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 344160B4059FC2F50019246B /* ESPurpleJabberAccountViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		3485DB6C09EBCE7400232CC4 /* ESPurpleJabberAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 344160B5059FC2F50019246B /* ESPurpleJabberAccountViewController.m */; };
-		3485DB6D09EBCE7400232CC4 /* ESPurpleJabberAccountView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB42208086D9200E27095 /* ESPurpleJabberAccountView.nib */; };
+		3485DB6D09EBCE7400232CC4 /* ESPurpleJabberAccountView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB42208086D9200E27095 /* ESPurpleJabberAccountView.xib */; };
 		3485DB6E09EBCE7400232CC4 /* PurpleDefaultsJabber.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4BB19298079EE90900DAA523 /* PurpleDefaultsJabber.plist */; };
 		3485DB6F09EBCE7400232CC4 /* AIPurpleGTalkAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = A3C0431B08D74D3100B48CE1 /* AIPurpleGTalkAccount.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		3485DB7009EBCE7400232CC4 /* AIPurpleGTalkAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = A3C0431C08D74D3100B48CE1 /* AIPurpleGTalkAccount.m */; };
@@ -464,10 +427,10 @@
 		3485DB7909EBCE7400232CC4 /* ESPurpleMeanwhileAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 343A7F2C06935DC500150CEC /* ESPurpleMeanwhileAccount.m */; };
 		3485DB7A09EBCE7400232CC4 /* DCPurpleMeanwhileJoinChatViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E4D962806B73C18005235E9 /* DCPurpleMeanwhileJoinChatViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		3485DB7B09EBCE7400232CC4 /* DCPurpleMeanwhileJoinChatViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E4D962906B73C18005235E9 /* DCPurpleMeanwhileJoinChatViewController.m */; };
-		3485DB7C09EBCE7400232CC4 /* DCPurpleMeanwhileJoinChatView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB41408086D9100E27095 /* DCPurpleMeanwhileJoinChatView.nib */; };
+		3485DB7C09EBCE7400232CC4 /* DCPurpleMeanwhileJoinChatView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB41408086D9100E27095 /* DCPurpleMeanwhileJoinChatView.xib */; };
 		3485DB7D09EBCE7400232CC4 /* ESPurpleMeanwhileAccountViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 343A7F2B06935DC500150CEC /* ESPurpleMeanwhileAccountViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		3485DB7E09EBCE7400232CC4 /* ESPurpleMeanwhileAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 343A7F2A06935DC500150CEC /* ESPurpleMeanwhileAccountViewController.m */; };
-		3485DB7F09EBCE7400232CC4 /* ESPurpleMeanwhileAccountView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB41E08086D9100E27095 /* ESPurpleMeanwhileAccountView.nib */; };
+		3485DB7F09EBCE7400232CC4 /* ESPurpleMeanwhileAccountView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB41E08086D9100E27095 /* ESPurpleMeanwhileAccountView.xib */; };
 		3485DB8009EBCE7400232CC4 /* PurpleDefaultsSametime.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4B76474C07A07B900021CCD7 /* PurpleDefaultsSametime.plist */; };
 		3485DB8109EBCE7400232CC4 /* ESMSNService.h in Headers */ = {isa = PBXBuildFile; fileRef = 344158A9059F90FA0019246B /* ESMSNService.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		3485DB8209EBCE7400232CC4 /* ESMSNService.m in Sources */ = {isa = PBXBuildFile; fileRef = 344158AA059F90FB0019246B /* ESMSNService.m */; };
@@ -475,10 +438,10 @@
 		3485DB8409EBCE7400232CC4 /* ESPurpleMSNAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 34415940059F94C10019246B /* ESPurpleMSNAccount.m */; };
 		3485DB8509EBCE7400232CC4 /* DCPurpleMSNJoinChatViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E4D962E06B73C4D005235E9 /* DCPurpleMSNJoinChatViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		3485DB8609EBCE7400232CC4 /* DCPurpleMSNJoinChatViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E4D962F06B73C4D005235E9 /* DCPurpleMSNJoinChatViewController.m */; };
-		3485DB8709EBCE7400232CC4 /* DCPurpleMSNJoinChatView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 6E4D962D06B73C4D005235E9 /* DCPurpleMSNJoinChatView.nib */; };
+		3485DB8709EBCE7400232CC4 /* DCPurpleMSNJoinChatView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6E4D962D06B73C4D005235E9 /* DCPurpleMSNJoinChatView.xib */; };
 		3485DB8809EBCE7400232CC4 /* ESPurpleMSNAccountViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 344159B3059F977F0019246B /* ESPurpleMSNAccountViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		3485DB8909EBCE7400232CC4 /* ESPurpleMSNAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 344159B4059F97800019246B /* ESPurpleMSNAccountViewController.m */; };
-		3485DB8A09EBCE7400232CC4 /* ESPurpleMSNAccountView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB40508086D9000E27095 /* ESPurpleMSNAccountView.nib */; };
+		3485DB8A09EBCE7400232CC4 /* ESPurpleMSNAccountView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB40508086D9000E27095 /* ESPurpleMSNAccountView.xib */; };
 		3485DB8B09EBCE7400232CC4 /* PurpleDefaultsMSN.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4B7644DD07A05E7E0021CCD7 /* PurpleDefaultsMSN.plist */; };
 		3485DB8F09EBCE7400232CC4 /* ESNovellService.h in Headers */ = {isa = PBXBuildFile; fileRef = 34C2EA180634DB5E0018E5D2 /* ESNovellService.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		3485DB9009EBCE7400232CC4 /* ESNovellService.m in Sources */ = {isa = PBXBuildFile; fileRef = 34C2EA190634DB5E0018E5D2 /* ESNovellService.m */; };
@@ -486,10 +449,10 @@
 		3485DB9209EBCE7400232CC4 /* ESPurpleNovellAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 34C2E6700634CF5F0018E5D2 /* ESPurpleNovellAccount.m */; };
 		3485DB9309EBCE7400232CC4 /* DCPurpleNovellJoinChatViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EA3688306B73E7D009CA81A /* DCPurpleNovellJoinChatViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		3485DB9409EBCE7400232CC4 /* DCPurpleNovellJoinChatViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EA3688406B73E7D009CA81A /* DCPurpleNovellJoinChatViewController.m */; };
-		3485DB9509EBCE7400232CC4 /* DCPurpleNovellJoinChatView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 6EA3688206B73E7D009CA81A /* DCPurpleNovellJoinChatView.nib */; };
+		3485DB9509EBCE7400232CC4 /* DCPurpleNovellJoinChatView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6EA3688206B73E7D009CA81A /* DCPurpleNovellJoinChatView.xib */; };
 		3485DB9609EBCE7400232CC4 /* ESPurpleNovellAccountViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 34C2E6870634CF940018E5D2 /* ESPurpleNovellAccountViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		3485DB9709EBCE7400232CC4 /* ESPurpleNovellAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34C2E6880634CF940018E5D2 /* ESPurpleNovellAccountViewController.m */; };
-		3485DB9809EBCE7400232CC4 /* ESPurpleNovellAccountView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB3FF08086D9000E27095 /* ESPurpleNovellAccountView.nib */; };
+		3485DB9809EBCE7400232CC4 /* ESPurpleNovellAccountView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB3FF08086D9000E27095 /* ESPurpleNovellAccountView.xib */; };
 		3485DB9909EBCE7400232CC4 /* PurpleDefaultsGroupWise.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4B76476007A07BC90021CCD7 /* PurpleDefaultsGroupWise.plist */; };
 		3485DB9A09EBCE7400232CC4 /* ESSimpleService.h in Headers */ = {isa = PBXBuildFile; fileRef = 345A7B590954AD1400FF3113 /* ESSimpleService.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		3485DB9B09EBCE7400232CC4 /* ESSimpleService.m in Sources */ = {isa = PBXBuildFile; fileRef = 345A7B5A0954AD1400FF3113 /* ESSimpleService.m */; };
@@ -497,7 +460,7 @@
 		3485DB9D09EBCE7400232CC4 /* ESPurpleSimpleAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 345A7B660954AD2800FF3113 /* ESPurpleSimpleAccount.m */; };
 		3485DB9E09EBCE7400232CC4 /* ESPurpleSimpleAccountViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 345A7B6B0954AD3A00FF3113 /* ESPurpleSimpleAccountViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		3485DB9F09EBCE7400232CC4 /* ESPurpleSimpleAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 345A7B6C0954AD3A00FF3113 /* ESPurpleSimpleAccountViewController.m */; };
-		3485DBA009EBCE7400232CC4 /* ESPurpleSimpleAccountView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 345A7B830954AEF400FF3113 /* ESPurpleSimpleAccountView.nib */; };
+		3485DBA009EBCE7400232CC4 /* ESPurpleSimpleAccountView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 345A7B830954AEF400FF3113 /* ESPurpleSimpleAccountView.xib */; };
 		3485DBA109EBCE7400232CC4 /* PurpleDefaultsSimple.plist in Resources */ = {isa = PBXBuildFile; fileRef = 345A7B710954AD4D00FF3113 /* PurpleDefaultsSimple.plist */; };
 		3485DBA209EBCE7400232CC4 /* ESYahooService.h in Headers */ = {isa = PBXBuildFile; fileRef = 34415B9B059FA8DF0019246B /* ESYahooService.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		3485DBA309EBCE7400232CC4 /* ESYahooService.m in Sources */ = {isa = PBXBuildFile; fileRef = 34415B9C059FA8DF0019246B /* ESYahooService.m */; };
@@ -505,10 +468,10 @@
 		3485DBA509EBCE7400232CC4 /* ESPurpleYahooAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 34415BCF059FA9CD0019246B /* ESPurpleYahooAccount.m */; };
 		3485DBA609EBCE7400232CC4 /* DCPurpleYahooJoinChatViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EA3688F06B73F67009CA81A /* DCPurpleYahooJoinChatViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		3485DBA709EBCE7400232CC4 /* DCPurpleYahooJoinChatViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EA3689006B73F67009CA81A /* DCPurpleYahooJoinChatViewController.m */; };
-		3485DBA809EBCE7400232CC4 /* DCPurpleYahooJoinChatView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB40E08086D9100E27095 /* DCPurpleYahooJoinChatView.nib */; };
+		3485DBA809EBCE7400232CC4 /* DCPurpleYahooJoinChatView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB40E08086D9100E27095 /* DCPurpleYahooJoinChatView.xib */; };
 		3485DBA909EBCE7400232CC4 /* ESPurpleYahooAccountViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 342928080628BB4200BB9217 /* ESPurpleYahooAccountViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		3485DBAA09EBCE7400232CC4 /* ESPurpleYahooAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 342928090628BB4200BB9217 /* ESPurpleYahooAccountViewController.m */; };
-		3485DBAB09EBCE7400232CC4 /* ESPurpleYahooAccountView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB42008086D9200E27095 /* ESPurpleYahooAccountView.nib */; };
+		3485DBAB09EBCE7400232CC4 /* ESPurpleYahooAccountView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB42008086D9200E27095 /* ESPurpleYahooAccountView.xib */; };
 		3485DBAC09EBCE7400232CC4 /* PurpleDefaultsYahoo!.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4B76471707A079A40021CCD7 /* PurpleDefaultsYahoo!.plist */; };
 		3485DBAD09EBCE7400232CC4 /* ESYahooJapanService.h in Headers */ = {isa = PBXBuildFile; fileRef = 34E3C8870638D40500AA3EF7 /* ESYahooJapanService.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		3485DBAE09EBCE7400232CC4 /* ESYahooJapanService.m in Sources */ = {isa = PBXBuildFile; fileRef = 34E3C8880638D40500AA3EF7 /* ESYahooJapanService.m */; };
@@ -521,10 +484,10 @@
 		3485DBB509EBCE7400232CC4 /* ESPurpleZephyrAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 348D8D2606CC07BD00449EBB /* ESPurpleZephyrAccount.m */; };
 		3485DBB609EBCE7400232CC4 /* DCPurpleZephyrJoinChatViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 348D8D2706CC07BD00449EBB /* DCPurpleZephyrJoinChatViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		3485DBB709EBCE7400232CC4 /* DCPurpleZephyrJoinChatViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 348D8D2506CC07BD00449EBB /* DCPurpleZephyrJoinChatViewController.m */; };
-		3485DBB809EBCE7400232CC4 /* DCPurpleZephyrJoinChatView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB40908086D9100E27095 /* DCPurpleZephyrJoinChatView.nib */; };
+		3485DBB809EBCE7400232CC4 /* DCPurpleZephyrJoinChatView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB40908086D9100E27095 /* DCPurpleZephyrJoinChatView.xib */; };
 		3485DBB909EBCE7400232CC4 /* ESPurpleZephyrAccountViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 348D8D2406CC07BD00449EBB /* ESPurpleZephyrAccountViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		3485DBBA09EBCE7400232CC4 /* ESPurpleZephyrAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 348D8D2206CC07BC00449EBB /* ESPurpleZephyrAccountViewController.m */; };
-		3485DBBB09EBCE7400232CC4 /* ESPurpleZephyrAccountView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB41208086D9100E27095 /* ESPurpleZephyrAccountView.nib */; };
+		3485DBBB09EBCE7400232CC4 /* ESPurpleZephyrAccountView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB41208086D9100E27095 /* ESPurpleZephyrAccountView.xib */; };
 		3485DBBC09EBCE7400232CC4 /* PurpleDefaultsZephyr.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4B7646CE07A078E60021CCD7 /* PurpleDefaultsZephyr.plist */; };
 		3485DBBD09EBCE7400232CC4 /* ESPurpleNotifyEmailController.h in Headers */ = {isa = PBXBuildFile; fileRef = 34E0103307B956F6000DF265 /* ESPurpleNotifyEmailController.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		3485DBBE09EBCE7400232CC4 /* ESPurpleNotifyEmailController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34E0103207B956F6000DF265 /* ESPurpleNotifyEmailController.m */; };
@@ -532,46 +495,39 @@
 		3485DBC009EBCE7400232CC4 /* ESPurpleRequestAbstractWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34AEE7E908E35A5800AE1C78 /* ESPurpleRequestAbstractWindowController.m */; };
 		3485DBC109EBCE7400232CC4 /* ESPurpleRequestWindowController.h in Headers */ = {isa = PBXBuildFile; fileRef = 3499F4A706309AF60035B468 /* ESPurpleRequestWindowController.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		3485DBC209EBCE7400232CC4 /* ESPurpleRequestWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3499F4A606309AF60035B468 /* ESPurpleRequestWindowController.m */; };
-		3485DBC309EBCE7400232CC4 /* PurpleMultilineRequestWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34C2CF85063340540018E5D2 /* PurpleMultilineRequestWindow.nib */; };
-		3485DBC409EBCE7400232CC4 /* PurpleSinglelineRequestWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34C2CF86063340540018E5D2 /* PurpleSinglelineRequestWindow.nib */; };
+		3485DBC309EBCE7400232CC4 /* PurpleMultilineRequestWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34C2CF85063340540018E5D2 /* PurpleMultilineRequestWindow.xib */; };
+		3485DBC409EBCE7400232CC4 /* PurpleSinglelineRequestWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34C2CF86063340540018E5D2 /* PurpleSinglelineRequestWindow.xib */; };
 		3485DBC809EBCE7400232CC4 /* ESPurpleFileReceiveRequestController.h in Headers */ = {isa = PBXBuildFile; fileRef = 34AEE7DC08E3546F00AE1C78 /* ESPurpleFileReceiveRequestController.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		3485DBC909EBCE7400232CC4 /* ESPurpleFileReceiveRequestController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34AEE7DD08E3546F00AE1C78 /* ESPurpleFileReceiveRequestController.m */; };
 		3485DBCA09EBCE7400232CC4 /* ESPurpleRequestActionController.h in Headers */ = {isa = PBXBuildFile; fileRef = 341E88680648FF1B00E0C828 /* ESPurpleRequestActionController.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		3485DBCB09EBCE7400232CC4 /* ESPurpleRequestActionController.m in Sources */ = {isa = PBXBuildFile; fileRef = 341E88690648FF1B00E0C828 /* ESPurpleRequestActionController.m */; };
 		3485DBD009EBCE8200232CC4 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 3402E04D07CB0EB00044F818 /* Localizable.strings */; };
-		34891C140D4B75EE00AEF48C /* AIStandardListScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = 34891C130D4B75EE00AEF48C /* AIStandardListScrollView.m */; };
-		348B250D0A50A1C900B2B972 /* ESSourceListBackgroundView.m in Sources */ = {isa = PBXBuildFile; fileRef = 348B250B0A50A1C900B2B972 /* ESSourceListBackgroundView.m */; };
 		348C47170D3B20BE00FB6E7A /* AIMessageWindowOutgoingScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = 348C47160D3B20BE00FB6E7A /* AIMessageWindowOutgoingScrollView.m */; };
 		348F57940936F3CC00288E41 /* ESEditStatusGroupWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 348F57920936F3CC00288E41 /* ESEditStatusGroupWindowController.m */; };
-		348F579E0936FA6D00288E41 /* EditStatusGroup.nib in Resources */ = {isa = PBXBuildFile; fileRef = 348F579D0936FA6D00288E41 /* EditStatusGroup.nib */; };
+		348F579E0936FA6D00288E41 /* EditStatusGroup.xib in Resources */ = {isa = PBXBuildFile; fileRef = 348F579D0936FA6D00288E41 /* EditStatusGroup.xib */; };
 		349062A2127F7E6900FC313F /* AITemporaryIRCAccountWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 349062A1127F7E6900FC313F /* AITemporaryIRCAccountWindowController.m */; };
 		349195660C9662AA00595A04 /* AIListBookmark.m in Sources */ = {isa = PBXBuildFile; fileRef = 349195640C9662AA00595A04 /* AIListBookmark.m */; };
 		349195670C9662AA00595A04 /* AIListBookmark.h in Headers */ = {isa = PBXBuildFile; fileRef = 349195650C9662AA00595A04 /* AIListBookmark.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		3496A8C207CE6B880055BBAB /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 3496A8C107CE6B880055BBAB /* InfoPlist.strings */; };
 		349710DD096C4C7700699948 /* Buttons.strings in Resources */ = {isa = PBXBuildFile; fileRef = 349710DB096C4C7700699948 /* Buttons.strings */; };
-		349C2F470867AD16000BF883 /* ApplescriptRunner.m in Sources */ = {isa = PBXBuildFile; fileRef = 349C2F460867AD16000BF883 /* ApplescriptRunner.m */; };
-		349C2FF00867AD65000BF883 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 349C2FEF0867AD65000BF883 /* Foundation.framework */; };
-		349C30790867ADA3000BF883 /* AdiumApplescriptRunner in Resources */ = {isa = PBXBuildFile; fileRef = 349C2EFA0867AC97000BF883 /* AdiumApplescriptRunner */; };
 		349C6E4907C96D45005EB896 /* CBContactCountingDisplayPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 349C6E4607C96D44005EB896 /* CBContactCountingDisplayPlugin.m */; };
 		349C6E8E07C972B2005EB896 /* AIExtendedStatusPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 349C6E8C07C972B2005EB896 /* AIExtendedStatusPlugin.m */; };
-		349C6F6607C99ACF005EB896 /* ESContactListAdvancedPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 349C6F6407C99ACE005EB896 /* ESContactListAdvancedPreferences.m */; };
-		349C7C7A07C9AE1B005EB896 /* ContactListAdvancedPrefs.nib in Resources */ = {isa = PBXBuildFile; fileRef = 349C6F8A07C99D2C005EB896 /* ContactListAdvancedPrefs.nib */; };
 		349E2E8E07A8AF0C00EAB76A /* AIEmoticonPackPreviewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 349E2E8C07A8AF0C00EAB76A /* AIEmoticonPackPreviewController.m */; };
 		34A1A8CA0DFB246400AC78CF /* AISocialNetworkingStatusMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = 34A1A8C80DFB246300AC78CF /* AISocialNetworkingStatusMenu.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		34A1A8CB0DFB246400AC78CF /* AISocialNetworkingStatusMenu.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A1A8C90DFB246300AC78CF /* AISocialNetworkingStatusMenu.m */; };
-		34A1A8E70DFB276E00AC78CF /* SocialNetworkingCustomStatus.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34A1A8E60DFB276E00AC78CF /* SocialNetworkingCustomStatus.nib */; };
+		34A1A8E70DFB276E00AC78CF /* SocialNetworkingCustomStatus.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34A1A8E60DFB276E00AC78CF /* SocialNetworkingCustomStatus.xib */; };
 		34A1A8ED0DFB27A800AC78CF /* AICustomSocialNetworkingStatusWindowController.h in Headers */ = {isa = PBXBuildFile; fileRef = 34A1A8EB0DFB27A800AC78CF /* AICustomSocialNetworkingStatusWindowController.h */; };
 		34A1A8EE0DFB27A800AC78CF /* AICustomSocialNetworkingStatusWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A1A8EC0DFB27A800AC78CF /* AICustomSocialNetworkingStatusWindowController.m */; };
-		34A1AB6C0DFC531000AC78CF /* AIXMLChatlogConverter.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A1AB6B0DFC531000AC78CF /* AIXMLChatlogConverter.m */; };
-		34A1AEE90DFD4BFE00AC78CF /* AIAddressBookInspectorPane.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34A1AEE80DFD4BFE00AC78CF /* AIAddressBookInspectorPane.nib */; };
-		34A1AEEE0DFD4C4A00AC78CF /* AIAdvancedInspectorPane.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34A1AEED0DFD4C4A00AC78CF /* AIAdvancedInspectorPane.nib */; };
+		34A1AB6C0DFC531000AC78CF /* AIXMLChatlogConverter.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A1AB6B0DFC531000AC78CF /* AIXMLChatlogConverter.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+		34A1AEE90DFD4BFE00AC78CF /* AIAddressBookInspectorPane.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34A1AEE80DFD4BFE00AC78CF /* AIAddressBookInspectorPane.xib */; };
+		34A1AEEE0DFD4C4A00AC78CF /* AIAdvancedInspectorPane.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34A1AEED0DFD4C4A00AC78CF /* AIAdvancedInspectorPane.xib */; };
 		34A1B2C30DFDBA1200AC78CF /* AIStringDebug.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A1B2C20DFDBA1200AC78CF /* AIStringDebug.m */; };
 		34A250B607E0F822009854E1 /* StatusDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34A250B507E0F822009854E1 /* StatusDefaults.plist */; };
 		34A29DB706ED68C000E1366C /* Contact List in Copy Built-in Xtras */ = {isa = PBXBuildFile; fileRef = 34A29D9406ED68BF00E1366C /* Contact List */; };
 		34A489F306F64359002C7C5F /* AISCLViewPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A489F106F64359002C7C5F /* AISCLViewPlugin.m */; };
 		34A48A0106F6436D002C7C5F /* AIStandardListWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A489FB06F6436D002C7C5F /* AIStandardListWindowController.m */; };
 		34A48A0406F6436D002C7C5F /* AIListWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A489FE06F6436D002C7C5F /* AIListWindowController.m */; };
-		34A48A1006F64382002C7C5F /* ContactListWindowBorderless.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34A48A0F06F64381002C7C5F /* ContactListWindowBorderless.nib */; };
+		34A48A1006F64382002C7C5F /* ContactListWindowBorderless.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34A48A0F06F64381002C7C5F /* ContactListWindowBorderless.xib */; };
 		34A48A1806F6438F002C7C5F /* AIBorderlessListWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A48A1406F6438F002C7C5F /* AIBorderlessListWindowController.m */; };
 		34A48A1906F6438F002C7C5F /* AIListController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A48A1506F6438F002C7C5F /* AIListController.m */; };
 		34A48A3F06F64665002C7C5F /* AIListThemeWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A48A3B06F64664002C7C5F /* AIListThemeWindowController.m */; };
@@ -579,17 +535,15 @@
 		34A48A5006F64692002C7C5F /* AITextColorPreviewView.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A48A4F06F64692002C7C5F /* AITextColorPreviewView.m */; };
 		34A48B3A06F64B27002C7C5F /* AIBorderlessListOutlineView.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A48B3806F64B27002C7C5F /* AIBorderlessListOutlineView.m */; };
 		34A663920BF66D96008637BB /* PurpleCommon.h in Headers */ = {isa = PBXBuildFile; fileRef = 340915F105C0A5DF00CDE3DD /* PurpleCommon.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		34A6F68507D65D6200972830 /* GeneralPreferences.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34A6F68407D65D6200972830 /* GeneralPreferences.nib */; };
 		34A6FAD907D6F3AA00972830 /* AIEventSoundsPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A6FAD507D6F3A600972830 /* AIEventSoundsPlugin.m */; };
 		34A6FADB07D6F3AA00972830 /* ESEventSoundAlertDetailPane.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A6FAD707D6F3A700972830 /* ESEventSoundAlertDetailPane.m */; };
-		34A6FB2607D6F97B00972830 /* EventSoundContactAlert.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34A6FB2507D6F97B00972830 /* EventSoundContactAlert.nib */; };
+		34A6FB2607D6F97B00972830 /* EventSoundContactAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34A6FB2507D6F97B00972830 /* EventSoundContactAlert.xib */; };
 		34A6FB2D07D6F98600972830 /* events-sound-alert.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 34A6FB2B07D6F98600972830 /* events-sound-alert.tiff */; };
 		34A6FB2E07D6F98600972830 /* SoundFileIcon.png in Resources */ = {isa = PBXBuildFile; fileRef = 34A6FB2C07D6F98600972830 /* SoundFileIcon.png */; };
 		34A88E180C7A26E0006EB7D4 /* AIPasswordPromptController.m in Sources */ = {isa = PBXBuildFile; fileRef = F55B416603AB8BFC01A8010A /* AIPasswordPromptController.m */; };
 		34A88E190C7A26E1006EB7D4 /* AIPasswordPromptController.h in Headers */ = {isa = PBXBuildFile; fileRef = F55B416E03AB8C3201A8010A /* AIPasswordPromptController.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		34A9705A0C965F2400F46006 /* AISideSplitView.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A970590C965F2400F46006 /* AISideSplitView.m */; };
 		34A9706F0C965F8E00F46006 /* AIAddBookmarkPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A9706D0C965F8E00F46006 /* AIAddBookmarkPlugin.m */; };
-		34A970740C965FC800F46006 /* AddBookmark.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34A970730C965FC800F46006 /* AddBookmark.nib */; };
+		34A970740C965FC800F46006 /* AddBookmark.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34A970730C965FC800F46006 /* AddBookmark.xib */; };
 		34A9707E0C96602300F46006 /* sidebarStatusAreaBackground.png in Resources */ = {isa = PBXBuildFile; fileRef = 34A9707D0C96602200F46006 /* sidebarStatusAreaBackground.png */; };
 		34AE249E09BCCFA900A35B51 /* AIWindowDraggingView.m in Sources */ = {isa = PBXBuildFile; fileRef = 34AE249C09BCCFA900A35B51 /* AIWindowDraggingView.m */; };
 		34B1268E0B924E28003B0451 /* adiumPurpleDnsRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 34B1268C0B924E28003B0451 /* adiumPurpleDnsRequest.h */; };
@@ -599,7 +553,7 @@
 		34B4B5A40708B049002C4C6D /* ESDebugController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B4B5A20708B049002C4C6D /* ESDebugController.m */; };
 		34B588A1058D833A00E7EF0D /* ExceptionHandling.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34B588A0058D833A00E7EF0D /* ExceptionHandling.framework */; };
 		34B5E2600A7C94D3005186E6 /* AILogDateFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B5E25E0A7C94D3005186E6 /* AILogDateFormatter.m */; };
-		34B9C7920A255DCE00CEA8AE /* LogViewerDateFilter.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34B9C7910A255DCE00CEA8AE /* LogViewerDateFilter.nib */; };
+		34B9C7920A255DCE00CEA8AE /* LogViewerDateFilter.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34B9C7910A255DCE00CEA8AE /* LogViewerDateFilter.xib */; };
 		34BC8F7B0ACA3AAC00562745 /* AIScannerDebug.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BC8F790ACA3AAC00562745 /* AIScannerDebug.m */; };
 		34BD9D4A053146CC000AB133 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = F59DB6AD033EB74801A8010A /* main.m */; };
 		34BD9D4C053146CC000AB133 /* AIContactInfoWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = F570A59903704B6101A8010A /* AIContactInfoWindowController.m */; };
@@ -616,7 +570,7 @@
 		34BFE25007E8E5F200AD984D /* AIAutoLinkingPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BFE24E07E8E5F100AD984D /* AIAutoLinkingPlugin.m */; };
 		34BFE2D807E8E74400AD984D /* AIChatConsolidationPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BFE2D607E8E74400AD984D /* AIChatConsolidationPlugin.m */; };
 		34C14CD307A8B1AB003CC138 /* AIEmoticonPackPreviewView.m in Sources */ = {isa = PBXBuildFile; fileRef = 34C14CD107A8B1AB003CC138 /* AIEmoticonPackPreviewView.m */; };
-		34C14D5107A8BA00003CC138 /* EmoticonPackPreview.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34C14D5007A8BA00003CC138 /* EmoticonPackPreview.nib */; };
+		34C14D5107A8BA00003CC138 /* EmoticonPackPreview.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34C14D5007A8BA00003CC138 /* EmoticonPackPreview.xib */; };
 		34C18B0D06CAC95400FF5FF9 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34E839050583207E00F2AADB /* SystemConfiguration.framework */; };
 		34C68B260778FA1300EB423C /* ESGeneralPreferencesPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34C68B240778FA1300EB423C /* ESGeneralPreferencesPlugin.m */; };
 		34C68B2C0778FA5C00EB423C /* ESGeneralPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 34C68B2A0778FA5C00EB423C /* ESGeneralPreferences.m */; };
@@ -627,8 +581,8 @@
 		34C91BBB0CA8909700740974 /* AIContentNotification.h in Headers */ = {isa = PBXBuildFile; fileRef = 34C91BB90CA8909700740974 /* AIContentNotification.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		34C91BBC0CA8909700740974 /* AIContentNotification.m in Sources */ = {isa = PBXBuildFile; fileRef = 34C91BBA0CA8909700740974 /* AIContentNotification.m */; };
 		34CA15530CAFDFB2009AA5E3 /* sidebarActionWidget.png in Resources */ = {isa = PBXBuildFile; fileRef = 34CA15520CAFDFB2009AA5E3 /* sidebarActionWidget.png */; };
-		34CA22300A671BEF00B11032 /* PersonalPreferences.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34CA222F0A671BEF00B11032 /* PersonalPreferences.nib */; };
-		34CAA3FB0BD3998E00AE92DC /* ESPurpleAIMAccountView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB41C08086D9100E27095 /* ESPurpleAIMAccountView.nib */; };
+		34CA22300A671BEF00B11032 /* ProfilePreferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34CA222F0A671BEF00B11032 /* ProfilePreferences.xib */; };
+		34CAA3FB0BD3998E00AE92DC /* ESPurpleAIMAccountView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB41C08086D9100E27095 /* ESPurpleAIMAccountView.xib */; };
 		34CF9DF5085B8B7900D87E37 /* ESiTunesPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34CF9DF3085B8B7900D87E37 /* ESiTunesPlugin.m */; };
 		34D073CA0B1E1A4400D63DF2 /* ESPurpleDotMacAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B387EB807199FE5004DE713 /* ESPurpleDotMacAccountViewController.m */; };
 		34D073CB0B1E1A4500D63DF2 /* ESPurpleDotMacAccountViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B387EB707199FE5004DE713 /* ESPurpleDotMacAccountViewController.h */; };
@@ -643,9 +597,9 @@
 		34D073D60B1E1A5000D63DF2 /* PurpleDefaultsMac.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4B76472E07A07A340021CCD7 /* PurpleDefaultsMac.plist */; };
 		34D073D70B1E1A5000D63DF2 /* PurpleDefaultsAIM.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4B7635A507A0581D0021CCD7 /* PurpleDefaultsAIM.plist */; };
 		34D0F9CB0954E70100DCB678 /* AIContactListImagePicker.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D0F9C90954E70100DCB678 /* AIContactListImagePicker.m */; };
-		34D0FDD20956186200DCB678 /* ESPersonalPreferencesPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D0FDD00956186200DCB678 /* ESPersonalPreferencesPlugin.m */; };
-		34D0FDD80956187700DCB678 /* ESPersonalPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D0FDD60956187700DCB678 /* ESPersonalPreferences.m */; };
-		34D0FF8509569FE500DCB678 /* PersonalPreferencesDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D0FF8409569FE500DCB678 /* PersonalPreferencesDefaults.plist */; };
+		34D0FDD20956186200DCB678 /* ESProfilePreferencesPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D0FDD00956186200DCB678 /* ESProfilePreferencesPlugin.m */; };
+		34D0FDD80956187700DCB678 /* ESProfilePreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D0FDD60956187700DCB678 /* ESProfilePreferences.m */; };
+		34D0FF8509569FE500DCB678 /* ProfilePreferencesDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D0FF8409569FE500DCB678 /* ProfilePreferencesDefaults.plist */; };
 		34D8153A13B663650022C8C4 /* AIFacebookXMPPAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = 34D8153013B663650022C8C4 /* AIFacebookXMPPAccount.h */; };
 		34D8153B13B663650022C8C4 /* AIFacebookXMPPAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D8153113B663650022C8C4 /* AIFacebookXMPPAccount.m */; };
 		34D8153D13B663650022C8C4 /* AIFacebookXMPPAccountViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 34D8153313B663650022C8C4 /* AIFacebookXMPPAccountViewController.h */; };
@@ -655,8 +609,6 @@
 		34D8154113B663650022C8C4 /* AIFacebookXMPPOAuthWebViewWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D8153713B663650022C8C4 /* AIFacebookXMPPOAuthWebViewWindowController.m */; };
 		34D8154213B663650022C8C4 /* AIFacebookXMPPService.h in Headers */ = {isa = PBXBuildFile; fileRef = 34D8153813B663650022C8C4 /* AIFacebookXMPPService.h */; };
 		34D8154313B663650022C8C4 /* AIFacebookXMPPService.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D8153913B663650022C8C4 /* AIFacebookXMPPService.m */; };
-		34D8154613B663700022C8C4 /* JSONKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 34D8154413B663700022C8C4 /* JSONKit.h */; };
-		34D8154713B663700022C8C4 /* JSONKit.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D8154513B663700022C8C4 /* JSONKit.m */; settings = {COMPILER_FLAGS = "-DNS_BLOCK_ASSERTIONS"; }; };
 		34D8154D13B663A80022C8C4 /* auth_fb.c in Sources */ = {isa = PBXBuildFile; fileRef = 34D8154913B663A80022C8C4 /* auth_fb.c */; };
 		34D8154E13B663A80022C8C4 /* auth_fb.h in Headers */ = {isa = PBXBuildFile; fileRef = 34D8154A13B663A80022C8C4 /* auth_fb.h */; };
 		34D8154F13B663A80022C8C4 /* fbapi.c in Sources */ = {isa = PBXBuildFile; fileRef = 34D8154B13B663A80022C8C4 /* fbapi.c */; };
@@ -672,18 +624,16 @@
 		34D832B507CBD62C006466F2 /* AdiumPlugin.icns in Resources */ = {isa = PBXBuildFile; fileRef = 34D832AC07CBD62C006466F2 /* AdiumPlugin.icns */; };
 		34D832B607CBD62C006466F2 /* Adium.icns in Resources */ = {isa = PBXBuildFile; fileRef = 34D832AD07CBD62C006466F2 /* Adium.icns */; };
 		34D8332B07CBD72A006466F2 /* ContactCountingDisplayDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D8332A07CBD72A006466F2 /* ContactCountingDisplayDefaults.plist */; };
-		34D8333207CBD741006466F2 /* ApplescriptContactAlert.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34D8333007CBD741006466F2 /* ApplescriptContactAlert.nib */; };
+		34D8333207CBD741006466F2 /* ApplescriptContactAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34D8333007CBD741006466F2 /* ApplescriptContactAlert.xib */; };
 		34D8333307CBD741006466F2 /* events-applescript-alert.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 34D8333107CBD741006466F2 /* events-applescript-alert.tiff */; };
 		34D8333B07CBD758006466F2 /* ESApplescriptContactAlertPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D8333707CBD758006466F2 /* ESApplescriptContactAlertPlugin.m */; };
 		34D8333C07CBD758006466F2 /* ESPanelApplescriptDetailPane.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D8333807CBD758006466F2 /* ESPanelApplescriptDetailPane.m */; };
-		34D8337107CBD808006466F2 /* pref-general.tif in Resources */ = {isa = PBXBuildFile; fileRef = 34D8336807CBD807006466F2 /* pref-general.tif */; };
 		34D8337407CBD808006466F2 /* pref-file-transfer.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 34D8336B07CBD807006466F2 /* pref-file-transfer.tiff */; };
 		34D8337507CBD808006466F2 /* pref-events.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 34D8336C07CBD807006466F2 /* pref-events.tiff */; };
 		34D8337707CBD808006466F2 /* pref-advanced.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 34D8336E07CBD807006466F2 /* pref-advanced.tiff */; };
-		34D836E507CBF593006466F2 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F531836F019E40BB01A80165 /* Carbon.framework */; };
 		34DC12FC0A81415D00D710F3 /* ESApplescriptabilityController.m in Sources */ = {isa = PBXBuildFile; fileRef = 344C0D4E06B6D63800DA7200 /* ESApplescriptabilityController.m */; };
 		34DC13040A81417600D710F3 /* AILoginWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = F57938C2033E73AC01A8010A /* AILoginWindowController.m */; };
-		34DC13050A81417700D710F3 /* LoginSelect.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34575E3407CBA7DF004A4FFF /* LoginSelect.nib */; };
+		34DC13050A81417700D710F3 /* LoginSelect.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34575E3407CBA7DF004A4FFF /* LoginSelect.xib */; };
 		34DC88140A7EEE2E003E1636 /* AIAccountController.m in Sources */ = {isa = PBXBuildFile; fileRef = F57938AA033E737001A8010A /* AIAccountController.m */; };
 		34DC88160A7EEE2E003E1636 /* AIContactController.m in Sources */ = {isa = PBXBuildFile; fileRef = F57938AB033E737001A8010A /* AIContactController.m */; };
 		34DC88180A7EEE2E003E1636 /* ESContactAlertsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CF42678057763E200F27FAA /* ESContactAlertsController.m */; };
@@ -714,26 +664,14 @@
 		34DC88530A7EEE2E003E1636 /* AdiumMessageEvents.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B82C8A085A87B000864531 /* AdiumMessageEvents.m */; };
 		34DC88550A7EEE2E003E1636 /* AdiumChatEvents.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BD0DB408D31479000BE2C0 /* AdiumChatEvents.m */; };
 		34DC88570A7EEE2E003E1636 /* ESFileTransferRequestPromptController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3452A9F707891C8A00C3C494 /* ESFileTransferRequestPromptController.m */; };
-		34DC88580A7EEE2E003E1636 /* FileTransferRequestPrompt.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34575E2A07CBA70D004A4FFF /* FileTransferRequestPrompt.nib */; };
-		34DC88590A7EEE2E003E1636 /* FileTransferProgressWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34575E2B07CBA70D004A4FFF /* FileTransferProgressWindow.nib */; };
+		34DC88580A7EEE2E003E1636 /* FileTransferRequestPrompt.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34575E2A07CBA70D004A4FFF /* FileTransferRequestPrompt.xib */; };
+		34DC88590A7EEE2E003E1636 /* FileTransferProgressWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34575E2B07CBA70D004A4FFF /* FileTransferProgressWindow.xib */; };
 		34DC885A0A7EEE2E003E1636 /* FileTransferPrefs.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34575E2C07CBA70D004A4FFF /* FileTransferPrefs.plist */; };
-		34DC885B0A7EEE2E003E1636 /* FileTransferPrefs.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34575E2D07CBA70D004A4FFF /* FileTransferPrefs.nib */; };
+		34DC885B0A7EEE2E003E1636 /* FileTransferPrefs.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34575E2D07CBA70D004A4FFF /* FileTransferPrefs.xib */; };
 		34DC885D0A7EEE2E003E1636 /* ESFileTransferProgressRow.m in Sources */ = {isa = PBXBuildFile; fileRef = 349FE300074D01D300E36B3B /* ESFileTransferProgressRow.m */; };
 		34DC885F0A7EEE2E003E1636 /* ESFileTransferProgressView.m in Sources */ = {isa = PBXBuildFile; fileRef = 349FE2FE074D01D300E36B3B /* ESFileTransferProgressView.m */; };
 		34DC88620A7EEE2F003E1636 /* ESFileTransferProgressWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 349FE2FC074D01D200E36B3B /* ESFileTransferProgressWindowController.m */; };
 		34DC88640A7EEE2F003E1636 /* ESFileTransferPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D2E8680758BB0B0054C56D /* ESFileTransferPreferences.m */; };
-		34DC88650A7EEE2F003E1636 /* FTProgressRevealRollover.tif in Resources */ = {isa = PBXBuildFile; fileRef = 34D8324807CBD53A006466F2 /* FTProgressRevealRollover.tif */; };
-		34DC88660A7EEE2F003E1636 /* FTProgressRevealRollover_Selected.tif in Resources */ = {isa = PBXBuildFile; fileRef = 34D8324907CBD53A006466F2 /* FTProgressRevealRollover_Selected.tif */; };
-		34DC88670A7EEE2F003E1636 /* FTProgressStopRollover_Selected.tif in Resources */ = {isa = PBXBuildFile; fileRef = 34D8324A07CBD53A006466F2 /* FTProgressStopRollover_Selected.tif */; };
-		34DC88680A7EEE2F003E1636 /* FTProgressStop_Selected.tif in Resources */ = {isa = PBXBuildFile; fileRef = 34D8324B07CBD53A006466F2 /* FTProgressStop_Selected.tif */; };
-		34DC88690A7EEE2F003E1636 /* FTProgressStop.tif in Resources */ = {isa = PBXBuildFile; fileRef = 34D8324C07CBD53A006466F2 /* FTProgressStop.tif */; };
-		34DC886A0A7EEE2F003E1636 /* FTProgressStopRollover.tif in Resources */ = {isa = PBXBuildFile; fileRef = 34D8324D07CBD53B006466F2 /* FTProgressStopRollover.tif */; };
-		34DC886B0A7EEE2F003E1636 /* FTProgressRevealPressed.tif in Resources */ = {isa = PBXBuildFile; fileRef = 34D8324E07CBD53B006466F2 /* FTProgressRevealPressed.tif */; };
-		34DC886C0A7EEE2F003E1636 /* FTProgressReveal_Selected.tif in Resources */ = {isa = PBXBuildFile; fileRef = 34D8324F07CBD53B006466F2 /* FTProgressReveal_Selected.tif */; };
-		34DC886D0A7EEE2F003E1636 /* FTProgressReveal.tif in Resources */ = {isa = PBXBuildFile; fileRef = 34D8325007CBD53B006466F2 /* FTProgressReveal.tif */; };
-		34DC886E0A7EEE2F003E1636 /* FTProgressStopPressed_Selected.tif in Resources */ = {isa = PBXBuildFile; fileRef = 34D8325107CBD53B006466F2 /* FTProgressStopPressed_Selected.tif */; };
-		34DC886F0A7EEE2F003E1636 /* FTProgressStopPressed.tif in Resources */ = {isa = PBXBuildFile; fileRef = 34D8325207CBD53B006466F2 /* FTProgressStopPressed.tif */; };
-		34DC88700A7EEE2F003E1636 /* FTProgressRevealPressed_Selected.tif in Resources */ = {isa = PBXBuildFile; fileRef = 34D8325307CBD53B006466F2 /* FTProgressRevealPressed_Selected.tif */; };
 		34DC88740A7EEE2F003E1636 /* AIPreferenceWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = F57938BB033E739101A8010A /* AIPreferenceWindowController.m */; };
 		34DC88770A7EEE2F003E1636 /* AdiumSetupWizard.m in Sources */ = {isa = PBXBuildFile; fileRef = 344161BC0943E0D800BC26ED /* AdiumSetupWizard.m */; };
 		34DC88780A7EEE2F003E1636 /* AdiumyButler.png in Resources */ = {isa = PBXBuildFile; fileRef = 344161CF0943E20D00BC26ED /* AdiumyButler.png */; };
@@ -745,7 +683,7 @@
 		34DC88820A7EEE2F003E1636 /* SoundPrefs.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D8326407CBD598006466F2 /* SoundPrefs.plist */; };
 		34DC88840A7EEE2F003E1636 /* AdiumIdleManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 346CFDC5087B7836009711C8 /* AdiumIdleManager.m */; };
 		34DC88880A7EEE2F003E1636 /* XtrasInstaller.m in Sources */ = {isa = PBXBuildFile; fileRef = 34F10239073449D500890D3B /* XtrasInstaller.m */; };
-		34DC88890A7EEE2F003E1636 /* XtraProgressWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34F1022A0734499600890D3B /* XtraProgressWindow.nib */; };
+		34DC88890A7EEE2F003E1636 /* XtraProgressWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34F1022A0734499600890D3B /* XtraProgressWindow.xib */; };
 		34DC8A440A7EEEF7003E1636 /* AIApplescriptabilityControllerProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 340D0EB90A7E83D70059A3AF /* AIApplescriptabilityControllerProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		34DC8A450A7EEEF7003E1636 /* AIControllerProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 340D03A80A7D798A0059A3AF /* AIControllerProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		34DC8A460A7EEEF7003E1636 /* AIAccountControllerProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 340D03990A7D78FC0059A3AF /* AIAccountControllerProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -766,10 +704,10 @@
 		34DC8A550A7EEEF7003E1636 /* AIDebugControllerProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 340D0EC20A7E84680059A3AF /* AIDebugControllerProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		34DC8A570A7EEEF7003E1636 /* ESPresetManagementController.h in Headers */ = {isa = PBXBuildFile; fileRef = 34BFD7F207E6A22700AD984D /* ESPresetManagementController.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		34DC8A580A7EEEF7003E1636 /* ESPresetManagementController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BFD7F407E6A22700AD984D /* ESPresetManagementController.m */; };
-		34DC8A590A7EEEF7003E1636 /* PresetManagement.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34BFD7F307E6A22700AD984D /* PresetManagement.nib */; };
+		34DC8A590A7EEEF7003E1636 /* PresetManagement.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34BFD7F307E6A22700AD984D /* PresetManagement.xib */; };
 		34DC8A5A0A7EEEF7003E1636 /* ESPresetNameSheetController.h in Headers */ = {isa = PBXBuildFile; fileRef = 34BFDB2C07E7710C00AD984D /* ESPresetNameSheetController.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		34DC8A5B0A7EEEF7003E1636 /* ESPresetNameSheetController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BFDB2D07E7710C00AD984D /* ESPresetNameSheetController.m */; };
-		34DC8A5C0A7EEEF7003E1636 /* PresetNameSheet.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34BFDB3807E7714200AD984D /* PresetNameSheet.nib */; };
+		34DC8A5C0A7EEEF7003E1636 /* PresetNameSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34BFDB3807E7714200AD984D /* PresetNameSheet.xib */; };
 		34DC8A5D0A7EEEF7003E1636 /* AIService.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BAFD57706E0091100FF7FBC /* AIService.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		34DC8A5E0A7EEEF7003E1636 /* AIService.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BAFD57806E0091100FF7FBC /* AIService.m */; };
 		34DC8A5F0A7EEEF7003E1636 /* AIAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = F5793922033E74C301A8010A /* AIAccount.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -778,10 +716,10 @@
 		34DC8A620A7EEEF7003E1636 /* AIAbstractAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BE8AF6E0796EC1200B6E49B /* AIAbstractAccount.m */; };
 		34DC8A630A7EEEF7003E1636 /* AIAccountViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B28DDAB0599FED200343093 /* AIAccountViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		34DC8A640A7EEEF7003E1636 /* AIAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B28DDAC0599FED200343093 /* AIAccountViewController.m */; };
-		34DC8A650A7EEEF7003E1636 /* AccountSetup.nib in Resources */ = {isa = PBXBuildFile; fileRef = 4BDD81E907A0B6D30057DB2C /* AccountSetup.nib */; };
-		34DC8A660A7EEEF7003E1636 /* AccountProfile.nib in Resources */ = {isa = PBXBuildFile; fileRef = 4BDD81E807A0B6D30057DB2C /* AccountProfile.nib */; };
-		34DC8A670A7EEEF7003E1636 /* AccountOptions.nib in Resources */ = {isa = PBXBuildFile; fileRef = 4BDD81E707A0B6D30057DB2C /* AccountOptions.nib */; };
-		34DC8A680A7EEEF7003E1636 /* AccountPrivacy.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34943DEE07BAD918000F2A03 /* AccountPrivacy.nib */; };
+		34DC8A650A7EEEF7003E1636 /* AccountSetup.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4BDD81E907A0B6D30057DB2C /* AccountSetup.xib */; };
+		34DC8A660A7EEEF7003E1636 /* AccountProfile.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4BDD81E807A0B6D30057DB2C /* AccountProfile.xib */; };
+		34DC8A670A7EEEF7003E1636 /* AccountOptions.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4BDD81E707A0B6D30057DB2C /* AccountOptions.xib */; };
+		34DC8A680A7EEEF7003E1636 /* AccountPrivacy.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34943DEE07BAD918000F2A03 /* AccountPrivacy.xib */; };
 		34DC8A690A7EEEF7003E1636 /* AccountDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 348FF84909128D6300A942A8 /* AccountDefaults.plist */; };
 		34DC8A6A0A7EEEF7003E1636 /* AIEmoticon.h in Headers */ = {isa = PBXBuildFile; fileRef = 34503C7F058F96C400FB7AD1 /* AIEmoticon.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		34DC8A6B0A7EEEF7003E1636 /* AIEmoticon.m in Sources */ = {isa = PBXBuildFile; fileRef = 34503C7E058F96C400FB7AD1 /* AIEmoticon.m */; };
@@ -796,7 +734,7 @@
 		34DC8A740A7EEEF7003E1636 /* AIStatusGroup.m in Sources */ = {isa = PBXBuildFile; fileRef = 34AC2FA609352C2400393D7A /* AIStatusGroup.m */; };
 		34DC8A750A7EEEF7003E1636 /* AIEditStateWindowController.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B588C9B07AC23B2001832A9 /* AIEditStateWindowController.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		34DC8A760A7EEEF7003E1636 /* AIEditStateWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B588C9C07AC23B2001832A9 /* AIEditStateWindowController.m */; };
-		34DC8A770A7EEEF7003E1636 /* EditStateSheet.nib in Resources */ = {isa = PBXBuildFile; fileRef = 342114B40826D37100A3B0FB /* EditStateSheet.nib */; };
+		34DC8A770A7EEEF7003E1636 /* EditStateSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 342114B40826D37100A3B0FB /* EditStateSheet.xib */; };
 		34DC8A790A7EEEF7003E1636 /* AIAbstractListObjectMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B22E15C085CAE2E001864DE /* AIAbstractListObjectMenu.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		34DC8A7A0A7EEEF7003E1636 /* AIAbstractListObjectMenu.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B22E15D085CAE2F001864DE /* AIAbstractListObjectMenu.m */; };
 		34DC8A7B0A7EEEF7003E1636 /* AIAccountMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = 3449485B08E9FCD60054FF57 /* AIAccountMenu.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -809,7 +747,7 @@
 		34DC8A820A7EEEF7003E1636 /* AIStatusMenu.m in Sources */ = {isa = PBXBuildFile; fileRef = 34AC2EA00934FAE100393D7A /* AIStatusMenu.m */; };
 		34DC8A830A7EEEF7003E1636 /* ESTextAndButtonsWindowController.h in Headers */ = {isa = PBXBuildFile; fileRef = 34E00F7407B92B2E000DF265 /* ESTextAndButtonsWindowController.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		34DC8A840A7EEEF7003E1636 /* ESTextAndButtonsWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34E00F7507B92B2F000DF265 /* ESTextAndButtonsWindowController.m */; };
-		34DC8A850A7EEEF7003E1636 /* TextAndButtonsWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34E00F8607B92B88000DF265 /* TextAndButtonsWindow.nib */; };
+		34DC8A850A7EEEF7003E1636 /* TextAndButtonsWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34E00F8607B92B88000DF265 /* TextAndButtonsWindow.xib */; };
 		34DC8A860A7EEEF7003E1636 /* AIWindowController.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BFC3412058D48A8008F7FA2 /* AIWindowController.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		34DC8A870A7EEEF7003E1636 /* AIWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BFC3413058D48A8008F7FA2 /* AIWindowController.m */; };
 		34DC8A880A7EEEF7003E1636 /* AICorePluginLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 340BA84409EC593A000EC441 /* AICorePluginLoader.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -819,7 +757,7 @@
 		34DC8A8E0A7EEEF7003E1636 /* AISoundSet.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BD548AE086086B5008DF3CB /* AISoundSet.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		34DC8A8F0A7EEEF7003E1636 /* AISoundSet.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BD548AF086086B5008DF3CB /* AISoundSet.m */; };
 		34DC8A900A7EEEF7003E1636 /* AIToolbar.h in Headers */ = {isa = PBXBuildFile; fileRef = 34E6D38E0727354600A2643A /* AIToolbar.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		34DC8A910A7EEEF7003E1636 /* AIToolbar.m in Sources */ = {isa = PBXBuildFile; fileRef = 34E6D38F0727354600A2643A /* AIToolbar.m */; };
+		34DC8A910A7EEEF7003E1636 /* AIToolbar.m in Sources */ = {isa = PBXBuildFile; fileRef = 34E6D38F0727354600A2643A /* AIToolbar.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		34DC8A920A7EEEF7003E1636 /* AIColorPickerSliders.h in Headers */ = {isa = PBXBuildFile; fileRef = 34D369ED08E7544D00E15E40 /* AIColorPickerSliders.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		34DC8A930A7EEEF7003E1636 /* AIColorPickerSliders.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D369EE08E7544D00E15E40 /* AIColorPickerSliders.m */; };
 		34DC8A940A7EEEF7003E1636 /* AIPathUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = DA9CF854080F9784000C5249 /* AIPathUtilities.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -827,7 +765,7 @@
 		34DC8A960A7EEEF7003E1636 /* AISortController.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B422C0905ACB248005E720B /* AISortController.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		34DC8A970A7EEEF7003E1636 /* AISortController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B422C0A05ACB248005E720B /* AISortController.m */; };
 		34DC8A980A7EEEF7003E1636 /* ESObjectWithProperties.h in Headers */ = {isa = PBXBuildFile; fileRef = 34111A5D06BE1B370005AF5C /* ESObjectWithProperties.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		34DC8A990A7EEEF7003E1636 /* ESObjectWithProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = 34111A5E06BE1B370005AF5C /* ESObjectWithProperties.m */; };
+		34DC8A990A7EEEF7003E1636 /* ESObjectWithProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = 34111A5E06BE1B370005AF5C /* ESObjectWithProperties.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		34DC8A9A0A7EEEF7003E1636 /* AIChat.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B82138E049CA6CC00A8010A /* AIChat.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		34DC8A9B0A7EEEF7003E1636 /* AIChat.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B82138F049CA6CC00A8010A /* AIChat.m */; };
 		34DC8A9C0A7EEEF7003E1636 /* AIListObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BF5BA14042F3CB200A8010A /* AIListObject.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -844,8 +782,8 @@
 		34DC8AA70A7EEEF7003E1636 /* ESContactAlertsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B7033D076EDB370016E8BA /* ESContactAlertsViewController.m */; };
 		34DC8AA80A7EEEF7003E1636 /* CSNewContactAlertWindowController.h in Headers */ = {isa = PBXBuildFile; fileRef = 34B70340076EDB370016E8BA /* CSNewContactAlertWindowController.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		34DC8AA90A7EEEF7003E1636 /* CSNewContactAlertWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B7033F076EDB370016E8BA /* CSNewContactAlertWindowController.m */; };
-		34DC8AAA0A7EEEF7003E1636 /* NewAlert.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34B70341076EDB370016E8BA /* NewAlert.nib */; };
-		34DC8AAB0A7EEEF7003E1636 /* NewAlertNoEvents.nib in Resources */ = {isa = PBXBuildFile; fileRef = 4BFE2E9F07E61A4E00C07EBE /* NewAlertNoEvents.nib */; };
+		34DC8AAA0A7EEEF7003E1636 /* NewAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34B70341076EDB370016E8BA /* NewAlert.xib */; };
+		34DC8AAB0A7EEEF7003E1636 /* NewAlertNoEvents.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4BFE2E9F07E61A4E00C07EBE /* NewAlertNoEvents.xib */; };
 		34DC8AAC0A7EEEF7003E1636 /* AIAbstractListController.h in Headers */ = {isa = PBXBuildFile; fileRef = 340F440306D8202A0072E2FA /* AIAbstractListController.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		34DC8AAD0A7EEEF7003E1636 /* AIAbstractListController.m in Sources */ = {isa = PBXBuildFile; fileRef = 340F440406D8202A0072E2FA /* AIAbstractListController.m */; };
 		34DC8AAE0A7EEEF7003E1636 /* AIListOutlineView.h in Headers */ = {isa = PBXBuildFile; fileRef = 34A48AD206F647FD002C7C5F /* AIListOutlineView.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -891,13 +829,12 @@
 		34DC8AD60A7EEEF7003E1636 /* DCJoinChatViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E4D960706B73979005235E9 /* DCJoinChatViewController.m */; };
 		34DC8AD70A7EEEF7003E1636 /* DCJoinChatWindowController.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E4D960806B7397A005235E9 /* DCJoinChatWindowController.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		34DC8AD80A7EEEF7003E1636 /* DCJoinChatWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E4D960906B7397A005235E9 /* DCJoinChatWindowController.m */; };
-		34DC8AD90A7EEEF7003E1636 /* JoinChatWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = 6E4D960A06B7397A005235E9 /* JoinChatWindow.nib */; };
+		34DC8AD90A7EEEF7003E1636 /* JoinChatWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6E4D960A06B7397A005235E9 /* JoinChatWindow.xib */; };
 		34DC8ADA0A7EEEF7003E1636 /* AIAccountPlusFieldPromptController.h in Headers */ = {isa = PBXBuildFile; fileRef = 34E829820766B0FE00EFB3BC /* AIAccountPlusFieldPromptController.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		34DC8ADB0A7EEEF7003E1636 /* AIAccountPlusFieldPromptController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34E829830766B0FE00EFB3BC /* AIAccountPlusFieldPromptController.m */; };
 		34DC8ADC0A7EEEF7003E1636 /* AIContextMenuTextView.h in Headers */ = {isa = PBXBuildFile; fileRef = 7E1E8176063A3EEC00EB00F7 /* AIContextMenuTextView.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		34DC8ADD0A7EEEF7003E1636 /* AIContextMenuTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E1E8177063A3EEC00EB00F7 /* AIContextMenuTextView.m */; };
 		34DC8AE00A7EEEF7003E1636 /* AIMessageEntryTextView.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B5827E80613CE9D0004BD25 /* AIMessageEntryTextView.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		34DC8AE10A7EEEF7003E1636 /* AIMessageEntryTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B5827E90613CE9D0004BD25 /* AIMessageEntryTextView.m */; };
 		34DC8AE40A7EEEF7003E1636 /* stackImage.png in Resources */ = {isa = PBXBuildFile; fileRef = 349DDD5206406A7D00542726 /* stackImage.png */; };
 		34DC8AE50A7EEEF7003E1636 /* AILocalizationAssistance.h in Headers */ = {isa = PBXBuildFile; fileRef = 34D189B1076131850075A380 /* AILocalizationAssistance.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		34DC8AE70A7EEEF7003E1636 /* AILocalizationButtonCell.h in Headers */ = {isa = PBXBuildFile; fileRef = 078C5CD0079EFF87004C75A4 /* AILocalizationButtonCell.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -937,7 +874,7 @@
 		34E036750A75AA4F00394F11 /* CBPurpleOscarAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 9EA125E8055B630900ECF349 /* CBPurpleOscarAccount.m */; };
 		34E036760A75AA4F00394F11 /* DCPurpleOscarJoinChatViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E4D961606B73A96005235E9 /* DCPurpleOscarJoinChatViewController.h */; };
 		34E036770A75AA4F00394F11 /* DCPurpleOscarJoinChatViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E4D961706B73A96005235E9 /* DCPurpleOscarJoinChatViewController.m */; };
-		34E036780A75AA4F00394F11 /* DCPurpleOscarJoinChatView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB40C08086D9100E27095 /* DCPurpleOscarJoinChatView.nib */; };
+		34E036780A75AA4F00394F11 /* DCPurpleOscarJoinChatView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB40C08086D9100E27095 /* DCPurpleOscarJoinChatView.xib */; };
 		34E036790A75AA4F00394F11 /* AIPurpleAIMAccountViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 34B9194B062DEC29004F1223 /* AIPurpleAIMAccountViewController.h */; };
 		34E0367A0A75AA4F00394F11 /* AIPurpleAIMAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B9194A062DEC29004F1223 /* AIPurpleAIMAccountViewController.m */; };
 		34E036880A75AA4F00394F11 /* ESICQService.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BAFD5A506E00AD200FF7FBC /* ESICQService.h */; };
@@ -946,9 +883,9 @@
 		34E0368B0A75AA4F00394F11 /* ESPurpleICQAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 34F52BD906E2B24200887BE2 /* ESPurpleICQAccount.m */; };
 		34E0368C0A75AA4F00394F11 /* ESPurpleICQAccountViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 34F52BCF06E2AFF700887BE2 /* ESPurpleICQAccountViewController.h */; };
 		34E0368D0A75AA4F00394F11 /* ESPurpleICQAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34F52BD006E2AFF700887BE2 /* ESPurpleICQAccountViewController.m */; };
-		34E0368E0A75AA4F00394F11 /* ESPurpleICQAccountView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB41A08086D9100E27095 /* ESPurpleICQAccountView.nib */; };
+		34E0368E0A75AA4F00394F11 /* ESPurpleICQAccountView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB41A08086D9100E27095 /* ESPurpleICQAccountView.xib */; };
 		34E0368F0A75AA4F00394F11 /* PurpleDefaultsICQ.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4B7644DC07A05E7E0021CCD7 /* PurpleDefaultsICQ.plist */; };
-		34E0EA0807CC53ED00A82198 /* NewMessagePrompt.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34E0EA0707CC53EC00A82198 /* NewMessagePrompt.nib */; };
+		34E0EA0807CC53ED00A82198 /* NewMessagePrompt.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34E0EA0707CC53EC00A82198 /* NewMessagePrompt.xib */; };
 		34E0EA0F07CC53FE00A82198 /* AINewMessagePanelPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34E0EA0B07CC53FE00A82198 /* AINewMessagePanelPlugin.m */; };
 		34E0EA1007CC53FE00A82198 /* AINewMessagePromptController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34E0EA0C07CC53FE00A82198 /* AINewMessagePromptController.m */; };
 		34E2A0BC07AF5924006735BC /* ESAccountNetworkConnectivityPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34E2A0BA07AF5924006735BC /* ESAccountNetworkConnectivityPlugin.m */; };
@@ -959,7 +896,7 @@
 		34E4CD580E68277D00D1B0DC /* ESIRCService.h in Headers */ = {isa = PBXBuildFile; fileRef = 34E4CD4E0E68277D00D1B0DC /* ESIRCService.h */; };
 		34E4CD590E68277D00D1B0DC /* ESIRCJoinChatViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34E4CD4F0E68277D00D1B0DC /* ESIRCJoinChatViewController.m */; };
 		34E4CD5A0E68277D00D1B0DC /* ESIRCJoinChatViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 34E4CD500E68277D00D1B0DC /* ESIRCJoinChatViewController.h */; };
-		34E4CD5B0E68277D00D1B0DC /* ESIRCJoinChatView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34E4CD510E68277D00D1B0DC /* ESIRCJoinChatView.nib */; };
+		34E4CD5B0E68277D00D1B0DC /* ESIRCJoinChatView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34E4CD510E68277D00D1B0DC /* ESIRCJoinChatView.xib */; };
 		34E4CD5C0E68277D00D1B0DC /* ESIRCAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34E4CD520E68277D00D1B0DC /* ESIRCAccountViewController.m */; };
 		34E4CD5D0E68277D00D1B0DC /* ESIRCAccountViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 34E4CD530E68277D00D1B0DC /* ESIRCAccountViewController.h */; };
 		34E4CD5F0E68277D00D1B0DC /* ESIRCAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 34E4CD550E68277D00D1B0DC /* ESIRCAccount.m */; };
@@ -982,13 +919,11 @@
 		34F144430BA8FF3C000473DE /* EmoticonNames.strings in Resources */ = {isa = PBXBuildFile; fileRef = 34F144420BA8FF3B000473DE /* EmoticonNames.strings */; };
 		34F17FCE0F8EAC34009C5A39 /* AIListOutlineView+Drawing.h in Headers */ = {isa = PBXBuildFile; fileRef = 34F17FCC0F8EAC34009C5A39 /* AIListOutlineView+Drawing.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		34F17FCF0F8EAC34009C5A39 /* AIListOutlineView+Drawing.m in Sources */ = {isa = PBXBuildFile; fileRef = 34F17FCD0F8EAC34009C5A39 /* AIListOutlineView+Drawing.m */; };
-		34F312930ADC3FE800A4310E /* KNShelfSplitView.h in Headers */ = {isa = PBXBuildFile; fileRef = 348B25C70A50FBF300B2B972 /* KNShelfSplitView.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		34F312BD0ADC43CA00A4310E /* xtras_duck.png in Resources */ = {isa = PBXBuildFile; fileRef = 34F312BC0ADC43CA00A4310E /* xtras_duck.png */; };
-		34F312F00ADC476300A4310E /* KNShelfSplitView.m in Sources */ = {isa = PBXBuildFile; fileRef = 348B25C60A50FBF300B2B972 /* KNShelfSplitView.m */; };
 		34F4677A080F49C5007800AB /* Safari.scpt in Resources */ = {isa = PBXBuildFile; fileRef = 34F46778080F49C5007800AB /* Safari.scpt */; };
 		34F4677B080F49C5007800AB /* Safari.png in Resources */ = {isa = PBXBuildFile; fileRef = 34F46779080F49C5007800AB /* Safari.png */; };
 		34F46785080F7FFB007800AB /* ESSafariLinkToolbarItemPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34F46783080F7FFB007800AB /* ESSafariLinkToolbarItemPlugin.m */; };
-		34F849530A4AEFA00002A017 /* LogFileUpgrade.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34F849520A4AEFA00002A017 /* LogFileUpgrade.nib */; };
+		34F849530A4AEFA00002A017 /* LogFileUpgrade.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34F849520A4AEFA00002A017 /* LogFileUpgrade.xib */; };
 		34F849590A4AF04D0002A017 /* AILogFileUpgradeWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34F849570A4AF04D0002A017 /* AILogFileUpgradeWindowController.m */; };
 		34F8D2AE0CF68FEB00F62536 /* AIUserListOutlineView.m in Sources */ = {isa = PBXBuildFile; fileRef = 34F8D2AD0CF68FEB00F62536 /* AIUserListOutlineView.m */; };
 		34FF12120DA52FB10054A872 /* AIPurpleGTalkJoinChatViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 34FF12100DA52FB10054A872 /* AIPurpleGTalkJoinChatViewController.h */; };
@@ -1012,13 +947,13 @@
 		4BAE6C1A07CF9374007E2820 /* ESAnnouncerSpeakTextAlertDetailPane.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BAE6C1207CF9374007E2820 /* ESAnnouncerSpeakTextAlertDetailPane.m */; };
 		4BAE6C1F07CF9389007E2820 /* events-announcer-alert.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 4BAE6C1B07CF9389007E2820 /* events-announcer-alert.tiff */; };
 		4BAE6C2007CF9389007E2820 /* AnnouncerDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4BAE6C1C07CF9389007E2820 /* AnnouncerDefaults.plist */; };
-		4BAE6C2107CF9389007E2820 /* AnnouncerSpeakEventContactAlert.nib in Resources */ = {isa = PBXBuildFile; fileRef = 4BAE6C1D07CF9389007E2820 /* AnnouncerSpeakEventContactAlert.nib */; };
-		4BAE6C2207CF9389007E2820 /* AnnouncerSpeakTextContactAlert.nib in Resources */ = {isa = PBXBuildFile; fileRef = 4BAE6C1E07CF9389007E2820 /* AnnouncerSpeakTextContactAlert.nib */; };
+		4BAE6C2107CF9389007E2820 /* AnnouncerSpeakEventContactAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4BAE6C1D07CF9389007E2820 /* AnnouncerSpeakEventContactAlert.xib */; };
+		4BAE6C2207CF9389007E2820 /* AnnouncerSpeakTextContactAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4BAE6C1E07CF9389007E2820 /* AnnouncerSpeakTextContactAlert.xib */; };
 		4BAE6C3607CF93CB007E2820 /* AIContactStatusEventsPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BAE6C3407CF93CB007E2820 /* AIContactStatusEventsPlugin.m */; };
 		4BAE6C4707CF9411007E2820 /* AIDockBehaviorPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BAE6C4307CF9410007E2820 /* AIDockBehaviorPlugin.m */; };
 		4BAE6C4907CF9411007E2820 /* ESDockAlertDetailPane.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BAE6C4507CF9410007E2820 /* ESDockAlertDetailPane.m */; };
 		4BAE6C4C07CF941C007E2820 /* events-dock-alert.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 4BAE6C4A07CF941C007E2820 /* events-dock-alert.tiff */; };
-		4BAE6C4D07CF941C007E2820 /* DockBehaviorContactAlert.nib in Resources */ = {isa = PBXBuildFile; fileRef = 4BAE6C4B07CF941C007E2820 /* DockBehaviorContactAlert.nib */; };
+		4BAE6C4D07CF941C007E2820 /* DockBehaviorContactAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4BAE6C4B07CF941C007E2820 /* DockBehaviorContactAlert.xib */; };
 		4BAE6C8E07CF94BA007E2820 /* AIStandardToolbarItemsPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BAE6C8807CF94BA007E2820 /* AIStandardToolbarItemsPlugin.m */; };
 		4BAE6C9007CF94BA007E2820 /* AIStatusChangedMessagesPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BAE6C8A07CF94BA007E2820 /* AIStatusChangedMessagesPlugin.m */; };
 		4BAE6C9207CF94BA007E2820 /* AITabStatusIconsPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BAE6C8C07CF94BA007E2820 /* AITabStatusIconsPlugin.m */; };
@@ -1026,15 +961,11 @@
 		4BAE6D3D07CFA0BC007E2820 /* AIAppearancePreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BAE6D3B07CFA0BC007E2820 /* AIAppearancePreferences.m */; };
 		4BAE6D4307CFA0CB007E2820 /* AIAppearancePreferencesPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BAE6D4107CFA0CB007E2820 /* AIAppearancePreferencesPlugin.m */; };
 		4BB1E493067F2EAC00D1DB86 /* Scripts in Copy Built-in Xtras */ = {isa = PBXBuildFile; fileRef = 4BB1E47D067F2E9F00D1DB86 /* Scripts */; };
-		4BB2EB220D88D76100CA7A7D /* timestamp32.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 4BB2EB200D88D76100CA7A7D /* timestamp32.tiff */; };
-		4BB2EB230D88D76100CA7A7D /* timestamp32_transparent.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 4BB2EB210D88D76100CA7A7D /* timestamp32_transparent.tiff */; };
 		4BB5B78207D2DC4900CFE06F /* pref-status.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 4BB5B78107D2DC4900CFE06F /* pref-status.tiff */; };
 		4BB9972B083D1A5F006ACD6F /* SMContactListShowBehaviorPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BB99727083D1A5F006ACD6F /* SMContactListShowBehaviorPlugin.m */; };
 		4BB9972D083D1A5F006ACD6F /* SMContactListShowDetailsPane.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BB99729083D1A5F006ACD6F /* SMContactListShowDetailsPane.m */; };
-		4BB9972F083D1A74006ACD6F /* ContactListShowBehavior.nib in Resources */ = {isa = PBXBuildFile; fileRef = 4BB9972E083D1A74006ACD6F /* ContactListShowBehavior.nib */; };
-		4BCAB5F307B59967006641B9 /* EditAccountSheet.nib in Resources */ = {isa = PBXBuildFile; fileRef = 4BCAB5F007B59967006641B9 /* EditAccountSheet.nib */; };
-		4BCAC4CF07B59AFE006641B9 /* AddressBookPrefs.nib in Resources */ = {isa = PBXBuildFile; fileRef = 4BCAC4CE07B59AFE006641B9 /* AddressBookPrefs.nib */; };
-		4BCAC4D907B59B2E006641B9 /* AddressBook.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 4BCAC4D807B59B2E006641B9 /* AddressBook.tiff */; };
+		4BB9972F083D1A74006ACD6F /* ContactListShowBehavior.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4BB9972E083D1A74006ACD6F /* ContactListShowBehavior.xib */; };
+		4BCAB5F307B59967006641B9 /* EditAccountSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4BCAB5F007B59967006641B9 /* EditAccountSheet.xib */; };
 		4BCAC4E607B59B65006641B9 /* Alias Defaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4BCAC4E307B59B65006641B9 /* Alias Defaults.plist */; };
 		4BCAC4E707B59B65006641B9 /* Display Format Defaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4BCAC4E407B59B65006641B9 /* Display Format Defaults.plist */; };
 		4BCAC56D07B5A31A006641B9 /* Sounds in Resources */ = {isa = PBXBuildFile; fileRef = 4BCAC56C07B5A31A006641B9 /* Sounds */; };
@@ -1042,30 +973,29 @@
 		4BD673B706001C5F0049CAF7 /* AIContactStatusColoringPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B31E8C104C46A9100A8010A /* AIContactStatusColoringPlugin.m */; };
 		4BD6741C06001CEF0049CAF7 /* AIMessageAliasPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = F11B9622051CDB3B0000000E /* AIMessageAliasPlugin.m */; };
 		4BD6742E06001D1D0049CAF7 /* AIEmoticonPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = F5F0FE9D04B12CAC01A80106 /* AIEmoticonPreferences.m */; };
-		4BD6742F06001D1D0049CAF7 /* EmoticonPrefs.nib in Resources */ = {isa = PBXBuildFile; fileRef = F5F0FEA004B1336C01A80106 /* EmoticonPrefs.nib */; };
+		4BD6742F06001D1D0049CAF7 /* EmoticonPrefs.xib in Resources */ = {isa = PBXBuildFile; fileRef = F5F0FEA004B1336C01A80106 /* EmoticonPrefs.xib */; };
 		4BD6743106001D1E0049CAF7 /* EmoticonDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = F5F0FEA204B133AB01A80106 /* EmoticonDefaults.plist */; };
 		4BD6745E06001D740049CAF7 /* ESOpenMessageWindowContactAlertPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 344AB2C40579136900384CEE /* ESOpenMessageWindowContactAlertPlugin.m */; };
 		4BD6746306001D760049CAF7 /* ESSendMessageContactAlertPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 342DC5BF05783DE7000E1D83 /* ESSendMessageContactAlertPlugin.m */; };
-		4BD6746606001D770049CAF7 /* SendMessageContactAlert.nib in Resources */ = {isa = PBXBuildFile; fileRef = 342DC7FE05784463000E1D83 /* SendMessageContactAlert.nib */; };
+		4BD6746606001D770049CAF7 /* SendMessageContactAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = 342DC7FE05784463000E1D83 /* SendMessageContactAlert.xib */; };
 		4BD6753006001E0D0049CAF7 /* AIDualWindowInterfacePlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = F5793980033E756E01A8010A /* AIDualWindowInterfacePlugin.m */; };
 		4BD6753606001E0F0049CAF7 /* AIMessageTabViewItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BACB70203C8CB5E00A8010A /* AIMessageTabViewItem.m */; };
 		4BD6753806001E100049CAF7 /* AIMessageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F570A5CE03704D3D01A8010A /* AIMessageViewController.m */; };
 		4BD6753A06001E110049CAF7 /* AIMessageWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = F5793982033E756E01A8010A /* AIMessageWindowController.m */; };
-		4BD6753E06001E140049CAF7 /* AIAccountSelectionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B25494703F6A32700A8010A /* AIAccountSelectionView.m */; };
-		4BD6755006001E1D0049CAF7 /* ESDualWindowMessageAdvancedPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B970BF90535B864002F28F9 /* ESDualWindowMessageAdvancedPreferences.m */; };
+		4BD6753E06001E140049CAF7 /* AITopBarGradientView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B25494703F6A32700A8010A /* AITopBarGradientView.m */; };
 		4BD6755406001E1E0049CAF7 /* DualWindowDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D43504051ADC10003B2F21 /* DualWindowDefaults.plist */; };
 		4BD6756B06001E320049CAF7 /* EventSoundDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4BA5325D050FC5E800A8010A /* EventSoundDefaults.plist */; };
 		4BD6758206001E430049CAF7 /* ErrorMessageHandlerPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 40AC0EEC03B5BF1000A80202 /* ErrorMessageHandlerPlugin.m */; };
 		4BD6758406001E440049CAF7 /* ErrorMessageWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 40AC0F1003B5C29E00A80202 /* ErrorMessageWindowController.m */; };
-		4BD6758506001E450049CAF7 /* ErrorWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = 40AC0F1303B5C34800A80202 /* ErrorWindow.nib */; };
-		4BD6758806001E460049CAF7 /* AlertMessageContactAlert.nib in Resources */ = {isa = PBXBuildFile; fileRef = 3439FD8C05794B4500B2E449 /* AlertMessageContactAlert.nib */; };
+		4BD6758506001E450049CAF7 /* ErrorWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 40AC0F1303B5C34800A80202 /* ErrorWindow.xib */; };
+		4BD6758806001E460049CAF7 /* AlertMessageContactAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3439FD8C05794B4500B2E449 /* AlertMessageContactAlert.xib */; };
 		4BDAF69907A1561000276D68 /* AIAccountProxySettings.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BDAF69607A1561000276D68 /* AIAccountProxySettings.m */; };
 		4BE6175807AC67EE0049C87D /* AIAutoReplyPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BE6174E07AC67ED0049C87D /* AIAutoReplyPlugin.m */; };
 		4BE6175E07AC67EE0049C87D /* AIStateMenuPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BE6175407AC67EE0049C87D /* AIStateMenuPlugin.m */; };
 		4BE9FFE8055981AB00359B15 /* Adium.pch in Resources */ = {isa = PBXBuildFile; fileRef = 4BE9FFE7055981AB00359B15 /* Adium.pch */; };
 		4BF2EA3F067CB7A200743318 /* Emoticons in Copy Built-in Xtras */ = {isa = PBXBuildFile; fileRef = 4BF2E194067CAE9200743318 /* Emoticons */; };
 		4BF2EA40067CB7A200743318 /* Message Styles in Copy Built-in Xtras */ = {isa = PBXBuildFile; fileRef = 4BF2E6B3067CB70E00743318 /* Message Styles */; };
-		4BF3CB4207D1771E00A8112A /* pref-appearance.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 4BF3CB4107D1771E00A8112A /* pref-appearance.tiff */; };
+		4BF3CB4207D1771E00A8112A /* pref-icons.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 4BF3CB4107D1771E00A8112A /* pref-icons.tiff */; };
 		4BF3CBED07D192F500A8112A /* pref-accounts.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 4BF3CBEC07D192F500A8112A /* pref-accounts.tiff */; };
 		4BF98DCD06D149EE00E8781D /* ContactStatusColoringDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4B31E8C404C46A9100A8010A /* ContactStatusColoringDefaults.plist */; };
 		4BFC2E7907E357F00063D70C /* emoticonBlank.png in Resources */ = {isa = PBXBuildFile; fileRef = 4BFC2E7807E357F00063D70C /* emoticonBlank.png */; };
@@ -1075,38 +1005,66 @@
 		4F1CB62E0D640D770073A1E6 /* AIAdvancedInspectorPane.m in Sources */ = {isa = PBXBuildFile; fileRef = 4F1CB62B0D640D770073A1E6 /* AIAdvancedInspectorPane.m */; };
 		4F1CB62F0D640D770073A1E6 /* AIAddressBookInspectorPane.m in Sources */ = {isa = PBXBuildFile; fileRef = 4F1CB62C0D640D770073A1E6 /* AIAddressBookInspectorPane.m */; };
 		4F1CB6320D640D7F0073A1E6 /* AIEventsInspectorPane.m in Sources */ = {isa = PBXBuildFile; fileRef = 4F1CB6310D640D7F0073A1E6 /* AIEventsInspectorPane.m */; };
-		4F1CB6390D640D900073A1E6 /* AIEventsInspectorPane.nib in Resources */ = {isa = PBXBuildFile; fileRef = 4F1CB6350D640D8F0073A1E6 /* AIEventsInspectorPane.nib */; };
-		4F1CB63A0D640D900073A1E6 /* AIInfoInspectorPane.nib in Resources */ = {isa = PBXBuildFile; fileRef = 4F1CB6360D640D900073A1E6 /* AIInfoInspectorPane.nib */; };
-		4F1CB63F0D640DA40073A1E6 /* get-info-address-book.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 4F1CB63B0D640DA40073A1E6 /* get-info-address-book.tiff */; };
+		4F1CB6390D640D900073A1E6 /* AIEventsInspectorPane.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4F1CB6350D640D8F0073A1E6 /* AIEventsInspectorPane.xib */; };
+		4F1CB63A0D640D900073A1E6 /* AIInfoInspectorPane.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4F1CB6360D640D900073A1E6 /* AIInfoInspectorPane.xib */; };
 		4F1CB6400D640DA40073A1E6 /* get-info-advanced.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 4F1CB63C0D640DA40073A1E6 /* get-info-advanced.tiff */; };
 		4F1CB6410D640DA40073A1E6 /* get-info-events.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 4F1CB63D0D640DA40073A1E6 /* get-info-events.tiff */; };
-		4F1CB64C0D640F4F0073A1E6 /* ContactInfoInspector.nib in Resources */ = {isa = PBXBuildFile; fileRef = 4F1CB64B0D640F4F0073A1E6 /* ContactInfoInspector.nib */; };
+		4F1CB64C0D640F4F0073A1E6 /* ContactInfoInspector.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4F1CB64B0D640F4F0073A1E6 /* ContactInfoInspector.xib */; };
+		5A0BBC4317400544002A7BE0 /* emoticons_menu at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5A0BBC4217400544002A7BE0 /* emoticons_menu at 2x.png */; };
 		5A0D236A16F4C7BC005DF211 /* STTwitterAppOnly.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A0D236816F4C7BC005DF211 /* STTwitterAppOnly.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		5A1781860EC1215D00BA1E04 /* AIAutoScrollTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A1781850EC1215D00BA1E04 /* AIAutoScrollTextView.m */; };
 		5A17D65D130F76B4002C852F /* AIGradientView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A17D65C130F76B4002C852F /* AIGradientView.m */; };
-		5A22D6E214834F44004E15F7 /* AIFacebookXMPPAccountView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 5A22D6E014834F44004E15F7 /* AIFacebookXMPPAccountView.nib */; };
+		5A1E3A1214DCE60400724574 /* Preferences-Xtras.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5A1E3A1114DCE60400724574 /* Preferences-Xtras.xib */; };
+		5A22D6E214834F44004E15F7 /* AIFacebookXMPPAccountView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5A22D6E014834F44004E15F7 /* AIFacebookXMPPAccountView.xib */; };
+		5A27FA7E14A272330063489D /* pref-messagestyle.png in Resources */ = {isa = PBXBuildFile; fileRef = 5A27FA7A14A272330063489D /* pref-messagestyle.png */; };
 		5A3B4D7916D878AC00903E40 /* NSString+STTwitter.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A3B4D6C16D878AB00903E40 /* NSString+STTwitter.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		5A3B4D7A16D878AC00903E40 /* STTwitterAPIWrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A3B4D6E16D878AB00903E40 /* STTwitterAPIWrapper.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		5A3B4D7C16D878AC00903E40 /* STTwitterOAuth.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A3B4D7216D878AB00903E40 /* STTwitterOAuth.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		5A3B4D7E16D878AC00903E40 /* STHTTPRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A3B4D7816D878AC00903E40 /* STHTTPRequest.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		5A4B77E916FBDDC700DF398C /* NSData+Base64.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A4B77E716FBDDC600DF398C /* NSData+Base64.m */; };
+		5A44595E169143130078AB0A /* AIPreferenceCVPrototypeView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A445957169118C60078AB0A /* AIPreferenceCVPrototypeView.m */; };
+		5A4BD41D13F855B000A4D3F7 /* SearchTerms.plist in Resources */ = {isa = PBXBuildFile; fileRef = 5A4BD41B13F855B000A4D3F7 /* SearchTerms.plist */; };
+		5A4BD41E13F8568100A4D3F7 /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5ACF27331392C585004B6AEF /* Preferences.xib */; };
+		5A4BD43313F856E300A4D3F7 /* Preferences-AddressBookIntegration.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5AC7F26313B42952002D7265 /* Preferences-AddressBookIntegration.xib */; };
+		5A4BD44813F8575900A4D3F7 /* Preferences-Encryption.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5AC7F26513B42A55002D7265 /* Preferences-Encryption.xib */; };
+		5A4BD45D13F857DE00A4D3F7 /* Preferences-MessageAlerts.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5AC7F26713B43612002D7265 /* Preferences-MessageAlerts.xib */; };
+		5A4BD47313F858EE00A4D3F7 /* Preferences-ContactList.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5A4BD47213F858EE00A4D3F7 /* Preferences-ContactList.xib */; };
+		5A4BD48913F859EF00A4D3F7 /* Preferences-WindowHandling.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5A4BD48813F859EF00A4D3F7 /* Preferences-WindowHandling.xib */; };
+		5A4BD48C13F85A9800A4D3F7 /* AIWindowHandlingPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A4BD48B13F85A9800A4D3F7 /* AIWindowHandlingPreferences.m */; };
+		5A4BD52513F8653D00A4D3F7 /* ESContactListAdvancedPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A4BD52413F8653D00A4D3F7 /* ESContactListAdvancedPreferences.m */; };
+		5A4BD53B13F865AD00A4D3F7 /* Preferences-Status.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5A4BD53A13F865AD00A4D3F7 /* Preferences-Status.xib */; };
+		5A4BD55113F86A5000A4D3F7 /* Preferences-Messages.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5A4BD55013F86A5000A4D3F7 /* Preferences-Messages.xib */; };
+		5A4BD55413F86A6200A4D3F7 /* AIMessagePreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A4BD55313F86A6200A4D3F7 /* AIMessagePreferences.m */; };
+		5A4BD56A13F86B7E00A4D3F7 /* Preferences-Icons.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5A4BD56913F86B7E00A4D3F7 /* Preferences-Icons.xib */; };
+		5A4BD57F13F86BC500A4D3F7 /* Preferences-General.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5A675E8D13C00AEA006192C5 /* Preferences-General.xib */; };
+		5A5EC831154649140043FFAA /* AIPreferenceCollectionItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A5EC830154649140043FFAA /* AIPreferenceCollectionItem.m */; };
 		5A5F601D12962EC0007A2232 /* AISegmentedControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A5F601A12962D06007A2232 /* AISegmentedControl.m */; };
 		5A5F601E12962ECE007A2232 /* AISegmentedControl.h in Headers */ = {isa = PBXBuildFile; fileRef = 5A5F601912962D06007A2232 /* AISegmentedControl.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		5A5F8BBD12D560E400019727 /* AIDockNameOverlay.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A5F8BBC12D560E400019727 /* AIDockNameOverlay.m */; };
+		5A6298DF1682BD9100F51DED /* AIAdvancedPreferencePane.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A1E24A815BC746B003A6F9E /* AIAdvancedPreferencePane.m */; };
+		5A6298E31682BD9D00F51DED /* AIAdvancedPreferencePane.h in Headers */ = {isa = PBXBuildFile; fileRef = 5A1E24A715BC746B003A6F9E /* AIAdvancedPreferencePane.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		5A799674133C3D6F0005AC6A /* MessageView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5A1FEA601334549300C14951 /* MessageView.xib */; };
-		5A804FEA12BE9E84007CDC1B /* scandate.m in Sources */ = {isa = PBXBuildFile; fileRef = 31DDDA6F12BDD5CE0048F6C0 /* scandate.m */; };
-		5A80508512BE9F00007CDC1B /* scandate.m in Sources */ = {isa = PBXBuildFile; fileRef = 31DDDA6F12BDD5CE0048F6C0 /* scandate.m */; };
+		5A8F637614DD1B21008412C8 /* Preferences-Privacy.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5A8F637514DD1B21008412C8 /* Preferences-Privacy.xib */; };
+		5A914166175BD960002139D5 /* ISO8601DateFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A914164175BD960002139D5 /* ISO8601DateFormatter.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+		5A914167175BD960002139D5 /* ISO8601DateFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = 5A914165175BD960002139D5 /* ISO8601DateFormatter.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		5A914168175BD97F002139D5 /* ISO8601DateFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A914164175BD960002139D5 /* ISO8601DateFormatter.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		5A94397B1279ECB800FDD81D /* AIImgurImageUploader.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A94397A1279ECB800FDD81D /* AIImgurImageUploader.m */; };
 		5A9A9F8911F2951400328DF9 /* AIDoNothingContactAlertPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A9A9F8811F2951400328DF9 /* AIDoNothingContactAlertPlugin.m */; };
 		5A9A9F8B11F295EB00328DF9 /* events-do-nothing.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 5A9A9F8A11F295EB00328DF9 /* events-do-nothing.tiff */; };
 		5AA2A0EE14B3EFF500B4DB65 /* AIOSCompatibility.h in Headers */ = {isa = PBXBuildFile; fileRef = 5AA2A0ED14B3EFF500B4DB65 /* AIOSCompatibility.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		5ACA086A17873AEA00B15047 /* AIButtonWithCursor.h in Headers */ = {isa = PBXBuildFile; fileRef = 5ACA086817873AEA00B15047 /* AIButtonWithCursor.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		5ACA086B17873AEA00B15047 /* AIButtonWithCursor.m in Sources */ = {isa = PBXBuildFile; fileRef = 5ACA086917873AEA00B15047 /* AIButtonWithCursor.m */; };
+		5ACF27391392C74A004B6AEF /* AIHighlightingTextField.h in Headers */ = {isa = PBXBuildFile; fileRef = 5ACF27351392C74A004B6AEF /* AIHighlightingTextField.h */; };
+		5ACF273A1392C74A004B6AEF /* AIHighlightingTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 5ACF27361392C74A004B6AEF /* AIHighlightingTextField.m */; };
+		5ACF273B1392C74A004B6AEF /* AIPreferenceCollectionView.h in Headers */ = {isa = PBXBuildFile; fileRef = 5ACF27371392C74A004B6AEF /* AIPreferenceCollectionView.h */; };
+		5ACF273C1392C74A004B6AEF /* AIPreferenceCollectionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5ACF27381392C74A004B6AEF /* AIPreferenceCollectionView.m */; };
 		5AC423F3178CBD5100F5911A /* ChatCyclingDefaults-Old.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D7F1E815F85DD300F32F9B /* ChatCyclingDefaults-Old.plist */; };
 		5AC423F7178CBD5700F5911A /* ChatCyclingDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D7F1E915F85DD300F32F9B /* ChatCyclingDefaults.plist */; };
 		5ADFFE5D133846C300069C1B /* keys.png in Resources */ = {isa = PBXBuildFile; fileRef = 5ADFFE5C133846C300069C1B /* keys.png */; };
+		5AEE60011602BAE200304672 /* AIBoolToControlTextColorTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 979AA6A614D59DC8008730DF /* AIBoolToControlTextColorTransformer.m */; };
 		6311F4710E340DD2004234B8 /* AISharedAdium.h in Headers */ = {isa = PBXBuildFile; fileRef = 6311F46F0E340DD2004234B8 /* AISharedAdium.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		6311F4720E340DD2004234B8 /* AISharedAdium.m in Sources */ = {isa = PBXBuildFile; fileRef = 6311F4700E340DD2004234B8 /* AISharedAdium.m */; };
 		6318DBA10F8D93F200C5E584 /* WebKit Defaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 347065E406015DC5004F0D20 /* WebKit Defaults.plist */; };
-		6318DBA20F8D93F200C5E584 /* WebKitPreferencesView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 348EE1B3080A57480015E0FC /* WebKitPreferencesView.nib */; };
+		6318DBA20F8D93F200C5E584 /* WebKitPreferencesView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 348EE1B3080A57480015E0FC /* WebKitPreferencesView.xib */; };
 		6318DBA30F8D93F200C5E584 /* Preview.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34C2DBE5063449AF0018E5D2 /* Preview.plist */; };
 		6318DBA40F8D93F200C5E584 /* SoulEdge.png in Resources */ = {isa = PBXBuildFile; fileRef = 34C2DF00063498ED0018E5D2 /* SoulEdge.png */; };
 		6318DBA50F8D93F200C5E584 /* terminator.png in Resources */ = {isa = PBXBuildFile; fileRef = 34C2DF01063498ED0018E5D2 /* terminator.png */; };
@@ -1128,16 +1086,15 @@
 		6329EF080F9D335800112489 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6329EF070F9D335800112489 /* CoreServices.framework */; };
 		632ADC150E9EDDCA00AB6817 /* SGKeyCodeTranslator.m in Sources */ = {isa = PBXBuildFile; fileRef = 632ADC130E9EDDCA00AB6817 /* SGKeyCodeTranslator.m */; };
 		632D60C1094B81AB003A9786 /* AIDockIconPreviewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 632D60BF094B81AB003A9786 /* AIDockIconPreviewController.m */; };
-		632D801708E7E0A40032C187 /* XtrasManager.nib in Resources */ = {isa = PBXBuildFile; fileRef = 632D801608E7E0A40032C187 /* XtrasManager.nib */; };
 		632D859E0DB70FC800040EC7 /* AIMentionEventPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 632D859D0DB70FC800040EC7 /* AIMentionEventPlugin.m */; };
 		6332879B0A769BF3004D0F2B /* AIPurpleLiveJournalAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = 63125D8D0A75EBF000303EE9 /* AIPurpleLiveJournalAccount.h */; };
 		6332879C0A769BF3004D0F2B /* AILiveJournalService.h in Headers */ = {isa = PBXBuildFile; fileRef = 63125D970A75ECE400303EE9 /* AILiveJournalService.h */; };
 		6332879D0A769C18004D0F2B /* AIPurpleLiveJournalAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 63125D8E0A75EBF000303EE9 /* AIPurpleLiveJournalAccount.m */; };
 		6332879E0A769C18004D0F2B /* AILiveJournalService.m in Sources */ = {isa = PBXBuildFile; fileRef = 63125D980A75ECE400303EE9 /* AILiveJournalService.m */; };
 		633287C40A769ECB004D0F2B /* PurpleDefaultsLiveJournal.plist in Resources */ = {isa = PBXBuildFile; fileRef = 63125D990A75ECE400303EE9 /* PurpleDefaultsLiveJournal.plist */; };
-		6333699409497DB000970871 /* EmoticonPreviewView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 6333699309497DB000970871 /* EmoticonPreviewView.nib */; };
-		63336B060949908300970871 /* DockIconPreviewView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 63336B050949908300970871 /* DockIconPreviewView.nib */; };
-		63336E15094AB81300970871 /* XtraInfoView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 63336E14094AB81300970871 /* XtraInfoView.nib */; };
+		6333699409497DB000970871 /* EmoticonPreviewView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6333699309497DB000970871 /* EmoticonPreviewView.xib */; };
+		63336B060949908300970871 /* DockIconPreviewView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 63336B050949908300970871 /* DockIconPreviewView.xib */; };
+		63336E15094AB81300970871 /* XtraInfoView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 63336E14094AB81300970871 /* XtraInfoView.xib */; };
 		633400000F9C14C2003C77A9 /* AIFunctions.m in Sources */ = {isa = PBXBuildFile; fileRef = 6334FF040F9C14BF003C77A9 /* AIFunctions.m */; };
 		633400010F9C14C2003C77A9 /* JVMarkedScroller.h in Headers */ = {isa = PBXBuildFile; fileRef = 6334FF070F9C14BF003C77A9 /* JVMarkedScroller.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		633400020F9C14C2003C77A9 /* JVMarkedScroller.m in Sources */ = {isa = PBXBuildFile; fileRef = 6334FF080F9C14BF003C77A9 /* JVMarkedScroller.m */; };
@@ -1175,8 +1132,6 @@
 		633400220F9C14C2003C77A9 /* MVMenuButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 6334FF390F9C14BF003C77A9 /* MVMenuButton.m */; };
 		633400230F9C14C2003C77A9 /* AIImageButton.h in Headers */ = {isa = PBXBuildFile; fileRef = 6334FF3B0F9C14BF003C77A9 /* AIImageButton.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		633400240F9C14C2003C77A9 /* AIImageButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 6334FF3C0F9C14BF003C77A9 /* AIImageButton.m */; };
-		633400250F9C14C2003C77A9 /* AIColoredBoxView.h in Headers */ = {isa = PBXBuildFile; fileRef = 6334FF3E0F9C14BF003C77A9 /* AIColoredBoxView.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		633400260F9C14C2003C77A9 /* AIColoredBoxView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6334FF3F0F9C14BF003C77A9 /* AIColoredBoxView.m */; };
 		633400270F9C14C2003C77A9 /* AIDelayedTextField.h in Headers */ = {isa = PBXBuildFile; fileRef = 6334FF410F9C14BF003C77A9 /* AIDelayedTextField.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		633400280F9C14C2003C77A9 /* AIDelayedTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 6334FF420F9C14BF003C77A9 /* AIDelayedTextField.m */; };
 		633400290F9C14C2003C77A9 /* AIImageViewWithImagePicker.h in Headers */ = {isa = PBXBuildFile; fileRef = 6334FF440F9C14BF003C77A9 /* AIImageViewWithImagePicker.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -1199,8 +1154,6 @@
 		6334003A0F9C14C2003C77A9 /* AIVariableHeightOutlineView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6334FF580F9C14C0003C77A9 /* AIVariableHeightOutlineView.m */; };
 		6334003B0F9C14C2003C77A9 /* AIMultiCellOutlineView.h in Headers */ = {isa = PBXBuildFile; fileRef = 6334FF590F9C14C0003C77A9 /* AIMultiCellOutlineView.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		6334003C0F9C14C2003C77A9 /* AIMultiCellOutlineView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6334FF5A0F9C14C0003C77A9 /* AIMultiCellOutlineView.m */; };
-		6334004D0F9C14C2003C77A9 /* AIToolbarTabView.h in Headers */ = {isa = PBXBuildFile; fileRef = 6334FF6E0F9C14C0003C77A9 /* AIToolbarTabView.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		6334004E0F9C14C2003C77A9 /* AIToolbarTabView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6334FF6F0F9C14C0003C77A9 /* AIToolbarTabView.m */; };
 		6334004F0F9C14C2003C77A9 /* AISplitView.h in Headers */ = {isa = PBXBuildFile; fileRef = 6334FF710F9C14C0003C77A9 /* AISplitView.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		633400500F9C14C2003C77A9 /* AISplitView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6334FF720F9C14C0003C77A9 /* AISplitView.m */; };
 		633400510F9C14C2003C77A9 /* AIAlternatingRowTableView.h in Headers */ = {isa = PBXBuildFile; fileRef = 6334FF740F9C14C0003C77A9 /* AIAlternatingRowTableView.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -1248,7 +1201,7 @@
 		633400890F9C14C2003C77A9 /* AIDateAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 6334FFBE0F9C14C1003C77A9 /* AIDateAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		6334008A0F9C14C2003C77A9 /* AIDateAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 6334FFBF0F9C14C1003C77A9 /* AIDateAdditions.m */; };
 		6334008B0F9C14C2003C77A9 /* AIDateFormatterAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 6334FFC00F9C14C1003C77A9 /* AIDateFormatterAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		6334008C0F9C14C2003C77A9 /* AIDateFormatterAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 6334FFC10F9C14C1003C77A9 /* AIDateFormatterAdditions.m */; };
+		6334008C0F9C14C2003C77A9 /* AIDateFormatterAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 6334FFC10F9C14C1003C77A9 /* AIDateFormatterAdditions.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		6334008D0F9C14C2003C77A9 /* AIDictionaryAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 6334FFC20F9C14C1003C77A9 /* AIDictionaryAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		6334008E0F9C14C2003C77A9 /* AIDictionaryAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 6334FFC30F9C14C1003C77A9 /* AIDictionaryAdditions.m */; };
 		6334008F0F9C14C2003C77A9 /* AIEventAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 6334FFC40F9C14C1003C77A9 /* AIEventAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -1267,8 +1220,6 @@
 		6334009C0F9C14C2003C77A9 /* AIMenuAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 6334FFD10F9C14C1003C77A9 /* AIMenuAdditions.m */; };
 		6334009D0F9C14C2003C77A9 /* AIMutableStringAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 6334FFD20F9C14C1003C77A9 /* AIMutableStringAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		6334009E0F9C14C2003C77A9 /* AIMutableStringAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 6334FFD30F9C14C1003C77A9 /* AIMutableStringAdditions.m */; };
-		6334009F0F9C14C2003C77A9 /* AIObjectAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 6334FFD40F9C14C1003C77A9 /* AIObjectAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		633400A00F9C14C2003C77A9 /* AIObjectAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 6334FFD50F9C14C1003C77A9 /* AIObjectAdditions.m */; };
 		633400A10F9C14C2003C77A9 /* AIOutlineViewAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 6334FFD60F9C14C1003C77A9 /* AIOutlineViewAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		633400A20F9C14C2003C77A9 /* AIOutlineViewAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 6334FFD70F9C14C1003C77A9 /* AIOutlineViewAdditions.m */; };
 		633400A30F9C14C2003C77A9 /* AIParagraphStyleAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 6334FFD80F9C14C1003C77A9 /* AIParagraphStyleAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -1299,10 +1250,6 @@
 		633400BC0F9C14C2003C77A9 /* AIWindowAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 6334FFF10F9C14C1003C77A9 /* AIWindowAdditions.m */; };
 		633400BF0F9C14C2003C77A9 /* OWAddressBookAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 6334FFF40F9C14C1003C77A9 /* OWAddressBookAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		633400C00F9C14C2003C77A9 /* OWAddressBookAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 6334FFF50F9C14C1003C77A9 /* OWAddressBookAdditions.m */; };
-		633400C10F9C14C2003C77A9 /* NSCalendarDate+ISO8601Parsing.h in Headers */ = {isa = PBXBuildFile; fileRef = 6334FFF60F9C14C1003C77A9 /* NSCalendarDate+ISO8601Parsing.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		633400C20F9C14C2003C77A9 /* NSCalendarDate+ISO8601Parsing.m in Sources */ = {isa = PBXBuildFile; fileRef = 6334FFF70F9C14C1003C77A9 /* NSCalendarDate+ISO8601Parsing.m */; };
-		633400C30F9C14C2003C77A9 /* NSCalendarDate+ISO8601Unparsing.h in Headers */ = {isa = PBXBuildFile; fileRef = 6334FFF80F9C14C1003C77A9 /* NSCalendarDate+ISO8601Unparsing.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		633400C40F9C14C2003C77A9 /* NSCalendarDate+ISO8601Unparsing.m in Sources */ = {isa = PBXBuildFile; fileRef = 6334FFF90F9C14C1003C77A9 /* NSCalendarDate+ISO8601Unparsing.m */; };
 		633400C50F9C14C2003C77A9 /* AIWindowControllerAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 6334FFFA0F9C14C1003C77A9 /* AIWindowControllerAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		633400C60F9C14C2003C77A9 /* AIWindowControllerAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 6334FFFB0F9C14C1003C77A9 /* AIWindowControllerAdditions.m */; };
 		633400C70F9C14C2003C77A9 /* AIPasteboardAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 6334FFFC0F9C14C1003C77A9 /* AIPasteboardAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -1315,7 +1262,6 @@
 		633400E30F9C1501003C77A9 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 633400D70F9C1501003C77A9 /* SystemConfiguration.framework */; };
 		633400E40F9C1501003C77A9 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 633400D80F9C1501003C77A9 /* IOKit.framework */; };
 		633400E50F9C1501003C77A9 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 633400D90F9C1501003C77A9 /* Security.framework */; };
-		633400E60F9C1501003C77A9 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 633400DA0F9C1501003C77A9 /* Carbon.framework */; };
 		633400E70F9C1501003C77A9 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 633400DB0F9C1501003C77A9 /* Cocoa.framework */; };
 		633404710F9C18EF003C77A9 /* AIUtilities.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 6334FBFC0F9C11DC003C77A9 /* AIUtilities.framework */; };
 		633405230F9C2B37003C77A9 /* AIUtilities.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6334FBFC0F9C11DC003C77A9 /* AIUtilities.framework */; };
@@ -1326,7 +1272,6 @@
 		633D4FB70F9D30E3004F491E /* GetMetadataForFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 633D4FB10F9D30E3004F491E /* GetMetadataForFile.m */; };
 		633D4FB80F9D30E3004F491E /* GetMetadataForHTMLLog.m in Sources */ = {isa = PBXBuildFile; fileRef = 633D4FB30F9D30E3004F491E /* GetMetadataForHTMLLog.m */; };
 		633D4FB90F9D30E3004F491E /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 633D4FB40F9D30E3004F491E /* main.c */; };
-		633D4FBE0F9D30FA004F491E /* NSCalendarDate+ISO8601Parsing.m in Sources */ = {isa = PBXBuildFile; fileRef = 633D4FBD0F9D30FA004F491E /* NSCalendarDate+ISO8601Parsing.m */; };
 		633D4FC20F9D3116004F491E /* schema.xml in Resources */ = {isa = PBXBuildFile; fileRef = 633D4FC00F9D3116004F491E /* schema.xml */; };
 		633D514F0F9D31BE004F491E /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 633D50ED0F9D31BD004F491E /* InfoPlist.strings */; };
 		633D51500F9D31BE004F491E /* schema.strings in Resources */ = {isa = PBXBuildFile; fileRef = 633D50EF0F9D31BD004F491E /* schema.strings */; };
@@ -1374,12 +1319,27 @@
 		63DF5B230E52D77F00010E99 /* AIContactList.h in Headers */ = {isa = PBXBuildFile; fileRef = 63DF5B210E52D77F00010E99 /* AIContactList.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		63EA62CA094B832D009C8453 /* AIEmoticonPreviewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 63EA62C8094B832D009C8453 /* AIEmoticonPreviewController.m */; };
 		63EA62F0094B8705009C8453 /* AIXtraInfoController.m in Sources */ = {isa = PBXBuildFile; fileRef = 63EA62EE094B8705009C8453 /* AIXtraInfoController.m */; };
-		63EA63DD094BB79A009C8453 /* StatusIconPreviewView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 63336B3F094994A800970871 /* StatusIconPreviewView.nib */; };
+		63EA63DD094BB79A009C8453 /* StatusIconPreviewView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 63336B3F094994A800970871 /* StatusIconPreviewView.xib */; };
 		63EA6409094BB9A9009C8453 /* AIStatusIconPreviewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 63EA6407094BB9A9009C8453 /* AIStatusIconPreviewController.m */; };
 		6E4D961406B739AC005235E9 /* DCJoinChatPanelPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E4D961206B739AC005235E9 /* DCJoinChatPanelPlugin.m */; };
 		6EC1684D06C170A000F9FAD3 /* DCInviteToChatPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EC1684806C170A000F9FAD3 /* DCInviteToChatPlugin.m */; };
 		6EC1684F06C170A000F9FAD3 /* DCInviteToChatWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EC1684A06C170A000F9FAD3 /* DCInviteToChatWindowController.m */; };
-		6EC1685006C170A000F9FAD3 /* InviteToChatWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = 6EC1684B06C170A000F9FAD3 /* InviteToChatWindow.nib */; };
+		6EC1685006C170A000F9FAD3 /* InviteToChatWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6EC1684B06C170A000F9FAD3 /* InviteToChatWindow.xib */; };
+		761CE33916F9087C000EE361 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 761CE33816F9087C000EE361 /* Cocoa.framework */; };
+		761CE34E16F90950000EE361 /* AIDockTilePlugin.docktileplugin in CopyFiles */ = {isa = PBXBuildFile; fileRef = 761CE33616F9087C000EE361 /* AIDockTilePlugin.docktileplugin */; };
+		761CE35416F90A03000EE361 /* AIDockTile.m in Sources */ = {isa = PBXBuildFile; fileRef = 761CE35316F90A03000EE361 /* AIDockTile.m */; };
+		761D58801636C60100210B12 /* AINewMessageTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 761D587F1636C60100210B12 /* AINewMessageTableView.m */; };
+		761D58831636EDE100210B12 /* AINewMessageTextFieldCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 761D58821636EDE100210B12 /* AINewMessageTextFieldCell.m */; };
+		761D58861636F94300210B12 /* AINewMessageSearchField.m in Sources */ = {isa = PBXBuildFile; fileRef = 761D58851636F94200210B12 /* AINewMessageSearchField.m */; };
+		7652804C175FC0F500710EC8 /* RequestFieldBoolean.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7652803F175FC0EB00710EC8 /* RequestFieldBoolean.xib */; };
+		7652804D175FC0F500710EC8 /* RequestFieldChoice.xib in Resources */ = {isa = PBXBuildFile; fileRef = 76528040175FC0EB00710EC8 /* RequestFieldChoice.xib */; };
+		7652804E175FC0F500710EC8 /* RequestFieldInteger.xib in Resources */ = {isa = PBXBuildFile; fileRef = 76528041175FC0EB00710EC8 /* RequestFieldInteger.xib */; };
+		7652804F175FC0F500710EC8 /* RequestFieldList.xib in Resources */ = {isa = PBXBuildFile; fileRef = 76528042175FC0EB00710EC8 /* RequestFieldList.xib */; };
+		76528050175FC0F500710EC8 /* RequestFieldString.xib in Resources */ = {isa = PBXBuildFile; fileRef = 76528043175FC0EB00710EC8 /* RequestFieldString.xib */; };
+		76528054175FCEF700710EC8 /* RequestFieldMultilineString.xib in Resources */ = {isa = PBXBuildFile; fileRef = 76528052175FCEF700710EC8 /* RequestFieldMultilineString.xib */; };
+		76528055175FCEF700710EC8 /* RequestFieldSecureString.xib in Resources */ = {isa = PBXBuildFile; fileRef = 76528053175FCEF700710EC8 /* RequestFieldSecureString.xib */; };
+		7652805A175FD35B00710EC8 /* RequestFieldMultiList.xib in Resources */ = {isa = PBXBuildFile; fileRef = 76528059175FD35B00710EC8 /* RequestFieldMultiList.xib */; };
+		765F5DC51635934400C57904 /* AIRejoinGroupChatTopBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = 765F5DC71635934400C57904 /* AIRejoinGroupChatTopBar.xib */; };
 		7664EAA5162E086A008CF995 /* libffi.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7664EAA4162E086A008CF995 /* libffi.framework */; };
 		7664EAA6162E0874008CF995 /* libffi.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 7664EAA4162E086A008CF995 /* libffi.framework */; };
 		766ABAB61306D1020049FFB7 /* AIUnreadMessagesTooltip.m in Sources */ = {isa = PBXBuildFile; fileRef = 766ABAB51306D1020049FFB7 /* AIUnreadMessagesTooltip.m */; };
@@ -1387,13 +1347,29 @@
 		76731DE315F90538007728C3 /* libgpgerror.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 76731DE115F90538007728C3 /* libgpgerror.framework */; };
 		76731DE415F9057F007728C3 /* libgcrypt.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 76731DE015F90538007728C3 /* libgcrypt.framework */; };
 		76731DE515F90582007728C3 /* libgpgerror.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 76731DE115F90538007728C3 /* libgpgerror.framework */; };
+		767870E41634045D00BD0E4D /* AIMessageViewTopBarController.m in Sources */ = {isa = PBXBuildFile; fileRef = 767870E31634045C00BD0E4D /* AIMessageViewTopBarController.m */; };
 		76889DEB12D3CA17007AEF00 /* get-info.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 76889DEA12D3CA17007AEF00 /* get-info.tiff */; };
-		76889DEF12D3CA40007AEF00 /* Personal.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 76889DEE12D3CA40007AEF00 /* Personal.tiff */; };
+		76980AC1173E6C8800FBDA15 /* libidn.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 76980AC0173E6C8800FBDA15 /* libidn.framework */; };




More information about the commits mailing list