Merged adium-1.6 into default.
authorThijs Alkemade <thijsalkemade@gmail.com>
Thu, 06 Sep 2012 00:18:31 +0200
changeset 5027 b62ccf3a75ba
parent 4997 072a38e0a9bc (current diff)
parent 5026 40dc3e42d737 (diff)
child 5028 a5b24a9d8bb5
Merged adium-1.6 into default.
Adium.xcodeproj/project.pbxproj
ChangeLogs/Changes.txt
Frameworks/AIUtilities Framework/Source/AIImageAdditions.m
Frameworks/AIUtilities Framework/Source/AIImageDrawingAdditions.m
Plists/Info.plist
Plugins/Purple Service/adiumPurpleCore.m
Release/Makefile
Resources/AdvancedPreferences.xib
Source/ESiTunesPlugin.m
Source/KNShelfSplitView.h
Source/KNShelfSplitView.m
--- a/Adium.xcodeproj/project.pbxproj	Mon Aug 13 00:26:14 2012 +0200
+++ b/Adium.xcodeproj/project.pbxproj	Thu Sep 06 00:18:31 2012 +0200
@@ -297,7 +297,6 @@
 		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 */; };
-		34483A990BC869680083723B /* AdvancedPreferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34483A980BC869680083723B /* AdvancedPreferences.xib */; };
 		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 */; };
@@ -952,9 +951,7 @@
 		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 */; };
@@ -1051,6 +1048,8 @@
 		4F1CB64C0D640F4F0073A1E6 /* ContactInfoInspector.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4F1CB64B0D640F4F0073A1E6 /* ContactInfoInspector.xib */; };
 		5A1781860EC1215D00BA1E04 /* AIAutoScrollTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A1781850EC1215D00BA1E04 /* AIAutoScrollTextView.m */; };
 		5A17D65D130F76B4002C852F /* AIGradientView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A17D65C130F76B4002C852F /* AIGradientView.m */; };
+		5A1E24A915BC746B003A6F9E /* AIAdvancedPreferencePane.h in Headers */ = {isa = PBXBuildFile; fileRef = 5A1E24A715BC746B003A6F9E /* AIAdvancedPreferencePane.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		5A1E24AA15BC746B003A6F9E /* AIAdvancedPreferencePane.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A1E24A815BC746B003A6F9E /* AIAdvancedPreferencePane.m */; };
 		5A1E3A1214DCE60400724574 /* Preferences-Xtras.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5A1E3A1114DCE60400724574 /* Preferences-Xtras.xib */; };
 		5A22D6E214834F44004E15F7 /* AIFacebookXMPPAccountView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5A22D6E014834F44004E15F7 /* AIFacebookXMPPAccountView.xib */; };
 		5A27FA7D14A272330063489D /* pref-messagehistory.png in Resources */ = {isa = PBXBuildFile; fileRef = 5A27FA7914A272330063489D /* pref-messagehistory.png */; };
@@ -1439,6 +1438,8 @@
 		C4D29CC40C3C2E3C001545A2 /* BGICImportController.m in Sources */ = {isa = PBXBuildFile; fileRef = C4D29CC00C3C2E3C001545A2 /* BGICImportController.m */; };
 		C4D29CC60C3C2E3C001545A2 /* BGICLogImportController.m in Sources */ = {isa = PBXBuildFile; fileRef = C4D29CC20C3C2E3C001545A2 /* BGICLogImportController.m */; };
 		C4D29CC80C3C2E49001545A2 /* ICImport.xib in Resources */ = {isa = PBXBuildFile; fileRef = C4D29CC70C3C2E49001545A2 /* ICImport.xib */; };
+		C61AFA9A15DD43C80001EDEF /* AboutDialog_bg@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C61AFA9915DD43C80001EDEF /* AboutDialog_bg@2x.png */; };
+		C699374B15F75FB2007EFFA0 /* stackImage@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C647215515F75E3700206892 /* stackImage@2x.png */; };
 		C6A42A8015C5B7290032FAB3 /* FTProgressReveal_Selected.png in Resources */ = {isa = PBXBuildFile; fileRef = C6A42A7415C5B7290032FAB3 /* FTProgressReveal_Selected.png */; };
 		C6A42A8115C5B7290032FAB3 /* FTProgressReveal_Selected@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6A42A7515C5B7290032FAB3 /* FTProgressReveal_Selected@2x.png */; };
 		C6A42A8215C5B7290032FAB3 /* FTProgressReveal.png in Resources */ = {isa = PBXBuildFile; fileRef = C6A42A7615C5B7290032FAB3 /* FTProgressReveal.png */; };
@@ -1477,7 +1478,6 @@
 		C6A42ABB15C5DD790032FAB3 /* FTProgressStopRollover@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6A42AAF15C5DD790032FAB3 /* FTProgressStopRollover@2x.png */; };
 		C6B545A815D338EE0005F1F8 /* SoundFileIcon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6B545A715D338EE0005F1F8 /* SoundFileIcon@2x.png */; };
 		C6B545AA15D3390F0005F1F8 /* ABSearch@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6B545A915D3390F0005F1F8 /* ABSearch@2x.png */; };
-		C6B545AE15D339B70005F1F8 /* stackImage@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6B545AD15D339B70005F1F8 /* stackImage@2x.png */; };
 		C6EE433E15C0A9BC00A4B96C /* default-icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6EE433D15C0A9BC00A4B96C /* default-icon@2x.png */; };
 		C6EE434015C0AA4600A4B96C /* emoticonBlank@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6EE433F15C0AA4600A4B96C /* emoticonBlank@2x.png */; };
 		C6EE434215C0AA6F00A4B96C /* sidebarActionWidget@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6EE434115C0AA6F00A4B96C /* sidebarActionWidget@2x.png */; };
@@ -2462,7 +2462,6 @@
 		344836910BC8510B0083723B /* SS_PreferencePaneProtocol.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SS_PreferencePaneProtocol.h; path = "Frameworks/Adium Framework/Source/SS_PreferencePaneProtocol.h"; sourceTree = "<group>"; };
 		344839970BC8644C0083723B /* AIAdvancedPreferencesPlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIAdvancedPreferencesPlugin.h; path = Source/AIAdvancedPreferencesPlugin.h; sourceTree = "<group>"; };
 		344839980BC8644C0083723B /* AIAdvancedPreferencesPlugin.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIAdvancedPreferencesPlugin.m; path = Source/AIAdvancedPreferencesPlugin.m; sourceTree = "<group>"; };
-		34483A980BC869680083723B /* AdvancedPreferences.xib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = AdvancedPreferences.xib; path = Resources/AdvancedPreferences.xib; sourceTree = "<group>"; };
 		3448758D06D1EBDF00DA778C /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
 		3449485508E9FCCD0054FF57 /* AIContactMenu.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = AIContactMenu.m; path = "Frameworks/Adium Framework/Source/AIContactMenu.m"; sourceTree = "<group>"; };
 		3449485608E9FCCD0054FF57 /* AIContactMenu.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AIContactMenu.h; path = "Frameworks/Adium Framework/Source/AIContactMenu.h"; sourceTree = "<group>"; };
@@ -2958,8 +2957,6 @@
 		3489506A0CDE0CC5002FEB4D /* IKRecentPicture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IKRecentPicture.h; path = Source/IKRecentPicture.h; sourceTree = "<group>"; };
 		348A8A190629A68C00FC6E03 /* en */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = en; path = "Plugins/Purple Service/Resources/en.lproj/ESPurpleJabberAccountView.xib"; sourceTree = "<group>"; };
 		348A901A062A13AB00FC6E03 /* en */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = en; path = "Plugins/Purple Service/Resources/en.lproj/ESPurpleYahooAccountView.xib"; sourceTree = "<group>"; };
-		348B25C60A50FBF300B2B972 /* KNShelfSplitView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = KNShelfSplitView.m; path = Source/KNShelfSplitView.m; sourceTree = "<group>"; };
-		348B25C70A50FBF300B2B972 /* KNShelfSplitView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = KNShelfSplitView.h; path = Source/KNShelfSplitView.h; sourceTree = "<group>"; };
 		348C47150D3B20BE00FB6E7A /* AIMessageWindowOutgoingScrollView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIMessageWindowOutgoingScrollView.h; path = Source/AIMessageWindowOutgoingScrollView.h; sourceTree = "<group>"; };
 		348C47160D3B20BE00FB6E7A /* AIMessageWindowOutgoingScrollView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIMessageWindowOutgoingScrollView.m; path = Source/AIMessageWindowOutgoingScrollView.m; sourceTree = "<group>"; };
 		348D8D1A06CC079F00449EBB /* ESZephyrService.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = ESZephyrService.m; path = "Plugins/Purple Service/ESZephyrService.m"; sourceTree = "<group>"; };
@@ -3883,6 +3880,8 @@
 		5A1781850EC1215D00BA1E04 /* AIAutoScrollTextView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIAutoScrollTextView.m; path = Source/AIAutoScrollTextView.m; sourceTree = "<group>"; };
 		5A17D65B130F76B4002C852F /* AIGradientView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIGradientView.h; path = Source/AIGradientView.h; sourceTree = "<group>"; };
 		5A17D65C130F76B4002C852F /* AIGradientView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIGradientView.m; path = Source/AIGradientView.m; sourceTree = "<group>"; };
+		5A1E24A715BC746B003A6F9E /* AIAdvancedPreferencePane.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIAdvancedPreferencePane.h; path = "Frameworks/Adium Framework/Source/AIAdvancedPreferencePane.h"; sourceTree = "<group>"; };
+		5A1E24A815BC746B003A6F9E /* AIAdvancedPreferencePane.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIAdvancedPreferencePane.m; path = "Frameworks/Adium Framework/Source/AIAdvancedPreferencePane.m"; sourceTree = "<group>"; };
 		5A1E3A1114DCE60400724574 /* Preferences-Xtras.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "Preferences-Xtras.xib"; path = "Resources/Preferences-Xtras.xib"; sourceTree = "<group>"; };
 		5A1FEA601334549300C14951 /* MessageView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = MessageView.xib; path = "Plugins/Dual Window Interface/MessageView.xib"; sourceTree = "<group>"; };
 		5A22D6E114834F44004E15F7 /* en */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = en; path = "Plugins/Purple Service/Resources/en.lproj/AIFacebookXMPPAccountView.xib"; sourceTree = "<group>"; };
@@ -4501,6 +4500,8 @@
 		C4D29CC10C3C2E3C001545A2 /* BGICLogImportController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = BGICLogImportController.h; path = Source/BGICLogImportController.h; sourceTree = SOURCE_ROOT; };
 		C4D29CC20C3C2E3C001545A2 /* BGICLogImportController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = BGICLogImportController.m; path = Source/BGICLogImportController.m; sourceTree = SOURCE_ROOT; };
 		C4D29CC70C3C2E49001545A2 /* ICImport.xib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = ICImport.xib; path = Resources/ICImport.xib; sourceTree = SOURCE_ROOT; };
+		C61AFA9915DD43C80001EDEF /* AboutDialog_bg@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "AboutDialog_bg@2x.png"; path = "Resources/AboutDialog_bg@2x.png"; sourceTree = "<group>"; };
+		C647215515F75E3700206892 /* stackImage@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "stackImage@2x.png"; path = "Frameworks/Adium Framework/stackImage@2x.png"; sourceTree = "<group>"; };
 		C6A42A7415C5B7290032FAB3 /* FTProgressReveal_Selected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FTProgressReveal_Selected.png; path = Resources/FTProgressReveal_Selected.png; sourceTree = "<group>"; };
 		C6A42A7515C5B7290032FAB3 /* FTProgressReveal_Selected@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "FTProgressReveal_Selected@2x.png"; path = "Resources/FTProgressReveal_Selected@2x.png"; sourceTree = "<group>"; };
 		C6A42A7615C5B7290032FAB3 /* FTProgressReveal.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FTProgressReveal.png; path = Resources/FTProgressReveal.png; sourceTree = "<group>"; };
@@ -4539,7 +4540,6 @@
 		C6A42AAF15C5DD790032FAB3 /* FTProgressStopRollover@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "FTProgressStopRollover@2x.png"; path = "Resources/FTProgressStopRollover@2x.png"; sourceTree = "<group>"; };
 		C6B545A715D338EE0005F1F8 /* SoundFileIcon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "SoundFileIcon@2x.png"; path = "Resources/SoundFileIcon@2x.png"; sourceTree = "<group>"; };
 		C6B545A915D3390F0005F1F8 /* ABSearch@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "ABSearch@2x.png"; path = "Resources/ABSearch@2x.png"; sourceTree = "<group>"; };
-		C6B545AD15D339B70005F1F8 /* stackImage@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "stackImage@2x.png"; path = "Frameworks/Adium Framework/stackImage@2x.png"; sourceTree = "<group>"; };
 		C6EE433D15C0A9BC00A4B96C /* default-icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "default-icon@2x.png"; path = "Resources/default-icon@2x.png"; sourceTree = "<group>"; };
 		C6EE433F15C0AA4600A4B96C /* emoticonBlank@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "emoticonBlank@2x.png"; path = "Resources/emoticonBlank@2x.png"; sourceTree = "<group>"; };
 		C6EE434115C0AA6F00A4B96C /* sidebarActionWidget@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "sidebarActionWidget@2x.png"; path = "Resources/sidebarActionWidget@2x.png"; sourceTree = "<group>"; };
@@ -6229,8 +6229,6 @@
 			isa = PBXGroup;
 			children = (
 				34D834CD07CBE7A3006466F2 /* Text field for previewing font preferences */,
-				348B25C70A50FBF300B2B972 /* KNShelfSplitView.h */,
-				348B25C60A50FBF300B2B972 /* KNShelfSplitView.m */,
 			);
 			name = "External Sources";
 			sourceTree = "<group>";
@@ -6734,7 +6732,7 @@
 				F55B416E03AB8C3201A8010A /* AIPasswordPromptController.h */,
 				F55B416603AB8BFC01A8010A /* AIPasswordPromptController.m */,
 				349DDD5206406A7D00542726 /* stackImage.png */,
-				C6B545AD15D339B70005F1F8 /* stackImage@2x.png */,
+				C647215515F75E3700206892 /* stackImage@2x.png */,
 			);
 			name = Interface;
 			sourceTree = "<group>";
@@ -8401,6 +8399,7 @@
 				97E4B4FD13E7490000A8BA53 /* Flap_192.png */,
 				C6EE434B15C0AB7400A4B96C /* Flap_192@2x.png */,
 				9760D24513E49A560031FA1A /* AboutDialog_bg.png */,
+				C61AFA9915DD43C80001EDEF /* AboutDialog_bg@2x.png */,
 				97E4B4FB13E7490000A8BA53 /* AboutDialog_transp_btm.png */,
 				97E4B4FC13E7490000A8BA53 /* AboutDialog_transp_top.png */,
 				3474DFFC08254F3500BF30F0 /* Copyright.txt */,
@@ -8408,7 +8407,6 @@
 				3474DFFF082550FD00BF30F0 /* Credits.rtf */,
 				34107B5509E992DA001CC042 /* GuestAccountWindow.xib */,
 				34F849520A4AEFA00002A017 /* LogFileUpgrade.xib */,
-				34483A980BC869680083723B /* AdvancedPreferences.xib */,
 			);
 			name = "About Box";
 			sourceTree = "<group>";
@@ -8721,6 +8719,8 @@
 				4BAA1B360632ED8B00D8B92C /* AIActionDetailsPane.m */,
 				F5793923033E74C301A8010A /* AIPreferencePane.h */,
 				F5793913033E748F01A8010A /* AIPreferencePane.m */,
+				5A1E24A715BC746B003A6F9E /* AIAdvancedPreferencePane.h */,
+				5A1E24A815BC746B003A6F9E /* AIAdvancedPreferencePane.m */,
 				4BAD188C066A83550002008E /* AIModularPaneCategoryView.h */,
 				4BAD188D066A83550002008E /* AIModularPaneCategoryView.m */,
 			);
@@ -9004,7 +9004,6 @@
 				34DC8B030A7EEEF7003E1636 /* ESFileWrapperExtension.h in Headers */,
 				34DC8B0A0A7EEEF7003E1636 /* JVFontPreviewField.h in Headers */,
 				3482E0F50AB5064E00471992 /* AIAdiumProtocol.h in Headers */,
-				34F312930ADC3FE800A4310E /* KNShelfSplitView.h in Headers */,
 				11CA00100C35EC5100A6BB8D /* SS_PreferencePaneProtocol.h in Headers */,
 				34A88E190C7A26E1006EB7D4 /* AIPasswordPromptController.h in Headers */,
 				347933F30C861017007ADCAA /* AIColorStringTransformer.h in Headers */,
@@ -9023,6 +9022,7 @@
 				34F17FCE0F8EAC34009C5A39 /* AIListOutlineView+Drawing.h in Headers */,
 				63B0EC9D0F8FBB660062476B /* AIProxyListObject.h in Headers */,
 				979AA6A714D59DC8008730DF /* AIBoolToControlTextColorTransformer.h in Headers */,
+				5A1E24A915BC746B003A6F9E /* AIAdvancedPreferencePane.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -9633,7 +9633,6 @@
 				117D6DC00BC5F0C40080D02B /* msg-request-attention.tiff in Resources */,
 				344838690BC85EF70083723B /* AccountListPreferences.xib in Resources */,
 				344839380BC862780083723B /* pref-messages.tiff in Resources */,
-				34483A990BC869680083723B /* AdvancedPreferences.xib in Resources */,
 				07C6EA890C06676400B79CBD /* AdiumHelp in Resources */,
 				0CAC6A140C0C657A0090AE95 /* Adium.sdef in Resources */,
 				C4D29CC80C3C2E49001545A2 /* ICImport.xib in Resources */,
@@ -9750,7 +9749,7 @@
 				C6A42ABB15C5DD790032FAB3 /* FTProgressStopRollover@2x.png in Resources */,
 				C6B545A815D338EE0005F1F8 /* SoundFileIcon@2x.png in Resources */,
 				C6B545AA15D3390F0005F1F8 /* ABSearch@2x.png in Resources */,
-				C6B545AE15D339B70005F1F8 /* stackImage@2x.png in Resources */,
+				C61AFA9A15DD43C80001EDEF /* AboutDialog_bg@2x.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -9786,6 +9785,7 @@
 				1199AB0610BE13E600646322 /* Authorize.tiff in Resources */,
 				1199AB0710BE13E600646322 /* Deny.tiff in Resources */,
 				1199AB0810BE13E600646322 /* Ignore.tiff in Resources */,
+				C699374B15F75FB2007EFFA0 /* stackImage@2x.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -10483,7 +10483,6 @@
 				34DC8B020A7EEEF7003E1636 /* ESFileTransfer.m in Sources */,
 				34DC8B040A7EEEF7003E1636 /* ESFileWrapperExtension.m in Sources */,
 				34DC8B090A7EEEF7003E1636 /* JVFontPreviewField.m in Sources */,
-				34F312F00ADC476300A4310E /* KNShelfSplitView.m in Sources */,
 				34A88E180C7A26E0006EB7D4 /* AIPasswordPromptController.m in Sources */,
 				347933F40C861017007ADCAA /* AIColorStringTransformer.m in Sources */,
 				349195660C9662AA00595A04 /* AIListBookmark.m in Sources */,
@@ -10503,6 +10502,7 @@
 				34F17FCF0F8EAC34009C5A39 /* AIListOutlineView+Drawing.m in Sources */,
 				63B0EC9C0F8FBB660062476B /* AIProxyListObject.m in Sources */,
 				979AA6A814D59DC8008730DF /* AIBoolToControlTextColorTransformer.m in Sources */,
+				5A1E24AA15BC746B003A6F9E /* AIAdvancedPreferencePane.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
--- a/ChangeLogs/Changes.txt	Mon Aug 13 00:26:14 2012 +0200
+++ b/ChangeLogs/Changes.txt	Thu Sep 06 00:18:31 2012 +0200
@@ -1,5 +1,11 @@
 				Adium Version History
 				-----------------------
+Version 1.5.4 (XX/XX/XXXX)
+ * Updated the included Growl SDK to 2.0, adding support for Notification Center on 10.8 if Growl is not installed. (#15867)
+ * Fixed a problem where accepting a group chat invite on Sametime 8.5.1 would crash Adium. (Jere Krischel and Jonathan Rice) (#16114)
+ * Limit the tracking of the last seen time to contacts who are on your contact list.
+
+
 Version 1.5.3 (8/12/2012)
  * Fixed another problem with the transcript viewer causing search to fail when closing and reopening the window. (#13586, #15699)
  * Fixed a problem with iTunes 10.6.3 on Mac OS X 10.6.8 causing the chat window's toolbar to break. (#16046)
--- a/Copyright.txt	Mon Aug 13 00:26:14 2012 +0200
+++ b/Copyright.txt	Thu Sep 06 00:18:31 2012 +0200
@@ -62,6 +62,7 @@
 Eitan Konigsburg
 Alexander Kolov
 Ian Krieg
+Jere Krischel
 Thomas Kunze
 Gayle Laakmann
 Scott Lamb
@@ -92,6 +93,7 @@
 Matthew Plough
 Stephen Poprocki
 Xavid Pretzer
+Jonathan Rice
 Eric Richie
 Eion Robb
 Jesse Rusak
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Dependencies/patches/Meanwhile-srvc_place.c.diff	Thu Sep 06 00:18:31 2012 +0200
@@ -0,0 +1,36 @@
+--- src/srvc_place.c	2005-11-21 10:30:46.000000000 -0800
++++ src/srvc_place.c	2012-08-15 09:07:37.000000000 -0700
+@@ -165,6 +165,7 @@
+   guint16 login_type;
+   guint32 unknown_a;
+   guint32 unknown_b;
++  char *extraname;
+ };
+ 
+ 
+@@ -189,6 +190,7 @@
+   mwIdBlock_clear(&p->idb);
+   g_free(p->login_id);
+   g_free(p->name);
++  g_free(p->extraname);
+   g_free(p);
+ }
+ 
+@@ -394,6 +396,8 @@
+   guint16_get(b, &pm->login_type);
+   guint32_get(b, &pm->unknown_a);
+   guint32_get(b, &pm->unknown_b);
++  //TODO: Since the Notes upgrade, an extra name string is sent to recv_SECTION_LIST(). It might be sent here,
++  //      but since we're only parsing one user, it probably doesn't matter here.
+ 
+   PUT_MEMBER(place, pm);
+   if(srvc->handler && srvc->handler->peerJoined)
+@@ -544,6 +548,7 @@
+     guint16_get(b, &m->login_type);
+     guint32_get(b, &m->unknown_a);
+     guint32_get(b, &m->unknown_b);
++    mwString_get(b, &m->extraname); //new in Notes upgrade, the name appears again at the end now
+ 
+     PUT_MEMBER(place, m);
+   }
+
--- a/Dependencies/phases/build_dependencies.sh	Mon Aug 13 00:26:14 2012 +0200
+++ b/Dependencies/phases/build_dependencies.sh	Thu Sep 06 00:18:31 2012 +0200
@@ -142,6 +142,10 @@
 	
 	# The provided libtool ignores our Universal Binary-makin' flags
 	fwdpatch "$ROOTDIR/patches/Meanwhile-ltmain.sh.diff" -p0 || true
+
+	# Fixes accepting group chat invites from the standard Sametime client.
+	# Thanks to Jere Krischel and Jonathan Rice.
+	fwdpatch "$ROOTDIR/patches/Meanwhile-srvc_place.c.diff" -p0 || true
 	
 	if needsconfigure $@; then
 	(
@@ -175,6 +179,7 @@
 	revpatch "$ROOTDIR/patches/Meanwhile-st_list.c.diff" -p0
 	revpatch "$ROOTDIR/patches/Meanwhile-common.c.diff" -p0
 	revpatch "$ROOTDIR/patches/Meanwhile-srvc_ft.c.diff" -p0
+	revpatch "$ROOTDIR/patches/Meanwhile-srvc_place.c.diff" -p0
 	
 	quiet popd
 }
--- a/Frameworks/AIUtilities Framework/Source/AIImageAdditions.m	Mon Aug 13 00:26:14 2012 +0200
+++ b/Frameworks/AIUtilities Framework/Source/AIImageAdditions.m	Thu Sep 06 00:18:31 2012 +0200
@@ -129,7 +129,7 @@
 	NSRectFill(NSMakeRect(0, 0, size.width, size.height));
 	
 	// Draw the image
-	[self compositeToPoint:NSZeroPoint operation:NSCompositeSourceOver];
+	[self drawAtPoint:NSZeroPoint fromRect:NSZeroRect operation:NSCompositeSourceOver fraction:1.0];
 	
 	// We're done drawing
 	[tempImage unlockFocus];
--- a/Frameworks/AIUtilities Framework/Source/AIImageDrawingAdditions.m	Mon Aug 13 00:26:14 2012 +0200
+++ b/Frameworks/AIUtilities Framework/Source/AIImageDrawingAdditions.m	Thu Sep 06 00:18:31 2012 +0200
@@ -45,7 +45,7 @@
 			}
 			
 			// Draw and shift
-			[self compositeToPoint:destRect.origin fromRect:sourceRect operation:NSCompositeSourceOver];
+			[self drawAtPoint:destRect.origin fromRect:sourceRect operation:NSCompositeSourceOver fraction:1.0];
 			destRect.origin.x += destRect.size.width;
 		}
 		
--- a/Frameworks/Adium Framework/Resources/AccountSetup.xib	Mon Aug 13 00:26:14 2012 +0200
+++ b/Frameworks/Adium Framework/Resources/AccountSetup.xib	Thu Sep 06 00:18:31 2012 +0200
@@ -2,19 +2,21 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
 	<data>
 		<int key="IBDocument.SystemTarget">1060</int>
-		<string key="IBDocument.SystemVersion">11D50b</string>
-		<string key="IBDocument.InterfaceBuilderVersion">2182</string>
-		<string key="IBDocument.AppKitVersion">1138.32</string>
-		<string key="IBDocument.HIToolboxVersion">568.00</string>
+		<string key="IBDocument.SystemVersion">12A269</string>
+		<string key="IBDocument.InterfaceBuilderVersion">2549</string>
+		<string key="IBDocument.AppKitVersion">1187</string>
+		<string key="IBDocument.HIToolboxVersion">624.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">2182</string>
+			<string key="NS.object.0">2549</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
+			<string>NSButton</string>
+			<string>NSButtonCell</string>
+			<string>NSCustomObject</string>
 			<string>NSCustomView</string>
 			<string>NSTextField</string>
 			<string>NSTextFieldCell</string>
-			<string>NSCustomObject</string>
 		</array>
 		<array key="IBDocument.PluginDependencies">
 			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -23,38 +25,62 @@
 			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
 			<integer value="1" key="NS.object.0"/>
 		</object>
-		<array class="NSMutableArray" key="IBDocument.RootObjects" id="956489815">
-			<object class="NSCustomObject" id="985716603">
+		<array class="NSMutableArray" key="IBDocument.RootObjects" id="19952949">
+			<object class="NSCustomObject" id="105115939">
 				<string key="NSClassName">AIAccountViewController</string>
 			</object>
-			<object class="NSCustomObject" id="448436558">
+			<object class="NSCustomObject" id="567296318">
 				<string key="NSClassName">FirstResponder</string>
 			</object>
-			<object class="NSCustomObject" id="223831329">
+			<object class="NSCustomObject" id="848357648">
 				<string key="NSClassName">NSApplication</string>
 			</object>
-			<object class="NSCustomView" id="466473250">
-				<nil key="NSNextResponder"/>
+			<object class="NSCustomView" id="561449010">
+				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">274</int>
 				<array class="NSMutableArray" key="NSSubviews">
-					<object class="NSTextField" id="748451024">
-						<reference key="NSNextResponder" ref="466473250"/>
-						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{142, 30}, {240, 22}}</string>
-						<reference key="NSSuperview" ref="466473250"/>
+					<object class="NSButton" id="881747913">
+						<reference key="NSNextResponder" ref="561449010"/>
+						<int key="NSvFlags">268</int>
+						<string key="NSFrame">{{139, 21}, {183, 32}}</string>
+						<reference key="NSSuperview" ref="561449010"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="43717607">
-							<int key="NSCellFlags">-1804468671</int>
-							<int key="NSCellFlags2">4195328</int>
-							<string key="NSContents"/>
-							<object class="NSFont" key="NSSupport" id="462753129">
+						<object class="NSButtonCell" key="NSCell" id="435985870">
+							<int key="NSCellFlags">67108864</int>
+							<int key="NSCellFlags2">134217728</int>
+							<string key="NSContents">Sign up for an account</string>
+							<object class="NSFont" key="NSSupport" id="271196206">
 								<string key="NSName">LucidaGrande</string>
 								<double key="NSSize">13</double>
 								<int key="NSfFlags">1044</int>
 							</object>
-							<reference key="NSControlView" ref="748451024"/>
+							<reference key="NSControlView" ref="881747913"/>
+							<int key="NSButtonFlags">-2038284288</int>
+							<int key="NSButtonFlags2">129</int>
+							<string key="NSAlternateContents"/>
+							<string key="NSKeyEquivalent"/>
+							<int key="NSPeriodicDelay">200</int>
+							<int key="NSPeriodicInterval">25</int>
+						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+					</object>
+					<object class="NSTextField" id="637763381">
+						<reference key="NSNextResponder" ref="561449010"/>
+						<int key="NSvFlags">264</int>
+						<string key="NSFrame">{{142, 99}, {240, 22}}</string>
+						<reference key="NSSuperview" ref="561449010"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="857466580"/>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSTextFieldCell" key="NSCell" id="549862236">
+							<int key="NSCellFlags">-1804599231</int>
+							<int key="NSCellFlags2">4195328</int>
+							<string key="NSContents"/>
+							<reference key="NSSupport" ref="271196206"/>
+							<reference key="NSControlView" ref="637763381"/>
 							<bool key="NSDrawsBackground">YES</bool>
-							<object class="NSColor" key="NSBackgroundColor" id="662241499">
+							<object class="NSColor" key="NSBackgroundColor" id="569525630">
 								<int key="NSColorSpace">6</int>
 								<string key="NSCatalogName">System</string>
 								<string key="NSColorName">textBackgroundColor</string>
@@ -63,30 +89,33 @@
 									<bytes key="NSWhite">MQA</bytes>
 								</object>
 							</object>
-							<object class="NSColor" key="NSTextColor" id="95747089">
+							<object class="NSColor" key="NSTextColor" id="560351688">
 								<int key="NSColorSpace">6</int>
 								<string key="NSCatalogName">System</string>
 								<string key="NSColorName">textColor</string>
-								<object class="NSColor" key="NSColor" id="898628577">
+								<object class="NSColor" key="NSColor" id="730790499">
 									<int key="NSColorSpace">3</int>
 									<bytes key="NSWhite">MAA</bytes>
 								</object>
 							</object>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
-					<object class="NSTextField" id="799374456">
-						<reference key="NSNextResponder" ref="466473250"/>
+					<object class="NSTextField" id="999421420">
+						<reference key="NSNextResponder" ref="561449010"/>
 						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{0, 33}, {140, 17}}</string>
-						<reference key="NSSuperview" ref="466473250"/>
+						<string key="NSFrame">{{0, 102}, {140, 17}}</string>
+						<reference key="NSSuperview" ref="561449010"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="637763381"/>
 						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="75437158">
-							<int key="NSCellFlags">67239424</int>
+						<object class="NSTextFieldCell" key="NSCell" id="861635100">
+							<int key="NSCellFlags">67108864</int>
 							<int key="NSCellFlags2">71303168</int>
 							<string key="NSContents">User Name:</string>
-							<reference key="NSSupport" ref="462753129"/>
-							<reference key="NSControlView" ref="799374456"/>
-							<object class="NSColor" key="NSBackgroundColor" id="481080978">
+							<reference key="NSSupport" ref="271196206"/>
+							<reference key="NSControlView" ref="999421420"/>
+							<object class="NSColor" key="NSBackgroundColor" id="102860041">
 								<int key="NSColorSpace">6</int>
 								<string key="NSCatalogName">System</string>
 								<string key="NSColorName">controlColor</string>
@@ -95,49 +124,59 @@
 									<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
 								</object>
 							</object>
-							<object class="NSColor" key="NSTextColor" id="889857435">
+							<object class="NSColor" key="NSTextColor" id="817639000">
 								<int key="NSColorSpace">6</int>
 								<string key="NSCatalogName">System</string>
 								<string key="NSColorName">controlTextColor</string>
-								<reference key="NSColor" ref="898628577"/>
+								<reference key="NSColor" ref="730790499"/>
 							</object>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
-					<object class="NSTextField" id="685776581">
-						<reference key="NSNextResponder" ref="466473250"/>
+					<object class="NSTextField" id="857466580">
+						<reference key="NSNextResponder" ref="561449010"/>
 						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{0, 3}, {140, 17}}</string>
-						<reference key="NSSuperview" ref="466473250"/>
+						<string key="NSFrame">{{0, 72}, {140, 17}}</string>
+						<reference key="NSSuperview" ref="561449010"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="140484279"/>
 						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="687090422">
-							<int key="NSCellFlags">67239424</int>
+						<object class="NSTextFieldCell" key="NSCell" id="950271547">
+							<int key="NSCellFlags">67108864</int>
 							<int key="NSCellFlags2">71303168</int>
 							<string key="NSContents">Password:</string>
-							<reference key="NSSupport" ref="462753129"/>
-							<reference key="NSControlView" ref="685776581"/>
-							<reference key="NSBackgroundColor" ref="481080978"/>
-							<reference key="NSTextColor" ref="889857435"/>
+							<reference key="NSSupport" ref="271196206"/>
+							<reference key="NSControlView" ref="857466580"/>
+							<reference key="NSBackgroundColor" ref="102860041"/>
+							<reference key="NSTextColor" ref="817639000"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
-					<object class="NSTextField" id="449085043">
-						<reference key="NSNextResponder" ref="466473250"/>
+					<object class="NSTextField" id="140484279">
+						<reference key="NSNextResponder" ref="561449010"/>
 						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{142, 0}, {240, 22}}</string>
-						<reference key="NSSuperview" ref="466473250"/>
+						<string key="NSFrame">{{142, 69}, {240, 22}}</string>
+						<reference key="NSSuperview" ref="561449010"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="881747913"/>
 						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="934387351">
-							<int key="NSCellFlags">-1804468671</int>
+						<object class="NSTextFieldCell" key="NSCell" id="534731647">
+							<int key="NSCellFlags">-1804599231</int>
 							<int key="NSCellFlags2">4195328</int>
 							<string key="NSContents"/>
-							<reference key="NSSupport" ref="462753129"/>
-							<reference key="NSControlView" ref="449085043"/>
+							<reference key="NSSupport" ref="271196206"/>
+							<reference key="NSControlView" ref="140484279"/>
 							<bool key="NSDrawsBackground">YES</bool>
-							<reference key="NSBackgroundColor" ref="662241499"/>
-							<reference key="NSTextColor" ref="95747089"/>
+							<reference key="NSBackgroundColor" ref="569525630"/>
+							<reference key="NSTextColor" ref="560351688"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 				</array>
-				<string key="NSFrameSize">{460, 52}</string>
+				<string key="NSFrameSize">{460, 121}</string>
+				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
+				<reference key="NSNextKeyView" ref="999421420"/>
 				<object class="NSMutableString" key="NSClassName">
 					<characters key="NS.bytes">NSView</characters>
 				</object>
@@ -149,72 +188,88 @@
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">view_setup</string>
-						<reference key="source" ref="985716603"/>
-						<reference key="destination" ref="466473250"/>
+						<reference key="source" ref="105115939"/>
+						<reference key="destination" ref="561449010"/>
 					</object>
 					<int key="connectionID">13</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">textField_accountUIDLabel</string>
-						<reference key="source" ref="985716603"/>
-						<reference key="destination" ref="799374456"/>
+						<reference key="source" ref="105115939"/>
+						<reference key="destination" ref="999421420"/>
 					</object>
 					<int key="connectionID">15</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">textField_accountUID</string>
-						<reference key="source" ref="985716603"/>
-						<reference key="destination" ref="748451024"/>
+						<reference key="source" ref="105115939"/>
+						<reference key="destination" ref="637763381"/>
 					</object>
 					<int key="connectionID">16</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">textField_password</string>
-						<reference key="source" ref="985716603"/>
-						<reference key="destination" ref="449085043"/>
+						<reference key="source" ref="105115939"/>
+						<reference key="destination" ref="140484279"/>
 					</object>
 					<int key="connectionID">17</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">changedPreference:</string>
-						<reference key="source" ref="985716603"/>
-						<reference key="destination" ref="748451024"/>
+						<reference key="source" ref="105115939"/>
+						<reference key="destination" ref="637763381"/>
 					</object>
 					<int key="connectionID">18</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">changedPreference:</string>
-						<reference key="source" ref="985716603"/>
-						<reference key="destination" ref="449085043"/>
+						<reference key="source" ref="105115939"/>
+						<reference key="destination" ref="140484279"/>
 					</object>
 					<int key="connectionID">19</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">label_password</string>
-						<reference key="source" ref="985716603"/>
-						<reference key="destination" ref="685776581"/>
+						<reference key="source" ref="105115939"/>
+						<reference key="destination" ref="857466580"/>
 					</object>
 					<int key="connectionID">45</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
+						<string key="label">button_SignUp</string>
+						<reference key="source" ref="105115939"/>
+						<reference key="destination" ref="881747913"/>
+					</object>
+					<int key="connectionID">54</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">signUpAccount:</string>
+						<reference key="source" ref="105115939"/>
+						<reference key="destination" ref="881747913"/>
+					</object>
+					<int key="connectionID">55</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
 						<string key="label">view_anchorToRightSide</string>
-						<reference key="source" ref="799374456"/>
-						<reference key="destination" ref="748451024"/>
+						<reference key="source" ref="999421420"/>
+						<reference key="destination" ref="637763381"/>
 					</object>
 					<int key="connectionID">43</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">view_anchorToRightSide</string>
-						<reference key="source" ref="685776581"/>
-						<reference key="destination" ref="449085043"/>
+						<reference key="source" ref="857466580"/>
+						<reference key="destination" ref="140484279"/>
 					</object>
 					<int key="connectionID">44</int>
 				</object>
@@ -224,91 +279,105 @@
 					<object class="IBObjectRecord">
 						<int key="objectID">0</int>
 						<array key="object" id="0"/>
-						<reference key="children" ref="956489815"/>
+						<reference key="children" ref="19952949"/>
 						<nil key="parent"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">-2</int>
-						<reference key="object" ref="985716603"/>
+						<reference key="object" ref="105115939"/>
 						<reference key="parent" ref="0"/>
 						<string key="objectName">File's Owner</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">-1</int>
-						<reference key="object" ref="448436558"/>
+						<reference key="object" ref="567296318"/>
 						<reference key="parent" ref="0"/>
 						<string key="objectName">First Responder</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">5</int>
-						<reference key="object" ref="466473250"/>
+						<reference key="object" ref="561449010"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="748451024"/>
-							<reference ref="799374456"/>
-							<reference ref="685776581"/>
-							<reference ref="449085043"/>
+							<reference ref="637763381"/>
+							<reference ref="999421420"/>
+							<reference ref="857466580"/>
+							<reference ref="140484279"/>
+							<reference ref="881747913"/>
 						</array>
 						<reference key="parent" ref="0"/>
 						<string key="objectName">Setup</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">9</int>
-						<reference key="object" ref="748451024"/>
+						<reference key="object" ref="637763381"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="43717607"/>
+							<reference ref="549862236"/>
 						</array>
-						<reference key="parent" ref="466473250"/>
+						<reference key="parent" ref="561449010"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">10</int>
-						<reference key="object" ref="799374456"/>
+						<reference key="object" ref="999421420"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="75437158"/>
+							<reference ref="861635100"/>
 						</array>
-						<reference key="parent" ref="466473250"/>
+						<reference key="parent" ref="561449010"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">11</int>
-						<reference key="object" ref="685776581"/>
+						<reference key="object" ref="857466580"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="687090422"/>
+							<reference ref="950271547"/>
 						</array>
-						<reference key="parent" ref="466473250"/>
+						<reference key="parent" ref="561449010"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">12</int>
-						<reference key="object" ref="449085043"/>
+						<reference key="object" ref="140484279"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="934387351"/>
+							<reference ref="534731647"/>
 						</array>
-						<reference key="parent" ref="466473250"/>
+						<reference key="parent" ref="561449010"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">47</int>
-						<reference key="object" ref="43717607"/>
-						<reference key="parent" ref="748451024"/>
+						<reference key="object" ref="549862236"/>
+						<reference key="parent" ref="637763381"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">48</int>
-						<reference key="object" ref="75437158"/>
-						<reference key="parent" ref="799374456"/>
+						<reference key="object" ref="861635100"/>
+						<reference key="parent" ref="999421420"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">49</int>
-						<reference key="object" ref="687090422"/>
-						<reference key="parent" ref="685776581"/>
+						<reference key="object" ref="950271547"/>
+						<reference key="parent" ref="857466580"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">50</int>
-						<reference key="object" ref="934387351"/>
-						<reference key="parent" ref="449085043"/>
+						<reference key="object" ref="534731647"/>
+						<reference key="parent" ref="140484279"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">-3</int>
-						<reference key="object" ref="223831329"/>
+						<reference key="object" ref="848357648"/>
 						<reference key="parent" ref="0"/>
 						<string key="objectName">Application</string>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">51</int>
+						<reference key="object" ref="881747913"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="435985870"/>
+						</array>
+						<reference key="parent" ref="561449010"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">52</int>
+						<reference key="object" ref="435985870"/>
+						<reference key="parent" ref="881747913"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -326,31 +395,38 @@
 				<string key="49.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="50.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="51.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="52.CustomClassName">AILocalizationButtonCell</string>
+				<string key="52.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="9.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 			</dictionary>
 			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">50</int>
+			<int key="maxID">55</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
 				<object class="IBPartialClassDescription">
 					<string key="className">AIAccountViewController</string>
 					<string key="superclassName">NSObject</string>
-					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">changedPreference:</string>
-						<string key="NS.object.0">id</string>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<string key="NS.key.0">changedPreference:</string>
-						<object class="IBActionInfo" key="NS.object.0">
+					<dictionary class="NSMutableDictionary" key="actions">
+						<string key="changedPreference:">id</string>
+						<string key="signUpAccount:">id</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="actionInfosByName">
+						<object class="IBActionInfo" key="changedPreference:">
 							<string key="name">changedPreference:</string>
 							<string key="candidateClassName">id</string>
 						</object>
-					</object>
+						<object class="IBActionInfo" key="signUpAccount:">
+							<string key="name">signUpAccount:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</dictionary>
 					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="button_SignUp">NSButton</string>
 						<string key="checkBox_checkMail">NSButton</string>
 						<string key="checkBox_sendTyping">NSButton</string>
 						<string key="label_alias">NSTextField</string>
@@ -375,6 +451,10 @@
 						<string key="view_setup">NSView</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="button_SignUp">
+							<string key="name">button_SignUp</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="checkBox_checkMail">
 							<string key="name">checkBox_checkMail</string>
 							<string key="candidateClassName">NSButton</string>
@@ -470,6 +550,38 @@
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
+					<string key="className">AILocalizationButtonCell</string>
+					<string key="superclassName">NSButtonCell</string>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="view_anchorToLeftSide">NSView</string>
+						<string key="view_anchorToRightSide">NSView</string>
+						<string key="window_anchorOnLeftSide">NSWindow</string>
+						<string key="window_anchorOnRightSide">NSWindow</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="view_anchorToLeftSide">
+							<string key="name">view_anchorToLeftSide</string>
+							<string key="candidateClassName">NSView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="view_anchorToRightSide">
+							<string key="name">view_anchorToRightSide</string>
+							<string key="candidateClassName">NSView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="window_anchorOnLeftSide">
+							<string key="name">window_anchorOnLeftSide</string>
+							<string key="candidateClassName">NSWindow</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="window_anchorOnRightSide">
+							<string key="name">window_anchorOnRightSide</string>
+							<string key="candidateClassName">NSWindow</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/AILocalizationButtonCell.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
 					<string key="className">AILocalizationTextField</string>
 					<string key="superclassName">NSTextField</string>
 					<dictionary class="NSMutableDictionary" key="outlets">
@@ -501,6 +613,24 @@
 						<string key="minorKey">./Classes/AILocalizationTextField.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="NSMutableDictionary" key="actions">
+						<string key="NS.key.0">selectServiceType:</string>
+						<string key="NS.object.0">id</string>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<string key="NS.key.0">selectServiceType:</string>
+						<object class="IBActionInfo" key="NS.object.0">
+							<string key="name">selectServiceType:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/NSObject.h</string>
+					</object>
+				</object>
 			</array>
 		</object>
 		<int key="IBDocument.localizationMode">0</int>
@@ -509,10 +639,6 @@
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
 			<real value="1060" key="NS.object.0"/>
 		</object>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
-			<real value="1060" key="NS.object.0"/>
-		</object>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
 			<real value="3200" key="NS.object.0"/>
--- a/Frameworks/Adium Framework/Source/AIAccountViewController.h	Mon Aug 13 00:26:14 2012 +0200
+++ b/Frameworks/Adium Framework/Source/AIAccountViewController.h	Thu Sep 06 00:18:31 2012 +0200
@@ -34,6 +34,7 @@
 	IBOutlet	NSTextField		*textField_accountUID;			//UID field
 	IBOutlet	NSTextField		*label_password;				//Label on the password field
 	IBOutlet	NSTextField		*textField_password;			//Password field
+	IBOutlet	NSButton		*button_SignUp;					//Sign up for account
 	IBOutlet	NSTextField		*textField_connectHost;			//Connect host
 	IBOutlet	NSTextField		*textField_connectPort;			//Connect port
 	IBOutlet	NSTextField		*textField_alias;				//User alias (or display name)
@@ -65,6 +66,7 @@
 - (NSView *)privacyView;
 - (void)configureForAccount:(AIAccount *)inAccount;
 - (IBAction)changedPreference:(id)sender;
+- (IBAction)signUpAccount:(id)sender;
 - (NSString *)nibName;
 - (void)saveConfiguration;
 
--- a/Frameworks/Adium Framework/Source/AIAccountViewController.m	Mon Aug 13 00:26:14 2012 +0200
+++ b/Frameworks/Adium Framework/Source/AIAccountViewController.m	Thu Sep 06 00:18:31 2012 +0200
@@ -216,6 +216,9 @@
 		NSString	*savedPassword = [adium.accountController passwordForAccount:account];
 		[textField_password setStringValue:[savedPassword length] ? savedPassword : @""];
 		
+		//Account sign up button text
+		[button_SignUp setTitle:[service accountSetupLabel]];
+		
 		//User alias (display name)
 		NSString *alias = [[[account preferenceForKey:KEY_ACCOUNT_DISPLAY_NAME group:GROUP_ACCOUNT_STATUS] attributedString] string];
 		[textField_alias setStringValue:(alias ? alias : @"")];
@@ -339,6 +342,17 @@
 }
 
 /*!
+ * @brief Invoked when the account sign up button is clicked
+ *
+ * This method is invoked when the account sign up button is clicked. It defaults to opening the account sign up URL
+ * in the default browser, but can be used to override this behaviour.
+ */
+- (IBAction)signUpAccount:(id)sender
+{
+	[[NSWorkspace sharedWorkspace] openURL:[account.service serviceAccountSetupURL]];
+}
+
+/*!
  * @brief Dictionary mapping Adium preference keys to exposed binding keys
  *
  * The objects of the dictionary should be Adium preference keys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Frameworks/Adium Framework/Source/AIAdvancedPreferencePane.h	Thu Sep 06 00:18:31 2012 +0200
@@ -0,0 +1,23 @@
+/* 
+ * Adium is the legal property of its developers, whose names are listed in the copyright file included
+ * with this source distribution.
+ * 
+ * This program is free software; you can redistribute it and/or modify it under the terms of the GNU
+ * General Public License as published by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+ * Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License along with this program; if not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#import "AIPreferencePane.h"
+
+@interface AIAdvancedPreferencePane : AIPreferencePane {
+
+}
+
+@end
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Frameworks/Adium Framework/Source/AIAdvancedPreferencePane.m	Thu Sep 06 00:18:31 2012 +0200
@@ -0,0 +1,41 @@
+/* 
+ * Adium is the legal property of its developers, whose names are listed in the copyright file included
+ * with this source distribution.
+ * 
+ * This program is free software; you can redistribute it and/or modify it under the terms of the GNU
+ * General Public License as published by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+ * Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License along with this program; if not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#import "AIAdvancedPreferencePane.h"
+
+@implementation AIAdvancedPreferencePane
+- (AIPreferenceCategory)category
+{
+	return AIPref_Advanced;
+}
+
+- (NSImage *)paneIcon
+{
+	return [self image];
+}
+
+- (NSImage *)image
+{
+	return nil;
+}
+
+//Resizable
+- (BOOL)resizable
+{
+	return YES;
+}
+
+@end
--- a/Frameworks/Adium Framework/Source/AIService.h	Mon Aug 13 00:26:14 2012 +0200
+++ b/Frameworks/Adium Framework/Source/AIService.h	Thu Sep 06 00:18:31 2012 +0200
@@ -51,6 +51,8 @@
 @property (readonly, nonatomic) NSString *userNameLabel;
 @property (readonly, nonatomic) NSString *contactUserNameLabel;
 @property (readonly, nonatomic) NSString *UIDPlaceholder;
+@property (readonly, nonatomic) NSURL    *serviceAccountSetupURL;
+@property (readonly, nonatomic) NSString *accountSetupLabel;
 @property (readonly, nonatomic) AIServiceImportance serviceImportance;
 - (NSImage *)defaultServiceIconOfType:(AIServiceIconType)iconType;
 - (NSString *)pathForDefaultServiceIconOfType:(AIServiceIconType)iconType;
--- a/Frameworks/Adium Framework/Source/AIService.m	Mon Aug 13 00:26:14 2012 +0200
+++ b/Frameworks/Adium Framework/Source/AIService.m	Thu Sep 06 00:18:31 2012 +0200
@@ -20,6 +20,8 @@
 #import <Adium/AIAccountViewController.h>
 #import "AICreateCommand.h"
 
+#define ADIUM_ACCOUNT_CREATION_PAGE @"http://trac.adium.im/wiki/CreatingAnAccount#Sigingupforanaccount"
+
 /*!
  * @class AIService
  * @brief An IM Service
@@ -208,6 +210,39 @@
 }
 
 /*!
+ * @brief Account creation URL
+ *
+ * URL to a page at which the user can sign up to an account on this service or a page that explains how one can sign up for an account
+ *
+ * This will be used for the button in the account setup pane
+ *
+ * By default, returns a URL to the account signup page on the Adium wiki
+ *
+ * @return NSURL for account creation
+ */
+- (NSURL *)serviceAccountSetupURL
+{
+	return [NSURL URLWithString:ADIUM_ACCOUNT_CREATION_PAGE];
+}
+
+/*!
+ * @brief Label for account setup
+ *
+ * String to use for describing the page that the account creation URL leads to. This value varies according to the nature of the page linked to.
+ * Examples "Get AIM Account", "About Lotus", "Get Google Account"
+ *
+ * This will be used for the button in the account setup pane
+ *
+ * By default, return a localized string for "Sign up for an account"
+ *
+ * @return NSString label for account setup
+ */
+- (NSString *)accountSetupLabel
+{
+	return AILocalizedString(@"Sign up for an account", @"Defualt label for account registration button in account setup pane.");
+}
+
+/*!
  * @brief Service importance
  *
  * Importance grouping of this service.  Used to make service listings and menus more organized by placing more important
--- a/Frameworks/Adium Framework/Source/ESFileTransfer.m	Mon Aug 13 00:26:14 2012 +0200
+++ b/Frameworks/Adium Framework/Source/ESFileTransfer.m	Thu Sep 06 00:18:31 2012 +0200
@@ -378,7 +378,7 @@
 	
 	[iconImage lockFocus];
 	
-	[systemIcon compositeToPoint:NSZeroPoint operation:NSCompositeSourceOver];
+	[systemIcon drawAtPoint:NSZeroPoint fromRect:NSZeroRect operation:NSCompositeSourceOver fraction:1.0];
 	
 	CGFloat line = ((NSWidth(bottomRight) / 15) + ((NSHeight(bottomRight) / 15) / 2));
 	NSRect	circleRect = NSMakeRect(NSMinX(bottomRight),
Binary file Frameworks/Growl.framework/Versions/A/Growl has changed
--- a/Frameworks/Growl.framework/Versions/A/Headers/GrowlApplicationBridge.h	Mon Aug 13 00:26:14 2012 +0200
+++ b/Frameworks/Growl.framework/Versions/A/Headers/GrowlApplicationBridge.h	Thu Sep 06 00:18:31 2012 +0200
@@ -112,7 +112,7 @@
  *
  *	@param inDelegate The delegate for the GrowlApplicationBridge. It must conform to the GrowlApplicationBridgeDelegate protocol.
  */
-+ (void) setGrowlDelegate:(NSObject<GrowlApplicationBridgeDelegate> *)inDelegate;
++ (void) setGrowlDelegate:(id<GrowlApplicationBridgeDelegate>)inDelegate;
 
 /*!
  *	@method growlDelegate
@@ -120,7 +120,7 @@
  *	@discussion See setGrowlDelegate: for details.
  *	@result The Growl delegate.
  */
-+ (NSObject<GrowlApplicationBridgeDelegate> *) growlDelegate;
++ (id<GrowlApplicationBridgeDelegate>) growlDelegate;
 
 #pragma mark -
 
@@ -260,6 +260,7 @@
  *	 Growl when next it is ready; <code>NO</code> if not.
  */
 + (void) setWillRegisterWhenGrowlIsReady:(BOOL)flag;
+
 /*!	@method	willRegisterWhenGrowlIsReady
  *	@abstract	Reports whether GrowlApplicationBridge will register with Growl
  *	 when Growl next launches.
@@ -361,6 +362,7 @@
  *	 copy of <code>regDict</code>.
  */
 + (NSDictionary *) registrationDictionaryByFillingInDictionary:(NSDictionary *)regDict;
+
 /*!	@method	registrationDictionaryByFillingInDictionary:restrictToKeys:
  *	@abstract	Tries to fill in missing keys in a registration dictionary.
  *	@discussion	This method examines the passed-in dictionary for missing keys,
@@ -400,6 +402,32 @@
 + (NSDictionary *) notificationDictionaryByFillingInDictionary:(NSDictionary *)regDict;
 
 + (NSDictionary *) frameworkInfoDictionary;
+
+#pragma mark -
+
+/*!
+ *@method growlURLSchemeAvailable
+ *@abstract Lets the app know whether growl:// is registered on the system, used for certain methods below this
+ *@return Returns whether growl:// is registered on the system
+ *@discussion Methods such as openGrowlPreferences rely on the growl:// URL scheme to function
+ * Further, this method can provide a check on whether Growl is installed, 
+ * however, the framework will not be relying on this method for choosing when/how to notify, 
+ * and it is not recommended that the app rely on it for other than whether to use growl:// methods
+ *@since Growl.framework 1.4
+ */
++ (BOOL) isGrowlURLSchemeAvailable;
+
+/*!
+ * @method openGrowlPreferences:
+ * @abstract Open Growl preferences, optionally to this app's settings, growl:// method
+ * @param showApp Whether to show the application's settings, otherwise just opens to the last position
+ * @return Return's whether opening the URL was succesfull or not.  
+ * @discussion Will launch if Growl is installed, but not running, and open the preferences window
+ * Uses growl:// URL scheme
+ * @since Growl.framework 1.4
+ */
++ (BOOL) openGrowlPreferences:(BOOL)showApp;
+
 @end
 
 //------------------------------------------------------------------------------
@@ -408,27 +436,15 @@
 /*!
  *	@protocol GrowlApplicationBridgeDelegate
  *	@abstract Required protocol for the Growl delegate.
- *	@discussion The methods in this protocol are required and are called
+ *	@discussion The methods in this protocol are optional and are called
  *	 automatically as needed by GrowlApplicationBridge. See
  *	 <code>+[GrowlApplicationBridge setGrowlDelegate:]</code>.
  *	 See also <code>GrowlApplicationBridgeDelegate_InformalProtocol</code>.
  */
 
-@protocol GrowlApplicationBridgeDelegate
-
-// -registrationDictionaryForGrowl has moved to the informal protocol as of 0.7.
-
-@end
+@protocol GrowlApplicationBridgeDelegate <NSObject>
 
-//------------------------------------------------------------------------------
-#pragma mark -
-
-/*!
- *	@category NSObject(GrowlApplicationBridgeDelegate_InformalProtocol)
- *	@abstract Methods which may be optionally implemented by the GrowlDelegate.
- *	@discussion The methods in this informal protocol will only be called if implemented by the delegate.
- */
-@interface NSObject (GrowlApplicationBridgeDelegate_InformalProtocol)
+@optional
 
 /*!
  *	@method registrationDictionaryForGrowl
--- a/Frameworks/Growl.framework/Versions/A/Headers/GrowlDefines.h	Mon Aug 13 00:26:14 2012 +0200
+++ b/Frameworks/Growl.framework/Versions/A/Headers/GrowlDefines.h	Thu Sep 06 00:18:31 2012 +0200
@@ -99,6 +99,14 @@
 *  This key is optional.
 */
 #define GROWL_NOTIFICATIONS_DESCRIPTIONS		XSTR("NotificationDescriptions")
+/*! @defined GROWL_NOTIFICATIONS_ICONS
+ *  @abstract A dictionary of icons for each notification
+ *  @discussion This is an NSDictionary whose keys are GROWL_NOTIFICATION_NAME strings and whose objects are
+ *  icons for each notification, for GNTP spec
+ *
+ *  This key is optional.
+ */
+#define GROWL_NOTIFICATIONS_ICONS XSTR("NotificationIcons")
 
 /*!	@defined	GROWL_TICKET_VERSION
  *	@abstract	The version of your registration ticket.
@@ -212,6 +220,19 @@
 */
 #define GROWL_NOTIFICATION_PROGRESS		XSTR("NotificationProgress")
 
+/*!	@defined GROWL_NOTIFICATION_ALREADY_SHOWN
+ *	@abstract If this key is set, it should contain a bool value wrapped
+ *   in a NSNumber which describes whether the notification has
+ *   already been displayed, for instance by built in Notification
+ *   Center support.  This value can be used to allow display
+ *   plugins to skip a notification, while still allowing Growl
+ *   actions to run on them.
+ *
+ *	 Optional. Not supported by all display plugins.
+ */
+#define GROWL_NOTIFICATION_ALREADY_SHOWN		XSTR("AlreadyShown")
+
+
 // Notifications
 #pragma mark Notifications
 
@@ -316,6 +337,28 @@
  */
 #define GROWL_DISTRIBUTED_NOTIFICATION_TIMED_OUT_SUFFIX		XSTR("GrowlTimedOut!")
 
+/*!	@defined GROWL_DISTRIBUTED_NOTIFICATION_NOTIFICATIONCENTER_ON
+ *	@abstract The distributed notification sent when the Notification Center support is toggled on in Growl 2.0
+ *	@discussion When the user enables Notification Center support in Growl 2.0, this notification is sent
+ *      to inform all running apps that they should now speak to Notification Center directly.
+ */
+#define GROWL_DISTRIBUTED_NOTIFICATION_NOTIFICATIONCENTER_ON		XSTR("GrowlNotificationCenterOn!")
+
+/*!	@defined GROWL_DISTRIBUTED_NOTIFICATION_NOTIFICATIONCENTER_OFF
+ *	@abstract The distributed notification sent when the Notification Center support is toggled off in Growl 2.0
+ *	@discussion When the user enables Notification Center support in Growl 2.0, this notification is sent
+ *      to inform all running apps that they should no longer speak to Notification Center directly.
+ */
+#define GROWL_DISTRIBUTED_NOTIFICATION_NOTIFICATIONCENTER_OFF		XSTR("GrowlNotificationCenterOff!")
+
+/*!	@defined GROWL_DISTRIBUTED_NOTIFICATION_NOTIFICATIONCENTER_QUERY
+ *	@abstract The distributed notification sent by an application to query Growl 2.0's notification center support.
+ *	@discussion When an app starts up, it will send this query to get Growl 2.0 to spit out whether notification
+ *      center support is on or off.
+ */
+#define GROWL_DISTRIBUTED_NOTIFICATION_NOTIFICATIONCENTER_QUERY		XSTR("GrowlNotificationCenterYN?")
+
+
 /*!	@group Other symbols */
 /* Symbols which don't fit into any of the other categories. */
 
@@ -338,4 +381,6 @@
 
 #define GROWL_POSITION_PREFERENCE_KEY			@"GrowlSelectedPosition"
 
+#define GROWL_PLUGIN_CONFIG_ID XSTR("GrowlPluginConfigurationID")
+
 #endif //ndef _GROWLDEFINES_H
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Frameworks/Growl.framework/Versions/A/Headers/GrowlPluginPreferenceStrings.h	Thu Sep 06 00:18:31 2012 +0200
@@ -0,0 +1,67 @@
+//
+//  GrowlPluginPreferenceStrings.h
+//  Growl
+//
+//  Created by Daniel Siemer on 1/30/12.
+//  Copyright (c) 2012 The Growl Project. All rights reserved.
+//
+
+/* FOR GROWL DEVELOPED COCOA PLUGINS ONLY AT THIS TIME, NOT STABLE */
+
+#import <Foundation/Foundation.h>
+
+#define GrowlDisplayOpacity NSLocalizedStringFromTable(@"Opacity:", @"PluginPrefStrings", @"How clear the display is")
+#define GrowlDisplayDuration NSLocalizedStringFromTable(@"Duration:", @"PluginPrefStrings", @"How long a notification will stay on screen")
+
+#define GrowlDisplayPriority NSLocalizedStringFromTable(@"Priority: (low to high)", @"PluginPrefStrings", @"Label for columns of color wells for various priority levels")
+#define GrowlDisplayPriorityLow NSLocalizedStringFromTable(@"Very Low", @"PluginPrefStrings", @"Notification Priority Very Low")
+#define GrowlDisplayPriorityModerate NSLocalizedStringFromTable(@"Moderate", @"PluginPrefStrings", @"Notification Priority Moderate")
+#define GrowlDisplayPriorityNormal NSLocalizedStringFromTable(@"Normal", @"PluginPrefStrings", @"Notification Priority Normal")
+#define GrowlDisplayPriorityHigh NSLocalizedStringFromTable(@"High", @"PluginPrefStrings", @"Notification Priority High")
+#define GrowlDisplayPriorityEmergency NSLocalizedStringFromTable(@"Emergency", @"PluginPrefStrings", @"Notification Priority Emergency")
+
+#define GrowlDisplayTextColor NSLocalizedStringFromTable(@"Text", @"PluginPrefStrings", @"Label for row of color wells for the text element of the plugin")
+#define GrowlDisplayBackgroundColor NSLocalizedStringFromTable(@"Background", @"PluginPrefStrings", @"Label for row of color wells for the background of the plugin")
+
+#define GrowlDisplayLimitLines NSLocalizedStringFromTable(@"Limit to 2-5 lines", @"PluginPrefStrings", @"Checkbox to limit the display to 2-5 lines")
+#define GrowlDisplayScreen NSLocalizedStringFromTable(@"Screen:", @"PluginPrefStrings", @"Label for box to select screen for display to use")
+#define GrowlDisplaySize NSLocalizedStringFromTable(@"Size:", @"PluginPrefStrings", @"Label for pop up box for selecting the size of the display")
+#define GrowlDisplaySizeNormal NSLocalizedStringFromTable(@"Normal", @"PluginPrefStrings", @"Normal size for the display")
+#define GrowlDisplaySizeLarge NSLocalizedStringFromTable(@"Large", @"PluginPrefStrings", @"Large size for the display")
+#define GrowlDisplaySizeSmall NSLocalizedStringFromTable(@"Small", @"PluginPrefStrings", @"Small size for the display")
+
+#define GrowlDisplayFloatingIcon NSLocalizedStringFromTable(@"Floating Icon", @"PluginPrefStrings", @"Label for checkbox that says to do a floating icon")
+
+#define GrowlDisplayEffect NSLocalizedStringFromTable(@"Effect:", @"PluginPrefStrings", @"Label for the effect to use")
+#define GrowlDisplayEffectSlide NSLocalizedStringFromTable(@"Slide", @"PluginPrefStrings", @"A slide effect")
+#define GrowlDisplayEffectFade NSLocalizedStringFromTable(@"Fade", @"PluginPrefStrings", @"A fade effect")
+
+@interface GrowlPluginPreferenceStrings : NSObject
+
+@property (nonatomic, retain) NSString *growlDisplayOpacity;
+@property (nonatomic, retain) NSString *growlDisplayDuration;
+
+@property (nonatomic, retain) NSString *growlDisplayPriority;
+@property (nonatomic, retain) NSString *growlDisplayPriorityVeryLow;
+@property (nonatomic, retain) NSString *growlDisplayPriorityModerate;
+@property (nonatomic, retain) NSString *growlDisplayPriorityNormal;
+@property (nonatomic, retain) NSString *growlDisplayPriorityHigh;
+@property (nonatomic, retain) NSString *growlDisplayPriorityEmergency;
+
+@property (nonatomic, retain) NSString *growlDisplayTextColor;
+@property (nonatomic, retain) NSString *growlDisplayBackgroundColor;
+
+@property (nonatomic, retain) NSString *growlDisplayLimitLines;
+@property (nonatomic, retain) NSString *growlDisplayScreen;
+@property (nonatomic, retain) NSString *growlDisplaySize;
+@property (nonatomic, retain) NSString *growlDisplaySizeNormal;
+@property (nonatomic, retain) NSString *growlDisplaySizeLarge;
+@property (nonatomic, retain) NSString *growlDisplaySizeSmall;
+
+@property (nonatomic, retain) NSString *growlDisplayFloatingIcon;
+
+@property (nonatomic, retain) NSString *effectLabel;
+@property (nonatomic, retain) NSString *slideEffect;
+@property (nonatomic, retain) NSString *fadeEffect;
+
+@end
--- a/Frameworks/Growl.framework/Versions/A/Resources/Info.plist	Mon Aug 13 00:26:14 2012 +0200
+++ b/Frameworks/Growl.framework/Versions/A/Resources/Info.plist	Thu Sep 06 00:18:31 2012 +0200
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>11C74</string>
+	<string>12A269</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
@@ -15,25 +15,25 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.1</string>
+	<string>2.0</string>
 	<key>CFBundleSignature</key>
 	<string>GRRR</string>
 	<key>CFBundleVersion</key>
-	<string>1.3.1</string>
+	<string>2.0</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>4D199</string>
+	<string>4F250</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
-	<string>11C63</string>
+	<string>12A264</string>
 	<key>DTSDKName</key>
-	<string>macosx10.7</string>
+	<string>macosx10.8</string>
 	<key>DTXcode</key>
-	<string>0420</string>
+	<string>0440</string>
 	<key>DTXcodeBuild</key>
-	<string>4D199</string>
+	<string>4F250</string>
 	<key>NSPrincipalClass</key>
 	<string>GrowlApplicationBridge</string>
 </dict>
--- a/Frameworks/Growl.framework/Versions/A/_CodeSignature/CodeResources	Mon Aug 13 00:26:14 2012 +0200
+++ b/Frameworks/Growl.framework/Versions/A/_CodeSignature/CodeResources	Thu Sep 06 00:18:31 2012 +0200
@@ -6,7 +6,7 @@
 	<dict>
 		<key>Resources/Info.plist</key>
 		<data>
-		SwzGt9RQsuVafBBrfBalB75dCwU=
+		lnx8exuPwE/bsUq32R5DXDQholc=
 		</data>
 	</dict>
 	<key>rules</key>
--- a/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/Info.plist	Mon Aug 13 00:26:14 2012 +0200
+++ b/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/Info.plist	Thu Sep 06 00:18:31 2012 +0200
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>11D50b</string>
+	<string>12A269</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
@@ -21,16 +21,16 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>4E2002</string>
+	<string>4F226a</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
-	<string>10K549</string>
+	<string>12A244</string>
 	<key>DTSDKName</key>
-	<string>macosx10.6</string>
+	<string>macosx10.8</string>
 	<key>DTXcode</key>
-	<string>0432</string>
+	<string>0440</string>
 	<key>DTXcodeBuild</key>
-	<string>4E2002</string>
+	<string>4F226a</string>
 </dict>
 </plist>
Binary file Frameworks/ShortcutRecorder.framework/Versions/A/Resources/el.lproj/ShortcutRecorder.strings has changed
Binary file Frameworks/ShortcutRecorder.framework/Versions/A/Resources/es-MX.lproj/ShortcutRecorder.strings has changed
Binary file Frameworks/ShortcutRecorder.framework/Versions/A/Resources/es.lproj/ShortcutRecorder.strings has changed
Binary file Frameworks/ShortcutRecorder.framework/Versions/A/Resources/fr.lproj/ShortcutRecorder.strings has changed
Binary file Frameworks/ShortcutRecorder.framework/Versions/A/Resources/pl.lproj/ShortcutRecorder.strings has changed
Binary file Frameworks/ShortcutRecorder.framework/Versions/A/ShortcutRecorder has changed
Binary file Frameworks/libintl.framework/Versions/8/libintl has changed
--- a/Plugins/Bonjour/AWBonjourService.m	Mon Aug 13 00:26:14 2012 +0200
+++ b/Plugins/Bonjour/AWBonjourService.m	Thu Sep 06 00:18:31 2012 +0200
@@ -51,6 +51,14 @@
 - (NSString *)longDescription{
 	return @"Bonjour";
 }
+- (NSURL *)serviceAccountSetupURL
+{
+	return [NSURL URLWithString:AILocalizedString(@"http://en.wikipedia.org/wiki/Bonjour_(software)", @"URL for Bonjour signup or about page. Replace with the URL to an equivalent page in your language if one exists.")];
+}
+- (NSString *)accountSetupLabel
+{
+	return AILocalizedString(@"About Bonjour", @"Text for Bonjour sign up button");
+}
 - (NSCharacterSet *)allowedCharacters{
 	return [[NSCharacterSet illegalCharacterSet] invertedSet];
 }
--- a/Plugins/Bonjour/libezv/Private Classes/AWEzvContactManagerRendezvous.m	Mon Aug 13 00:26:14 2012 +0200
+++ b/Plugins/Bonjour/libezv/Private Classes/AWEzvContactManagerRendezvous.m	Thu Sep 06 00:18:31 2012 +0200
@@ -805,9 +805,13 @@
 
 void register_reply(DNSServiceRef sdRef, DNSServiceFlags flags, DNSServiceErrorType errorCode, const char *name, const char *regtype, const char *domain, void *context)
 {
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+	
 	AWEzvContactManager *self = context;
 	[self setInstanceName:[NSString stringWithUTF8String:name]];
 	[self regCallBack:errorCode];
+	
+	[pool release];
 }
 
 void image_register_reply( 
@@ -817,12 +821,16 @@
 	DNSServiceErrorType errorCode, 
 	void *context)
 {
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+	
 	if (errorCode != kDNSServiceErr_NoError) {
 		AWEzvLog(@"error %d registering image record", errorCode);
 	} else {
 		AWEzvContactManager *self = context;
 		[self updatePHSH];
 	}
+	
+	[pool release];
 }
 
 #pragma mark mDNS Browse Callback
@@ -841,6 +849,8 @@
 							const char *replyDomain,
 							void *context)
 {
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+	
 	// Received a browser reply from DNSServiceBrowse for av, now must handle processing the list of results
 	if (errorCode == kDNSServiceErr_NoError) {
 		AWEzvContactManager *self = context;
@@ -850,6 +860,8 @@
 	} else {
 		AWEzvLog(@"Error browsing");
 	}
+	
+	[pool release];
 }
 
 #pragma mark mDNS Resolve Callback
@@ -870,6 +882,8 @@
 					const unsigned char *txtRecord, 
 					void *context)
 {
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+	
 	if (errorCode == kDNSServiceErr_NoError) {
 		// Use TXTRecord methods to resolve this
 		AWEzvContact	*contact = context;
@@ -881,7 +895,9 @@
 		[self updateContact:contact withData:data withHost:[NSString stringWithUTF8String:hosttarget] withInterface:interfaceIndex withPort:ntohs(port) av:YES];
 	} else {
 		AWEzvLog(@"Error resolving records");
-	}	
+	}
+	
+	[pool release];
 }
 
 #pragma mark mDNS Address Callback
@@ -891,12 +907,15 @@
 							uint16_t rdlen, const void *rdata, uint32_t ttl, void *context )
 // DNSServiceQueryRecord callback used to look up IP addresses.
 {
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+	
 	AWEzvContact	*contact = context;
 	AWEzvContactManager *self = [contact manager];
 
 	[self updateAddressForContact:contact addr:rdata addrLen:rdlen host:fullname interfaceIndex:interfaceIndex
 							 more:((flags & kDNSServiceFlagsMoreComing) != 0)];
 
+	[pool release];
 }
 
 #pragma mark mDNS Image Callback
@@ -906,6 +925,8 @@
 							uint16_t rdlen, const void *rdata, uint32_t ttl, void *context)
 // DNSServiceQueryRecord callback used to look up buddy icon.
 {
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+	
 	AWEzvContact	*contact = context;
 	AWEzvContactManager *self = [contact manager];
 	if (errorCode == kDNSServiceErr_NoError) {
@@ -913,6 +934,8 @@
 			[self updateImageForContact:contact data:rdata dataLen:rdlen more:((flags & kDNSServiceFlagsMoreComing) != 0)];
 		}
 	}
+	
+	[pool release];
 }
 
 #pragma mark Service Controller
@@ -926,6 +949,8 @@
 static void	ProcessSockData( CFSocketRef s, CFSocketCallBackType type, CFDataRef address, const void *data, void *info)
 // CFRunloop callback that notifies dns_sd when new data appears on a DNSServiceRef's socket.
 {
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+	
 	ServiceController *self = (ServiceController *)info;
 	AILogWithSignature(@"Processing result for %@", self);
 
@@ -953,6 +978,8 @@
 			DNSServiceRefSockFD(info), err, type, data);
 		}
 	}
+	
+	[pool release];
 }
 
 - (id) initWithServiceRef:(DNSServiceRef) ref forContactManager:(AWEzvContactManager *)inContactManager
--- a/Plugins/Dual Window Interface/AIMessageWindowController.m	Mon Aug 13 00:26:14 2012 +0200
+++ b/Plugins/Dual Window Interface/AIMessageWindowController.m	Thu Sep 06 00:18:31 2012 +0200
@@ -1007,7 +1007,7 @@
 	NSPoint tabOrigin = [tabView frame].origin;
 	tabOrigin.x += 10;
 	tabOrigin.y += 13;
-	[tabViewImage compositeToPoint:tabOrigin operation:NSCompositeSourceOver];
+	[tabViewImage drawAtPoint:tabOrigin fromRect:NSZeroRect operation:NSCompositeSourceOver fraction:1.0];
 	[viewImage unlockFocus];
 	
 	//draw over where the tab bar would usually be
--- a/Plugins/General Preferences/AIMessagePreferences.m	Mon Aug 13 00:26:14 2012 +0200
+++ b/Plugins/General Preferences/AIMessagePreferences.m	Thu Sep 06 00:18:31 2012 +0200
@@ -152,39 +152,57 @@
 #define RIGHTWARDS_ARROW		"\u2192"
 #define SHIFT_ARROW				"\u21E7"
 #define OPTION_KEY				"\u2325"
+#define TAB_KEY					"\u21E5"
 	
-	[menu addItemWithTitle:[NSString stringWithFormat:AILocalizedString(@"Arrows (%@ and %@)","Directional arrow keys word"), [NSString stringWithUTF8String:PLACE_OF_INTEREST_SIGN LEFTWARDS_ARROW], [NSString stringWithUTF8String:PLACE_OF_INTEREST_SIGN RIGHTWARDS_ARROW]]
+	[menu addItemWithTitle:[NSString stringWithFormat:AILocalizedString(@"Ctrl + Tab (%@ and %@)","Ctrl/Ctrl+Shift + Tab key word"),
+							[NSString stringWithUTF8String:"^" TAB_KEY],
+							[NSString stringWithUTF8String:"^" SHIFT_ARROW TAB_KEY]]
+					target:nil
+					action:nil
+			 keyEquivalent:@""
+					   tag:AICtrlTab];
+	
+	[menu addItemWithTitle:[NSString stringWithFormat:AILocalizedString(@"Arrows (%@ and %@)","Directional arrow keys word"),
+							[NSString stringWithUTF8String:PLACE_OF_INTEREST_SIGN LEFTWARDS_ARROW],
+							[NSString stringWithUTF8String:PLACE_OF_INTEREST_SIGN RIGHTWARDS_ARROW]]
 					target:nil
 					action:nil
 			 keyEquivalent:@""
 					   tag:AISwitchArrows];
 	
-	[menu addItemWithTitle:[NSString stringWithFormat:AILocalizedString(@"Shift + Arrows (%@ and %@)","Shift key word + Directional arrow keys word"), [NSString stringWithUTF8String:SHIFT_ARROW PLACE_OF_INTEREST_SIGN LEFTWARDS_ARROW], [NSString stringWithUTF8String:SHIFT_ARROW PLACE_OF_INTEREST_SIGN RIGHTWARDS_ARROW]]
+	[menu addItemWithTitle:[NSString stringWithFormat:AILocalizedString(@"Shift + Arrows (%@ and %@)","Shift key word + Directional arrow keys word"),
+							[NSString stringWithUTF8String:SHIFT_ARROW PLACE_OF_INTEREST_SIGN LEFTWARDS_ARROW],
+							[NSString stringWithUTF8String:SHIFT_ARROW PLACE_OF_INTEREST_SIGN RIGHTWARDS_ARROW]]
 					target:nil
 					action:nil
 			 keyEquivalent:@""
 					   tag:AISwitchShiftArrows];
 	
-	[menu addItemWithTitle:[NSString stringWithFormat:AILocalizedString(@"Option + Arrows (%@ and %@)","Option key word + Directional arrow keys word"), [NSString stringWithUTF8String:OPTION_KEY PLACE_OF_INTEREST_SIGN LEFTWARDS_ARROW], [NSString stringWithUTF8String:OPTION_KEY PLACE_OF_INTEREST_SIGN RIGHTWARDS_ARROW]]
+	[menu addItemWithTitle:[NSString stringWithFormat:AILocalizedString(@"Option + Arrows (%@ and %@)","Option key word + Directional arrow keys word"),
+							[NSString stringWithUTF8String:OPTION_KEY PLACE_OF_INTEREST_SIGN LEFTWARDS_ARROW],
+							[NSString stringWithUTF8String:OPTION_KEY PLACE_OF_INTEREST_SIGN RIGHTWARDS_ARROW]]
 					target:nil
 					action:nil
 			 keyEquivalent:@""
-					   tag:AIOptArrows];	
+					   tag:AIOptArrows];
 	
-	[menu addItemWithTitle:[NSString stringWithFormat:AILocalizedString(@"Brackets (%@ and %@)","Word for [ and ] keys"), [NSString stringWithUTF8String:PLACE_OF_INTEREST_SIGN "["], [NSString stringWithUTF8String:PLACE_OF_INTEREST_SIGN "]"]]
+	[menu addItemWithTitle:[NSString stringWithFormat:AILocalizedString(@"Brackets (%@ and %@)","Word for [ and ] keys"),
+							[NSString stringWithUTF8String:PLACE_OF_INTEREST_SIGN "["],
+							[NSString stringWithUTF8String:PLACE_OF_INTEREST_SIGN "]"]]
 					target:nil
 					action:nil
 			 keyEquivalent:@""
 					   tag:AIBrackets];
 	
-	[menu addItemWithTitle:[NSString stringWithFormat:AILocalizedString(@"Curly braces (%@ and %@)","Word for { and } keys"), [NSString stringWithUTF8String:PLACE_OF_INTEREST_SIGN "{"], [NSString stringWithUTF8String:PLACE_OF_INTEREST_SIGN "}"]]
+	[menu addItemWithTitle:[NSString stringWithFormat:AILocalizedString(@"Curly braces (%@ and %@)","Word for { and } keys"),
+							[NSString stringWithUTF8String:PLACE_OF_INTEREST_SIGN "{"],
+							[NSString stringWithUTF8String:PLACE_OF_INTEREST_SIGN "}"]]
 					target:nil
 					action:nil
 			 keyEquivalent:@""
 					   tag:AIBraces];
 	
-	
-	return [menu autorelease];		
+	return [menu autorelease];
 }
 
 - (NSMenu *)sendKeysMenu
@@ -209,7 +227,7 @@
 			 keyEquivalent:@""
 					   tag:AISendOnBoth];
 	
-	return [menu autorelease];		
+	return [menu autorelease];
 }
 
 - (NSMenu *)tabPositionMenu
--- a/Plugins/General Preferences/ESGeneralPreferences.m	Mon Aug 13 00:26:14 2012 +0200
+++ b/Plugins/General Preferences/ESGeneralPreferences.m	Thu Sep 06 00:18:31 2012 +0200
@@ -170,70 +170,6 @@
 #endif
 }
 
-/*!
- * @brief Construct our menu by hand for easy localization
- */
-- (NSMenu *)tabChangeKeysMenu
-{
-	NSMenu		*menu = [[NSMenu allocWithZone:[NSMenu menuZone]] init];
-#define PLACE_OF_INTEREST_SIGN	"\u2318"
-#define LEFTWARDS_ARROW			"\u2190"
-#define RIGHTWARDS_ARROW		"\u2192"
-#define SHIFT_ARROW				"\u21E7"
-#define OPTION_KEY				"\u2325"
-#define TAB_KEY					"\u21E5"
-	
-	[menu addItemWithTitle:[NSString stringWithFormat:AILocalizedString(@"Ctrl + Tab (%@ and %@)","Ctrl/Ctrl+Shift + Tab key word"),
-							[NSString stringWithUTF8String:"^" TAB_KEY],
-							[NSString stringWithUTF8String:"^" SHIFT_ARROW TAB_KEY]]
-					target:nil
-					action:nil
-			 keyEquivalent:@""
-					   tag:AICtrlTab];
-	
-	[menu addItemWithTitle:[NSString stringWithFormat:AILocalizedString(@"Arrows (%@ and %@)","Directional arrow keys word"),
-							[NSString stringWithUTF8String:PLACE_OF_INTEREST_SIGN LEFTWARDS_ARROW],
-							[NSString stringWithUTF8String:PLACE_OF_INTEREST_SIGN RIGHTWARDS_ARROW]]
-					target:nil
-					action:nil
-			 keyEquivalent:@""
-					   tag:AISwitchArrows];
-	
-	[menu addItemWithTitle:[NSString stringWithFormat:AILocalizedString(@"Shift + Arrows (%@ and %@)","Shift key word + Directional arrow keys word"),
-							[NSString stringWithUTF8String:SHIFT_ARROW PLACE_OF_INTEREST_SIGN LEFTWARDS_ARROW],
-							[NSString stringWithUTF8String:SHIFT_ARROW PLACE_OF_INTEREST_SIGN RIGHTWARDS_ARROW]]
-					target:nil
-					action:nil
-			 keyEquivalent:@""
-					   tag:AISwitchShiftArrows];
-	
-	[menu addItemWithTitle:[NSString stringWithFormat:AILocalizedString(@"Option + Arrows (%@ and %@)","Option key word + Directional arrow keys word"),
-							[NSString stringWithUTF8String:OPTION_KEY PLACE_OF_INTEREST_SIGN LEFTWARDS_ARROW],
-							[NSString stringWithUTF8String:OPTION_KEY PLACE_OF_INTEREST_SIGN RIGHTWARDS_ARROW]]
-					target:nil
-					action:nil
-			 keyEquivalent:@""
-					   tag:AIOptArrows];	
-	
-	[menu addItemWithTitle:[NSString stringWithFormat:AILocalizedString(@"Brackets (%@ and %@)","Word for [ and ] keys"),
-							[NSString stringWithUTF8String:PLACE_OF_INTEREST_SIGN "["],
-							[NSString stringWithUTF8String:PLACE_OF_INTEREST_SIGN "]"]]
-					target:nil
-					action:nil
-			 keyEquivalent:@""
-					   tag:AIBrackets];
-	
-	[menu addItemWithTitle:[NSString stringWithFormat:AILocalizedString(@"Curly braces (%@ and %@)","Word for { and } keys"),
-							[NSString stringWithUTF8String:PLACE_OF_INTEREST_SIGN "{"],
-							[NSString stringWithUTF8String:PLACE_OF_INTEREST_SIGN "}"]]
-					target:nil
-					action:nil
-			 keyEquivalent:@""
-					   tag:AIBraces];
-	
-	return [menu autorelease];		
-}
-
 - (BOOL)shortcutRecorder:(SRRecorderControl *)aRecorder isKeyCode:(signed short)keyCode andFlagsTaken:(NSUInteger)flags reason:(NSString **)aReason
 {
 	return NO;
--- a/Plugins/Purple Service/AIGTalkService.m	Mon Aug 13 00:26:14 2012 +0200
+++ b/Plugins/Purple Service/AIGTalkService.m	Thu Sep 06 00:18:31 2012 +0200
@@ -48,6 +48,14 @@
 - (NSString *)longDescription{
 	return @"Google Talk";
 }
+- (NSURL *)serviceAccountSetupURL
+{
+	return [NSURL URLWithString:AILocalizedString(@"https://www.google.com/accounts/NewAccount", @"URL for Google signup or about page. Replace with the URL to an equivalent page in your language if one exists.")];
+}
+- (NSString *)accountSetupLabel
+{
+	return AILocalizedString(@"Sign up for Google", @"Text for Google sign up button");
+}
 - (NSCharacterSet *)ignoredCharacters{
 	return [NSCharacterSet characterSetWithCharactersInString:@" "];
 }
--- a/Plugins/Purple Service/AILiveJournalService.m	Mon Aug 13 00:26:14 2012 +0200
+++ b/Plugins/Purple Service/AILiveJournalService.m	Thu Sep 06 00:18:31 2012 +0200
@@ -46,6 +46,16 @@
 	return @"LiveJournal";
 }
 
+- (NSURL *)serviceAccountSetupURL
+{
+	return [NSURL URLWithString:AILocalizedString(@"https://www.livejournal.com/create.bml", @"URL for LiveJournal signup or about page. Replace with the URL to an equivalent page in your language if one exists.")];
+}
+
+- (NSString *)accountSetupLabel
+{
+	return AILocalizedString(@"Sign up for LiveJournal", @"Text for LiveJournal sign up button");
+}
+
 - (NSCharacterSet *)ignoredCharacters{
 	return [NSCharacterSet characterSetWithCharactersInString:@" "];
 }
--- a/Plugins/Purple Service/AIMobileMeService.m	Mon Aug 13 00:26:14 2012 +0200
+++ b/Plugins/Purple Service/AIMobileMeService.m	Thu Sep 06 00:18:31 2012 +0200
@@ -55,6 +55,14 @@
 - (NSString *)userNameLabel{
     return AILocalizedString(@"Member Name",nil); //.Mac Member Name
 }
+- (NSURL *)serviceAccountSetupURL
+{
+	return [NSURL URLWithString:AILocalizedString(@"http://www.apple.com/mobileme/", @"URL for MobileMe signup or about page. Replace with the URL to an equivalent page in your language if one exists.")];
+}
+- (NSString *)accountSetupLabel
+{
+	return AILocalizedString(@"About MobileMe", @"Text for MobileMe sign up button");
+}
 /*!
  * @brief Default icon
  *
--- a/Plugins/Purple Service/AMPurpleJabberAdHocServer.m	Mon Aug 13 00:26:14 2012 +0200
+++ b/Plugins/Purple Service/AMPurpleJabberAdHocServer.m	Thu Sep 06 00:18:31 2012 +0200
@@ -27,14 +27,20 @@
 @implementation AMPurpleJabberAdHocServer
 
 static void AMPurpleJabberAdHocServer_received_data_cb(PurpleConnection *gc, xmlnode **packet, gpointer this) {
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+	
 	AMPurpleJabberAdHocServer *self = this;
 	PurpleAccount *account = [self.account purpleAccount];
 	if(purple_account_get_connection(account) == gc) {
-		if(strcmp((*packet)->name,"iq"))
+		if(strcmp((*packet)->name,"iq")) {
+			[pool release];
 			return;
+		}
 		const char *type = xmlnode_get_attrib(*packet,"type");
-		if(!type || strcmp(type,"set"))
+		if(!type || strcmp(type,"set")) {
+			[pool release];
 			return; // doesn't talk to us, probably the user interacting with some other adhoc node
+		}
 		const char *from = xmlnode_get_attrib(*packet,"from");
 		const char *iqid = xmlnode_get_attrib(*packet,"id");
 		xmlnode *command = xmlnode_get_child_with_namespace(*packet,"command","http://jabber.org/protocol/commands");
@@ -48,10 +54,13 @@
 			}
 		}
 	}
+	
+	[pool release];
 }
 
 /* we have to catch the reply to a disco#info for http://jabber.org/protocol/commands and insert our nodes */
 static void xmlnode_sent_cb(PurpleConnection *gc, xmlnode **packet, gpointer this) {
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 	xmlnode *xml = *packet;
 	AMPurpleJabberAdHocServer *self = this;
 	PurpleAccount *account = [self.account purpleAccount];
@@ -78,6 +87,7 @@
 			}
 		}
 	}
+	[pool release];
 }
 
 + (void)initialize {
--- a/Plugins/Purple Service/AMPurpleJabberNode.m	Mon Aug 13 00:26:14 2012 +0200
+++ b/Plugins/Purple Service/AMPurpleJabberNode.m	Thu Sep 06 00:18:31 2012 +0200
@@ -39,31 +39,48 @@
 @implementation AMPurpleJabberNode
 
 static void AMPurpleJabberNode_received_data_cb(PurpleConnection *gc, xmlnode **packet, gpointer this) {
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+	
 	AMPurpleJabberNode *self = (AMPurpleJabberNode*)this;
 	
 	// we're receiving *all* packets, so let's filter out those that don't concern us
 	const char *from = xmlnode_get_attrib(*packet, "from");
-	if (!from)
+	if (!from) {
+		[pool release];
 		return;
-	if (!(*packet)->name)
+	}
+	if (!(*packet)->name){
+		[pool release];
 		return;
+	}
 	const char *type = xmlnode_get_attrib(*packet, "type");
-	if (!type || (strcmp(type, "result") && strcmp(type, "error")))
+	if (!type || (strcmp(type, "result") && strcmp(type, "error"))){
+		[pool release];
 		return;
-	if (strcmp((*packet)->name, "iq"))
+	}
+	if (strcmp((*packet)->name, "iq")){
+		[pool release];
 		return;
-	if (![[NSString stringWithUTF8String:from] isEqualToString:self.jid])
+	}
+	if (![[NSString stringWithUTF8String:from] isEqualToString:self.jid]){
+		[pool release];
 		return;
+	}
 	xmlnode *query = xmlnode_get_child_with_namespace(*packet,"query","http://jabber.org/protocol/disco#info");
 	if (query) {
-		if (self.features || self.identities)
+		if (self.features || self.identities) {
+			[pool release];
 			return; // we already have that information
-		
+		}
 		const char *queryNode = xmlnode_get_attrib(query,"node");
-		if ((self.node && !queryNode) || (!self.node && queryNode))
+		if ((self.node && !queryNode) || (!self.node && queryNode)){
+			[pool release];
 			return;
-		if (queryNode && ![[NSString stringWithUTF8String:queryNode] isEqualToString:self.node])
+		}
+		if (queryNode && ![[NSString stringWithUTF8String:queryNode] isEqualToString:self.node]){
+			[pool release];
 			return;
+		}
 		
 		// it's us, fill in features and identities
 		NSMutableArray *identities = [NSMutableArray array];
@@ -117,19 +134,26 @@
 				[self.commandsNode fetchItems];
 			}
 		}
+		[pool release];
 		return;
 	}
 	
 	query = xmlnode_get_child_with_namespace(*packet,"query","http://jabber.org/protocol/disco#items");
 	if (query) {
-		if (self.itemsArray)
+		if (self.itemsArray) {
+			[pool release];
 			return; // we already have that info
+		}
 		
 		const char *checkNode = xmlnode_get_attrib(query,"node");
-		if ((self.node && !checkNode) || (!self.node && checkNode))
+		if ((self.node && !checkNode) || (!self.node && checkNode)) {
+			[pool release];
 			return;
-		if (checkNode && ![[NSString stringWithUTF8String:checkNode] isEqualToString:self.node])
+		}
+		if (checkNode && ![[NSString stringWithUTF8String:checkNode] isEqualToString:self.node]){ 
+			[pool release];
 			return;
+		}
 		
 		// it's us, create the subnodes
 		NSMutableArray *newItems = [NSMutableArray array];
@@ -174,6 +198,8 @@
 				[delegate jabberNodeGotItems:self];
 		}
 	}
+	
+	[pool release];
 }
 
 - (id)initWithJID:(NSString*)_jid node:(NSString*)_node name:(NSString*)_name connection:(PurpleConnection*)_gc {
--- a/Plugins/Purple Service/AMXMLConsoleController.m	Mon Aug 13 00:26:14 2012 +0200
+++ b/Plugins/Purple Service/AMXMLConsoleController.m	Thu Sep 06 00:18:31 2012 +0200
@@ -28,10 +28,14 @@
 static void
 xmlnode_received_cb(PurpleConnection *gc, xmlnode **packet, gpointer this)
 {
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+	
     AMXMLConsoleController *self = (AMXMLConsoleController *)this;
     
-    if (!this || [self gc] != gc)
-        return;
+    if (!this || [self gc] != gc) {
+		[pool release];
+		return;
+	}
     
 	char *str = xmlnode_to_formatted_str(*packet, NULL);
     NSString *sstr = [NSString stringWithUTF8String:str];
@@ -45,23 +49,30 @@
     [astr release];
     
 	g_free(str);
+	
+	[pool release];
 }
 
 static void
 xmlnode_sent_cb(PurpleConnection *gc, char **packet, gpointer this)
 {
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
     AMXMLConsoleController *self = (AMXMLConsoleController *)this;
 	xmlnode *node;
 
-    if (!this || [self gc] != gc)
-        return;
+    if (!this || [self gc] != gc) {
+		[pool release];
+		return;
+	}
 
 	node = ((*packet && strlen(*packet) && ((*packet)[0] == '<')) ?
 			xmlnode_from_str(*packet, -1) :
 			NULL);
 
-	if (!node)
+	if (!node) {
+		[pool release];
 		return;
+	}
 	
 	char *str = xmlnode_to_formatted_str(node, NULL);
     NSString *sstr = [NSString stringWithUTF8String:str];
@@ -76,6 +87,8 @@
     
 	g_free(str);
 	xmlnode_free(node);
+	
+	[pool release];
 }
 
 @implementation AMXMLConsoleController
--- a/Plugins/Purple Service/ESAIMService.m	Mon Aug 13 00:26:14 2012 +0200
+++ b/Plugins/Purple Service/ESAIMService.m	Thu Sep 06 00:18:31 2012 +0200
@@ -56,5 +56,13 @@
 - (NSString *)userNameLabel{
     return AILocalizedString(@"Screen Name",nil); //ScreenName
 }
+- (NSURL *)serviceAccountSetupURL
+{
+	return [NSURL URLWithString:AILocalizedString(@"https://new.aol.com/", @"URL for AIM signup or about page. Replace with the URL to an equivalent page in your language if one exists.")];
+}
+- (NSString *)accountSetupLabel
+{
+	return AILocalizedString(@"Sign up for AIM", @"Text for AIM sign up button");
+}
 
 @end
--- a/Plugins/Purple Service/ESICQService.m	Mon Aug 13 00:26:14 2012 +0200
+++ b/Plugins/Purple Service/ESICQService.m	Thu Sep 06 00:18:31 2012 +0200
@@ -61,6 +61,14 @@
 - (NSString *)userNameLabel{
     return AILocalizedString(@"ICQ Number",nil);    //ICQ#
 }
+- (NSURL *)serviceAccountSetupURL
+{
+	return [NSURL URLWithString:AILocalizedString(@"https://www.icq.com/join/", @"URL for ICQ signup or about page. Replace with the URL to an equivalent page in your language if one exists.")];
+}
+- (NSString *)accountSetupLabel
+{
+	return AILocalizedString(@"Sign up for ICQ", @"Text for ICQ sign up button");
+}
 
 - (void)registerStatuses{
 	[super registerStatuses];
--- a/Plugins/Purple Service/ESIRCService.m	Mon Aug 13 00:26:14 2012 +0200
+++ b/Plugins/Purple Service/ESIRCService.m	Thu Sep 06 00:18:31 2012 +0200
@@ -52,6 +52,14 @@
 - (NSString *)longDescription{
 	return AILocalizedString(@"IRC (Internet Relay Chat)", nil);
 }
+- (NSURL *)serviceAccountSetupURL
+{
+	return [NSURL URLWithString:AILocalizedString(@"http://en.wikipedia.org/wiki/Internet_Relay_Chat", @"URL for IRC signup or about page. Replace with the URL to an equivalent page in your language if one exists.")];
+}
+- (NSString *)accountSetupLabel
+{
+	return AILocalizedString(@"About IRC", @"Text for IRC sign up button");
+}
 - (NSCharacterSet *)allowedCharacters{
 	//Per RFC-2812: http://www.ietf.org/rfc/rfc2812.txt
 	NSMutableCharacterSet	*allowedCharacters = [[NSCharacterSet alphanumericCharacterSet] mutableCopy];
--- a/Plugins/Purple Service/ESMSNService.m	Mon Aug 13 00:26:14 2012 +0200
+++ b/Plugins/Purple Service/ESMSNService.m	Thu Sep 06 00:18:31 2012 +0200
@@ -66,6 +66,14 @@
 - (NSString *)userNameLabel{
     return AILocalizedString(@"MSN Passport","");    //Sign-in name
 }
+- (NSURL *)serviceAccountSetupURL
+{
+	return [NSURL URLWithString:AILocalizedString(@"http://www.passport.com/", @"URL for MSN signup or about page. Replace with the URL to an equivalent page in your language if one exists.")];
+}
+- (NSString *)accountSetupLabel
+{
+	return AILocalizedString(@"Sign up for Windows Live ID", @"Text for MSN sign up button");
+}
 
 - (void)registerStatuses{
 	[adium.statusController registerStatus:STATUS_NAME_AVAILABLE
--- a/Plugins/Purple Service/ESMeanwhileService.m	Mon Aug 13 00:26:14 2012 +0200
+++ b/Plugins/Purple Service/ESMeanwhileService.m	Thu Sep 06 00:18:31 2012 +0200
@@ -52,6 +52,14 @@
 - (NSString *)longDescription{
 	return @"Lotus Sametime";
 }
+- (NSURL *)serviceAccountSetupURL
+{
+	return [NSURL URLWithString:AILocalizedString(@"http://trac.adium.im/wiki/Sametime", @"URL for Sametime signup or about page. Replace with the URL to an equivalent page in your language if one exists.")];
+}
+- (NSString *)accountSetupLabel
+{
+	return AILocalizedString(@"About Sametime", @"Text for Lotus Sametime sign up button");
+}
 - (NSCharacterSet *)allowedCharacters{
 	NSMutableCharacterSet	*allowedCharacters = [[NSCharacterSet alphanumericCharacterSet] mutableCopy];
 	NSCharacterSet			*returnSet;
--- a/Plugins/Purple Service/ESPurpleJabberAccountViewController.m	Mon Aug 13 00:26:14 2012 +0200
+++ b/Plugins/Purple Service/ESPurpleJabberAccountViewController.m	Thu Sep 06 00:18:31 2012 +0200
@@ -90,8 +90,9 @@
 	NSString *defaultGroup = [account preferenceForKey:KEY_JABBER_SUBSCRIPTION_GROUP group:GROUP_ACCOUNT_STATUS];
 	[comboBox_subscriptionGroup setStringValue:(defaultGroup ? defaultGroup : @"")];
 	
-	//Hide the register button if the account can't register new accounts
-	[button_register setHidden:![account.service canRegisterNewAccounts]];
+	//Change the register button into sign up if the account can't register new accounts
+	if (![account.service canRegisterNewAccounts])
+		[button_register setAction:@selector(signUpAccount:)];
 	
 	//Set hidden flag of the default group combobox
 	[self subscriptionModeDidChange:nil];
--- a/Plugins/Purple Service/ESYahooJapanService.m	Mon Aug 13 00:26:14 2012 +0200
+++ b/Plugins/Purple Service/ESYahooJapanService.m	Thu Sep 06 00:18:31 2012 +0200
@@ -59,5 +59,13 @@
 - (AIServiceImportance)serviceImportance{
 	return AIServiceSecondary;
 }
+- (NSURL *)serviceAccountSetupURL
+{
+	return [NSURL URLWithString:AILocalizedString(@"https://account.edit.yahoo.co.jp/registration", @"URL for Yahoo! Japan signup or about page. Replace with the URL to an equivalent page in your language if one exists.")];
+}
+- (NSString *)accountSetupLabel
+{
+	return AILocalizedString(@"Sign up for Yahoo! Japan", @"Text for Yahoo! Japan sign up button");
+}
 
 @end
--- a/Plugins/Purple Service/ESYahooService.m	Mon Aug 13 00:26:14 2012 +0200
+++ b/Plugins/Purple Service/ESYahooService.m	Thu Sep 06 00:18:31 2012 +0200
@@ -70,6 +70,14 @@
 - (NSString *)userNameLabel{
     return AILocalizedString(@"Yahoo! ID",nil);    //Yahoo! ID
 }
+- (NSURL *)serviceAccountSetupURL
+{
+	return [NSURL URLWithString:AILocalizedString(@"https://edit.yahoo.com/registration", @"URL for Yahoo! signup or about page. Replace with the URL to an equivalent page in your language if one exists.")];
+}
+- (NSString *)accountSetupLabel
+{
+	return AILocalizedString(@"Sign up for Yahoo!", @"Text for Yahoo! sign up button");
+}
 - (void)registerStatuses{
 	[adium.statusController registerStatus:STATUS_NAME_AVAILABLE
 							 withDescription:[adium.statusController localizedDescriptionForCoreStatusName:STATUS_NAME_AVAILABLE]
--- a/Plugins/Purple Service/ESZephyrService.m	Mon Aug 13 00:26:14 2012 +0200
+++ b/Plugins/Purple Service/ESZephyrService.m	Thu Sep 06 00:18:31 2012 +0200
@@ -51,6 +51,14 @@
 - (NSString *)longDescription{
 	return @"Zephyr";
 }
+- (NSURL *)serviceAccountSetupURL
+{
+	return [NSURL URLWithString:AILocalizedString(@"http://trac.adium.im/wiki/Zephyr", @"URL for Zephyr signup or about page. Replace with the URL to an equivalent page in your language if one exists.")];
+}
+- (NSString *)accountSetupLabel
+{
+	return AILocalizedString(@"About Zephyr", @"Text for Zephyr sign up button");
+}
 - (NSCharacterSet *)allowedCharacters{
 	return [NSCharacterSet characterSetWithCharactersInString:@"+abcdefghijklmnopqrstuvwxyz0123456789._@-"];
 }
--- a/Plugins/Purple Service/PurpleMySpaceService.m	Mon Aug 13 00:26:14 2012 +0200
+++ b/Plugins/Purple Service/PurpleMySpaceService.m	Thu Sep 06 00:18:31 2012 +0200
@@ -69,6 +69,14 @@
 - (NSString *)contactUserNameLabel{
 	return AILocalizedString(@"MySpace ID", "Label for the username for a MySpace contact");
 }
+- (NSURL *)serviceAccountSetupURL
+{
+	return [NSURL URLWithString:AILocalizedString(@"https://www.myspace.com/signup", @"URL for MySpace signup or about page. Replace with the URL to an equivalent page in your language if one exists.")];
+}
+- (NSString *)accountSetupLabel
+{
+	return AILocalizedString(@"Sign up for MySpace", @"Text for MySpace sign up button");
+}
 - (void)registerStatuses{
 	[adium.statusController registerStatus:STATUS_NAME_AVAILABLE
 							 withDescription:[adium.statusController localizedDescriptionForCoreStatusName:STATUS_NAME_AVAILABLE]
--- a/Plugins/Purple Service/Resources/en.lproj/ESIRCAccountView.xib	Mon Aug 13 00:26:14 2012 +0200
+++ b/Plugins/Purple Service/Resources/en.lproj/ESIRCAccountView.xib	Thu Sep 06 00:18:31 2012 +0200
@@ -2,30 +2,30 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
 	<data>
 		<int key="IBDocument.SystemTarget">1060</int>
-		<string key="IBDocument.SystemVersion">11D50b</string>
-		<string key="IBDocument.InterfaceBuilderVersion">2182</string>
-		<string key="IBDocument.AppKitVersion">1138.32</string>
-		<string key="IBDocument.HIToolboxVersion">568.00</string>
+		<string key="IBDocument.SystemVersion">12A269</string>
+		<string key="IBDocument.InterfaceBuilderVersion">2549</string>
+		<string key="IBDocument.AppKitVersion">1187</string>
+		<string key="IBDocument.HIToolboxVersion">624.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">2182</string>
+			<string key="NS.object.0">2549</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
-			<string>NSPopUpButton</string>
-			<string>NSScroller</string>
+			<string>NSBox</string>
 			<string>NSButton</string>
-			<string>NSMenu</string>
-			<string>NSTextFieldCell</string>
 			<string>NSButtonCell</string>
-			<string>NSMenuItem</string>
-			<string>NSBox</string>
-			<string>NSScrollView</string>
 			<string>NSCustomObject</string>
 			<string>NSCustomView</string>
+			<string>NSMenu</string>
+			<string>NSMenuItem</string>
+			<string>NSPopUpButton</string>
 			<string>NSPopUpButtonCell</string>
+			<string>NSScrollView</string>
+			<string>NSScroller</string>
+			<string>NSTextField</string>
+			<string>NSTextFieldCell</string>
+			<string>NSTextView</string>
 			<string>NSUserDefaultsController</string>
-			<string>NSTextField</string>
-			<string>NSTextView</string>
 		</array>
 		<array key="IBDocument.PluginDependencies">
 			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -45,24 +45,46 @@
 				<string key="NSClassName">NSApplication</string>
 			</object>
 			<object class="NSCustomView" id="435457756">
-				<nil key="NSNextResponder"/>
+				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">256</int>
 				<array class="NSMutableArray" key="NSSubviews">
-					<object class="NSTextField" id="61616150">
+					<object class="NSButton" id="34223648">
 						<reference key="NSNextResponder" ref="435457756"/>
-						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{-70, 2}, {140, 17}}</string>
+						<int key="NSvFlags">268</int>
+						<string key="NSFrame">{{105, 21}, {104, 32}}</string>
 						<reference key="NSSuperview" ref="435457756"/>
 						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="168366984">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">71303168</int>
-							<string key="NSContents">Password:</string>
+						<object class="NSButtonCell" key="NSCell" id="1021946772">
+							<int key="NSCellFlags">67108864</int>
+							<int key="NSCellFlags2">134217728</int>
+							<string key="NSContents">About IRC</string>
 							<object class="NSFont" key="NSSupport" id="519844858">
 								<string key="NSName">LucidaGrande</string>
 								<double key="NSSize">13</double>
 								<int key="NSfFlags">1044</int>
 							</object>
+							<reference key="NSControlView" ref="34223648"/>
+							<int key="NSButtonFlags">-2038284288</int>
+							<int key="NSButtonFlags2">129</int>
+							<string key="NSAlternateContents"/>
+							<string key="NSKeyEquivalent"/>
+							<int key="NSPeriodicDelay">200</int>
+							<int key="NSPeriodicInterval">25</int>
+						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+					</object>
+					<object class="NSTextField" id="61616150">
+						<reference key="NSNextResponder" ref="435457756"/>
+						<int key="NSvFlags">264</int>
+						<string key="NSFrame">{{-70, 71}, {140, 17}}</string>
+						<reference key="NSSuperview" ref="435457756"/>
+						<reference key="NSNextKeyView" ref="1056291757"/>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSTextFieldCell" key="NSCell" id="168366984">
+							<int key="NSCellFlags">67108864</int>
+							<int key="NSCellFlags2">71303168</int>
+							<string key="NSContents">Password:</string>
+							<reference key="NSSupport" ref="519844858"/>
 							<reference key="NSControlView" ref="61616150"/>
 							<object class="NSColor" key="NSBackgroundColor" id="362650998">
 								<int key="NSColorSpace">6</int>
@@ -83,15 +105,17 @@
 								</object>
 							</object>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="338540049">
 						<reference key="NSNextResponder" ref="435457756"/>
 						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{-70, 58}, {140, 17}}</string>
+						<string key="NSFrame">{{-70, 127}, {140, 17}}</string>
 						<reference key="NSSuperview" ref="435457756"/>
+						<reference key="NSNextKeyView" ref="293498471"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="529365231">
-							<int key="NSCellFlags">67239424</int>
+							<int key="NSCellFlags">67108864</int>
 							<int key="NSCellFlags2">71303168</int>
 							<string key="NSContents">Nick:</string>
 							<reference key="NSSupport" ref="519844858"/>
@@ -99,15 +123,17 @@
 							<reference key="NSBackgroundColor" ref="362650998"/>
 							<reference key="NSTextColor" ref="973291263"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="293498471">
 						<reference key="NSNextResponder" ref="435457756"/>
 						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{75, 56}, {240, 22}}</string>
+						<string key="NSFrame">{{75, 125}, {240, 22}}</string>
 						<reference key="NSSuperview" ref="435457756"/>
+						<reference key="NSNextKeyView" ref="686912789"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="100685907">
-							<int key="NSCellFlags">-1804468671</int>
+							<int key="NSCellFlags">-1804599231</int>
 							<int key="NSCellFlags2">4195328</int>
 							<string key="NSContents"/>
 							<reference key="NSSupport" ref="519844858"/>
@@ -130,15 +156,17 @@
 								<reference key="NSColor" ref="222397255"/>
 							</object>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="1056291757">
 						<reference key="NSNextResponder" ref="435457756"/>
 						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{75, 0}, {240, 22}}</string>
+						<string key="NSFrame">{{75, 69}, {240, 22}}</string>
 						<reference key="NSSuperview" ref="435457756"/>
+						<reference key="NSNextKeyView" ref="34223648"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="168319061">
-							<int key="NSCellFlags">-1804468671</int>
+							<int key="NSCellFlags">-1804599231</int>
 							<int key="NSCellFlags2">4195328</int>
 							<string key="NSContents"/>
 							<reference key="NSSupport" ref="519844858"/>
@@ -148,15 +176,17 @@
 							<reference key="NSBackgroundColor" ref="908035941"/>
 							<reference key="NSTextColor" ref="480039168"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="776534054">
 						<reference key="NSNextResponder" ref="435457756"/>
 						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{75, 28}, {240, 22}}</string>
+						<string key="NSFrame">{{75, 97}, {240, 22}}</string>
 						<reference key="NSSuperview" ref="435457756"/>
+						<reference key="NSNextKeyView" ref="61616150"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="944679228">
-							<int key="NSCellFlags">-1804468671</int>
+							<int key="NSCellFlags">-1804599231</int>
 							<int key="NSCellFlags2">4195328</int>
 							<string key="NSContents"/>
 							<reference key="NSSupport" ref="519844858"/>
@@ -166,15 +196,17 @@
 							<reference key="NSBackgroundColor" ref="908035941"/>
 							<reference key="NSTextColor" ref="480039168"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="686912789">
 						<reference key="NSNextResponder" ref="435457756"/>
 						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{-2, 30}, {72, 17}}</string>
+						<string key="NSFrame">{{-2, 99}, {72, 17}}</string>
 						<reference key="NSSuperview" ref="435457756"/>
+						<reference key="NSNextKeyView" ref="776534054"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="467150157">
-							<int key="NSCellFlags">67239424</int>
+							<int key="NSCellFlags">67108864</int>
 							<int key="NSCellFlags2">71303168</int>
 							<string key="NSContents">Hostname:</string>
 							<reference key="NSSupport" ref="519844858"/>
@@ -182,9 +214,12 @@
 							<reference key="NSBackgroundColor" ref="362650998"/>
 							<reference key="NSTextColor" ref="973291263"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 				</array>
-				<string key="NSFrameSize">{315, 78}</string>
+				<string key="NSFrameSize">{315, 147}</string>
+				<reference key="NSSuperview"/>
+				<reference key="NSNextKeyView" ref="338540049"/>
 				<object class="NSMutableString" key="NSClassName">
 					<characters key="NS.bytes">NSView</characters>
 				</object>
@@ -201,12 +236,12 @@
 						<reference key="NSSuperview" ref="452063308"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="800272095">
-							<int key="NSCellFlags">67239424</int>
+							<int key="NSCellFlags">67108864</int>
 							<int key="NSCellFlags2">0</int>
 							<string key="NSContents">Encrypt connection using SSL</string>
 							<reference key="NSSupport" ref="519844858"/>
 							<reference key="NSControlView" ref="555515098"/>
-							<int key="NSButtonFlags">1211912703</int>
+							<int key="NSButtonFlags">1211912448</int>
 							<int key="NSButtonFlags2">2</int>
 							<object class="NSCustomResource" key="NSNormalImage">
 								<string key="NSClassName">NSImage</string>
@@ -220,6 +255,7 @@
 							<int key="NSPeriodicDelay">200</int>
 							<int key="NSPeriodicInterval">25</int>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="483390078">
 						<reference key="NSNextResponder" ref="452063308"/>
@@ -228,7 +264,7 @@
 						<reference key="NSSuperview" ref="452063308"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="48078552">
-							<int key="NSCellFlags">-1804468671</int>
+							<int key="NSCellFlags">-1804599231</int>
 							<int key="NSCellFlags2">4195328</int>
 							<string key="NSContents">6667</string>
 							<reference key="NSSupport" ref="519844858"/>
@@ -237,6 +273,7 @@
 							<reference key="NSBackgroundColor" ref="908035941"/>
 							<reference key="NSTextColor" ref="480039168"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="126637142">
 						<reference key="NSNextResponder" ref="452063308"/>
@@ -245,7 +282,7 @@
 						<reference key="NSSuperview" ref="452063308"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="959263435">
-							<int key="NSCellFlags">67239424</int>
+							<int key="NSCellFlags">67108864</int>
 							<int key="NSCellFlags2">71303168</int>
 							<string key="NSContents">Port:</string>
 							<reference key="NSSupport" ref="519844858"/>
@@ -253,6 +290,7 @@
 							<reference key="NSBackgroundColor" ref="362650998"/>
 							<reference key="NSTextColor" ref="973291263"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSBox" id="1073695900">
 						<reference key="NSNextResponder" ref="452063308"/>
@@ -269,7 +307,7 @@
 										<reference key="NSSuperview" ref="415314997"/>
 										<bool key="NSEnabled">YES</bool>
 										<object class="NSTextFieldCell" key="NSCell" id="998603586">
-											<int key="NSCellFlags">68288064</int>
+											<int key="NSCellFlags">68157504</int>
 											<int key="NSCellFlags2">272761856</int>
 											<string key="NSContents">One per line, / is optional. $me will be replaced with your current nickname.</string>
 											<object class="NSFont" key="NSSupport" id="26">
@@ -281,6 +319,7 @@
 											<reference key="NSBackgroundColor" ref="362650998"/>
 											<reference key="NSTextColor" ref="973291263"/>
 										</object>
+										<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 									</object>
 									<object class="NSScrollView" id="631954034">
 										<reference key="NSNextResponder" ref="415314997"/>
@@ -313,7 +352,7 @@
 															<string>WebURLsWithTitlesPboardType</string>
 															<string>public.url</string>
 														</set>
-														<string key="NSFrameSize">{394, 54}</string>
+														<string key="NSFrameSize">{409, 131}</string>
 														<reference key="NSSuperview" ref="177143147"/>
 														<object class="NSTextContainer" key="NSTextContainer" id="492114278">
 															<object class="NSLayoutManager" key="NSLayoutManager">
@@ -326,15 +365,15 @@
 																<array class="NSMutableArray" key="NSTextContainers">
 																	<reference ref="492114278"/>
 																</array>
-																<int key="NSLMFlags">6</int>
+																<int key="NSLMFlags">38</int>
 																<nil key="NSDelegate"/>
 															</object>
 															<reference key="NSTextView" ref="675070719"/>
-															<double key="NSWidth">394</double>
+															<double key="NSWidth">409</double>
 															<int key="NSTCFlags">1</int>
 														</object>
 														<object class="NSTextViewSharedData" key="NSSharedData">
-															<int key="NSFlags">100675331</int>
+															<int key="NSFlags">67120899</int>
 															<int key="NSTextCheckingTypes">0</int>
 															<nil key="NSMarkedAttributes"/>
 															<reference key="NSBackgroundColor" ref="728071217"/>
@@ -366,11 +405,10 @@
 														</object>
 														<int key="NSTVFlags">6</int>
 														<string key="NSMaxSize">{463, 10000000}</string>
-														<string key="NSMinize">{223, 54}</string>
 														<nil key="NSDelegate"/>
 													</object>
 												</array>
-												<string key="NSFrame">{{1, 1}, {394, 131}}</string>
+												<string key="NSFrame">{{1, 1}, {409, 131}}</string>
 												<reference key="NSSuperview" ref="631954034"/>
 												<reference key="NSNextKeyView" ref="675070719"/>
 												<reference key="NSDocView" ref="675070719"/>
@@ -404,8 +442,9 @@
 											<object class="NSScroller" id="80775918">
 												<reference key="NSNextResponder" ref="631954034"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{395, 1}, {15, 128}}</string>
+												<string key="NSFrame">{{394, 1}, {16, 131}}</string>
 												<reference key="NSSuperview" ref="631954034"/>
+												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 												<reference key="NSTarget" ref="631954034"/>
 												<string key="NSAction">_doScroller:</string>
 												<double key="NSPercent">0.98639458417892456</double>
@@ -415,6 +454,7 @@
 												<int key="NSvFlags">-2147483392</int>
 												<string key="NSFrame">{{-100, -100}, {410, 15}}</string>
 												<reference key="NSSuperview" ref="631954034"/>
+												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 												<int key="NSsFlags">1</int>
 												<reference key="NSTarget" ref="631954034"/>
 												<string key="NSAction">_doScroller:</string>
@@ -429,6 +469,9 @@
 										<reference key="NSVScroller" ref="80775918"/>
 										<reference key="NSHScroller" ref="730671956"/>
 										<reference key="NSContentView" ref="177143147"/>
+										<double key="NSMinMagnification">0.25</double>
+										<double key="NSMaxMagnification">4</double>
+										<double key="NSMagnification">1</double>
 									</object>
 								</array>
 								<string key="NSFrame">{{1, 1}, {443, 182}}</string>
@@ -439,7 +482,7 @@
 						<reference key="NSSuperview" ref="452063308"/>
 						<string key="NSOffsets">{0, 0}</string>
 						<object class="NSTextFieldCell" key="NSTitleCell">
-							<int key="NSCellFlags">67239424</int>
+							<int key="NSCellFlags">67108864</int>
 							<int key="NSCellFlags2">0</int>
 							<string key="NSContents">Execute commands on connect:</string>
 							<reference key="NSSupport" ref="26"/>
@@ -462,7 +505,7 @@
 						<reference key="NSSuperview" ref="452063308"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="401598992">
-							<int key="NSCellFlags">67239424</int>
+							<int key="NSCellFlags">67108864</int>
 							<int key="NSCellFlags2">71303168</int>
 							<string key="NSContents">Encoding:</string>
 							<reference key="NSSupport" ref="519844858"/>
@@ -470,6 +513,7 @@
 							<reference key="NSBackgroundColor" ref="362650998"/>
 							<reference key="NSTextColor" ref="973291263"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSPopUpButton" id="516232674">
 						<reference key="NSNextResponder" ref="452063308"/>
@@ -478,11 +522,11 @@
 						<reference key="NSSuperview" ref="452063308"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSPopUpButtonCell" key="NSCell" id="742110663">
-							<int key="NSCellFlags">-2076049856</int>
+							<int key="NSCellFlags">-2076180416</int>
 							<int key="NSCellFlags2">1024</int>
 							<reference key="NSSupport" ref="519844858"/>
 							<reference key="NSControlView" ref="516232674"/>
-							<int key="NSButtonFlags">109199615</int>
+							<int key="NSButtonFlags">109199360</int>
 							<int key="NSButtonFlags2">1</int>
 							<object class="NSFont" key="NSAlternateImage">
 								<string key="NSName">LucidaGrande</string>
@@ -529,6 +573,7 @@
 							<bool key="NSAltersState">YES</bool>
 							<int key="NSArrowPosition">1</int>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 				</array>
 				<string key="NSFrameSize">{440, 258}</string>
@@ -546,7 +591,7 @@
 						<reference key="NSSuperview" ref="74526372"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="776148770">
-							<int key="NSCellFlags">-1804468671</int>
+							<int key="NSCellFlags">-1804599231</int>
 							<int key="NSCellFlags2">272630784</int>
 							<string key="NSContents"/>
 							<reference key="NSSupport" ref="519844858"/>
@@ -555,6 +600,7 @@
 							<reference key="NSBackgroundColor" ref="908035941"/>
 							<reference key="NSTextColor" ref="480039168"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="624208036">
 						<reference key="NSNextResponder" ref="74526372"/>
@@ -563,7 +609,7 @@
 						<reference key="NSSuperview" ref="74526372"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="506000866">
-							<int key="NSCellFlags">68288064</int>
+							<int key="NSCellFlags">68157504</int>
 							<int key="NSCellFlags2">272630784</int>
 							<string key="NSContents">Realname:</string>
 							<reference key="NSSupport" ref="519844858"/>
@@ -571,6 +617,7 @@
 							<reference key="NSBackgroundColor" ref="362650998"/>
 							<reference key="NSTextColor" ref="973291263"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="982561313">
 						<reference key="NSNextResponder" ref="74526372"/>
@@ -579,7 +626,7 @@
 						<reference key="NSSuperview" ref="74526372"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="482371912">
-							<int key="NSCellFlags">-1804468671</int>
+							<int key="NSCellFlags">-1804599231</int>
 							<int key="NSCellFlags2">272630784</int>
 							<string key="NSContents"/>
 							<reference key="NSSupport" ref="519844858"/>
@@ -588,6 +635,7 @@
 							<reference key="NSBackgroundColor" ref="908035941"/>
 							<reference key="NSTextColor" ref="480039168"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="783628705">
 						<reference key="NSNextResponder" ref="74526372"/>
@@ -596,7 +644,7 @@
 						<reference key="NSSuperview" ref="74526372"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="433076903">
-							<int key="NSCellFlags">68288064</int>
+							<int key="NSCellFlags">68157504</int>
 							<int key="NSCellFlags2">272630784</int>
 							<string key="NSContents">Username (Ident):</string>
 							<reference key="NSSupport" ref="519844858"/>
@@ -604,6 +652,7 @@
 							<reference key="NSBackgroundColor" ref="362650998"/>
 							<reference key="NSTextColor" ref="973291263"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 				</array>
 				<string key="NSFrameSize">{340, 57}</string>
@@ -767,6 +816,22 @@
 					</object>
 					<int key="connectionID">320</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">button_SignUp</string>
+						<reference key="source" ref="595730279"/>
+						<reference key="destination" ref="34223648"/>
+					</object>
+					<int key="connectionID">361</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">signUpAccount:</string>
+						<reference key="source" ref="595730279"/>
+						<reference key="destination" ref="34223648"/>
+					</object>
+					<int key="connectionID">362</int>
+				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@@ -804,6 +869,7 @@
 							<reference ref="1056291757"/>
 							<reference ref="776534054"/>
 							<reference ref="686912789"/>
+							<reference ref="34223648"/>
 						</array>
 						<reference key="parent" ref="0"/>
 						<string key="objectName">Setup</string>
@@ -1098,6 +1164,19 @@
 						<reference key="object" ref="675070719"/>
 						<reference key="parent" ref="631954034"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">342</int>
+						<reference key="object" ref="34223648"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1021946772"/>
+						</array>
+						<reference key="parent" ref="435457756"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">343</int>
+						<reference key="object" ref="1021946772"/>
+						<reference key="parent" ref="34223648"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -1150,209 +1229,17 @@
 				<boolean value="YES" key="340.IBShouldRemoveOnLegacySave"/>
 				<string key="341.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="YES" key="341.IBShouldRemoveOnLegacySave"/>
+				<string key="342.CustomClassName">AILocalizationButton</string>
+				<string key="342.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="343.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 			</dictionary>
 			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">341</int>
+			<int key="maxID">362</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">AIAccountViewController</string>
-					<string key="superclassName">NSObject</string>
-					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">changedPreference:</string>
-						<string key="NS.object.0">id</string>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<string key="NS.key.0">changedPreference:</string>
-						<object class="IBActionInfo" key="NS.object.0">
-							<string key="name">changedPreference:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</object>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="checkBox_checkMail">NSButton</string>
-						<string key="checkBox_sendTyping">NSButton</string>
-						<string key="label_alias">NSTextField</string>
-						<string key="label_encryption">NSTextField</string>
-						<string key="label_password">NSTextField</string>
-						<string key="label_port">NSTextField</string>
-						<string key="label_server">NSTextField</string>
-						<string key="label_typing">NSTextField</string>
-						<string key="popUp_encryption">NSPopUpButton</string>
-						<string key="progressIndicator_registering">NSProgressIndicator</string>
-						<string key="textField_accountUID">NSTextField</string>
-						<string key="textField_accountUIDLabel">NSTextField</string>
-						<string key="textField_alias">NSTextField</string>
-						<string key="textField_connectHost">NSTextField</string>
-						<string key="textField_connectPort">NSTextField</string>
-						<string key="textField_password">NSTextField</string>
-						<string key="textField_registering">NSTextField</string>
-						<string key="view_auxiliaryTabView">NSTabView</string>
-						<string key="view_options">NSView</string>
-						<string key="view_privacy">NSView</string>
-						<string key="view_profile">NSView</string>
-						<string key="view_setup">NSView</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="checkBox_checkMail">
-							<string key="name">checkBox_checkMail</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="checkBox_sendTyping">
-							<string key="name">checkBox_sendTyping</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="label_alias">
-							<string key="name">label_alias</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="label_encryption">
-							<string key="name">label_encryption</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="label_password">
-							<string key="name">label_password</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="label_port">
-							<string key="name">label_port</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="label_server">
-							<string key="name">label_server</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="label_typing">
-							<string key="name">label_typing</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="popUp_encryption">
-							<string key="name">popUp_encryption</string>
-							<string key="candidateClassName">NSPopUpButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="progressIndicator_registering">
-							<string key="name">progressIndicator_registering</string>
-							<string key="candidateClassName">NSProgressIndicator</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="textField_accountUID">
-							<string key="name">textField_accountUID</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="textField_accountUIDLabel">
-							<string key="name">textField_accountUIDLabel</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="textField_alias">
-							<string key="name">textField_alias</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="textField_connectHost">
-							<string key="name">textField_connectHost</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="textField_connectPort">
-							<string key="name">textField_connectPort</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="textField_password">
-							<string key="name">textField_password</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="textField_registering">
-							<string key="name">textField_registering</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="view_auxiliaryTabView">
-							<string key="name">view_auxiliaryTabView</string>
-							<string key="candidateClassName">NSTabView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="view_options">
-							<string key="name">view_options</string>
-							<string key="candidateClassName">NSView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="view_privacy">
-							<string key="name">view_privacy</string>
-							<string key="candidateClassName">NSView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="view_profile">
-							<string key="name">view_profile</string>
-							<string key="candidateClassName">NSView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="view_setup">
-							<string key="name">view_setup</string>
-							<string key="candidateClassName">NSView</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/AIAccountViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">ESIRCAccountViewController</string>
-					<string key="superclassName">PurpleAccountViewController</string>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="checkbox_useSSL">NSButton</string>
-						<string key="popUp_encoding">NSPopUpButton</string>
-						<string key="textField_realname">NSTextField</string>
-						<string key="textField_username">NSTextField</string>
-						<string key="textView_commands">NSTextView</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="checkbox_useSSL">
-							<string key="name">checkbox_useSSL</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="popUp_encoding">
-							<string key="name">popUp_encoding</string>
-							<string key="candidateClassName">NSPopUpButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="textField_realname">
-							<string key="name">textField_realname</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="textField_username">
-							<string key="name">textField_username</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="textView_commands">
-							<string key="name">textView_commands</string>
-							<string key="candidateClassName">NSTextView</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/ESIRCAccountViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">PurpleAccountViewController</string>
-					<string key="superclassName">AIAccountViewController</string>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="checkBox_broadcastMusic">NSButton</string>
-						<string key="checkBox_displayCustomEmoticons">NSButton</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="checkBox_broadcastMusic">
-							<string key="name">checkBox_broadcastMusic</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="checkBox_displayCustomEmoticons">
-							<string key="name">checkBox_displayCustomEmoticons</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/PurpleAccountViewController.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
--- a/Plugins/Purple Service/Resources/en.lproj/ESPurpleGaduGaduAccountView.xib	Mon Aug 13 00:26:14 2012 +0200
+++ b/Plugins/Purple Service/Resources/en.lproj/ESPurpleGaduGaduAccountView.xib	Thu Sep 06 00:18:31 2012 +0200
@@ -2,25 +2,25 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
 	<data>
 		<int key="IBDocument.SystemTarget">1060</int>
-		<string key="IBDocument.SystemVersion">11D50b</string>
-		<string key="IBDocument.InterfaceBuilderVersion">2182</string>
-		<string key="IBDocument.AppKitVersion">1138.32</string>
-		<string key="IBDocument.HIToolboxVersion">568.00</string>
+		<string key="IBDocument.SystemVersion">12A269</string>
+		<string key="IBDocument.InterfaceBuilderVersion">2549</string>
+		<string key="IBDocument.AppKitVersion">1187</string>
+		<string key="IBDocument.HIToolboxVersion">624.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">2182</string>
+			<string key="NS.object.0">2549</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
-			<string>NSTextField</string>
-			<string>NSTextFieldCell</string>
+			<string>NSButton</string>
+			<string>NSButtonCell</string>
+			<string>NSCustomObject</string>
+			<string>NSCustomView</string>
 			<string>NSMenu</string>
 			<string>NSMenuItem</string>
 			<string>NSPopUpButton</string>
-			<string>NSCustomView</string>
 			<string>NSPopUpButtonCell</string>
-			<string>NSButtonCell</string>
-			<string>NSButton</string>
-			<string>NSCustomObject</string>
+			<string>NSTextField</string>
+			<string>NSTextFieldCell</string>
 		</array>
 		<array key="IBDocument.PluginDependencies">
 			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -40,7 +40,7 @@
 				<string key="NSClassName">NSApplication</string>
 			</object>
 			<object class="NSCustomView" id="622546761">
-				<nil key="NSNextResponder"/>
+				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">256</int>
 				<array class="NSMutableArray" key="NSSubviews">
 					<object class="NSPopUpButton" id="84944475">
@@ -50,7 +50,7 @@
 						<reference key="NSSuperview" ref="622546761"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSPopUpButtonCell" key="NSCell" id="1009893757">
-							<int key="NSCellFlags">-2076049856</int>
+							<int key="NSCellFlags">-2076180416</int>
 							<int key="NSCellFlags2">1024</int>
 							<object class="NSFont" key="NSSupport" id="1010868710">
 								<string key="NSName">LucidaGrande</string>
@@ -58,7 +58,7 @@
 								<int key="NSfFlags">1044</int>
 							</object>
 							<reference key="NSControlView" ref="84944475"/>
-							<int key="NSButtonFlags">109199615</int>
+							<int key="NSButtonFlags">109199360</int>
 							<int key="NSButtonFlags2">1</int>
 							<reference key="NSAlternateImage" ref="1010868710"/>
 							<object class="NSMutableString" key="NSAlternateContents">
@@ -102,6 +102,7 @@
 							<bool key="NSAltersState">YES</bool>
 							<int key="NSArrowPosition">1</int>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="865399487">
 						<reference key="NSNextResponder" ref="622546761"/>
@@ -110,7 +111,7 @@
 						<reference key="NSSuperview" ref="622546761"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="909233780">
-							<int key="NSCellFlags">67239424</int>
+							<int key="NSCellFlags">67108864</int>
 							<int key="NSCellFlags2">71303168</int>
 							<string key="NSContents">Encryption:</string>
 							<reference key="NSSupport" ref="1010868710"/>
@@ -134,16 +135,18 @@
 								</object>
 							</object>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 				</array>
 				<string key="NSFrameSize">{466, 42}</string>
+				<reference key="NSSuperview"/>
 				<object class="NSMutableString" key="NSClassName">
 					<characters key="NS.bytes">NSView</characters>
 				</object>
 				<string key="NSExtension">NSResponder</string>
 			</object>
 			<object class="NSCustomView" id="1018924368">
-				<nil key="NSNextResponder"/>
+				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">256</int>
 				<array class="NSMutableArray" key="NSSubviews">
 					<object class="NSTextField" id="915278391">
@@ -153,7 +156,7 @@
 						<reference key="NSSuperview" ref="1018924368"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="43142087">
-							<int key="NSCellFlags">67239424</int>
+							<int key="NSCellFlags">67108864</int>
 							<int key="NSCellFlags2">71303168</int>
 							<string key="NSContents">Password:</string>
 							<reference key="NSSupport" ref="1010868710"/>
@@ -161,6 +164,7 @@
 							<reference key="NSBackgroundColor" ref="140834260"/>
 							<reference key="NSTextColor" ref="177125367"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="295382525">
 						<reference key="NSNextResponder" ref="1018924368"/>
@@ -169,7 +173,7 @@
 						<reference key="NSSuperview" ref="1018924368"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="483113011">
-							<int key="NSCellFlags">67239424</int>
+							<int key="NSCellFlags">67108864</int>
 							<int key="NSCellFlags2">71303168</int>
 							<string key="NSContents">User Name:</string>
 							<reference key="NSSupport" ref="1010868710"/>
@@ -177,6 +181,7 @@
 							<reference key="NSBackgroundColor" ref="140834260"/>
 							<reference key="NSTextColor" ref="177125367"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="350716652">
 						<reference key="NSNextResponder" ref="1018924368"/>
@@ -185,7 +190,7 @@
 						<reference key="NSSuperview" ref="1018924368"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="303088185">
-							<int key="NSCellFlags">-1804468671</int>
+							<int key="NSCellFlags">-1804599231</int>
 							<int key="NSCellFlags2">4195328</int>
 							<string key="NSContents"/>
 							<reference key="NSSupport" ref="1010868710"/>
@@ -207,6 +212,7 @@
 								<reference key="NSColor" ref="575974779"/>
 							</object>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="1029122769">
 						<reference key="NSNextResponder" ref="1018924368"/>
@@ -215,7 +221,7 @@
 						<reference key="NSSuperview" ref="1018924368"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="95388583">
-							<int key="NSCellFlags">-1804468671</int>
+							<int key="NSCellFlags">-1804599231</int>
 							<int key="NSCellFlags2">4195328</int>
 							<string key="NSContents"/>
 							<reference key="NSSupport" ref="1010868710"/>
@@ -224,20 +230,21 @@
 							<reference key="NSBackgroundColor" ref="283602377"/>
 							<reference key="NSTextColor" ref="810241092"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSButton" id="1061934318">
 						<reference key="NSNextResponder" ref="1018924368"/>
 						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{165, 12}, {200, 32}}</string>
+						<string key="NSFrame">{{102, 12}, {200, 32}}</string>
 						<reference key="NSSuperview" ref="1018924368"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="570644877">
-							<int key="NSCellFlags">67239424</int>
+							<int key="NSCellFlags">67108864</int>
 							<int key="NSCellFlags2">134217728</int>
 							<string key="NSContents">Register New Account</string>
 							<reference key="NSSupport" ref="1010868710"/>
 							<reference key="NSControlView" ref="1061934318"/>
-							<int key="NSButtonFlags">-2038284033</int>
+							<int key="NSButtonFlags">-2038284288</int>
 							<int key="NSButtonFlags2">1</int>
 							<reference key="NSAlternateImage" ref="1010868710"/>
 							<string key="NSAlternateContents"/>
@@ -247,9 +254,11 @@
 							<int key="NSPeriodicDelay">200</int>
 							<int key="NSPeriodicInterval">25</int>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 				</array>
 				<string key="NSFrameSize">{405, 112}</string>
+				<reference key="NSSuperview"/>
 				<object class="NSMutableString" key="NSClassName">
 					<characters key="NS.bytes">NSView</characters>
 				</object>
@@ -511,194 +520,13 @@
 			<nil key="sourceID"/>
 			<int key="maxID">209</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">AIAccountViewController</string>
-					<string key="superclassName">NSObject</string>
-					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">changedPreference:</string>
-						<string key="NS.object.0">id</string>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<string key="NS.key.0">changedPreference:</string>
-						<object class="IBActionInfo" key="NS.object.0">
-							<string key="name">changedPreference:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</object>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="checkBox_checkMail">NSButton</string>
-						<string key="checkBox_sendTyping">NSButton</string>
-						<string key="label_alias">NSTextField</string>
-						<string key="label_encryption">NSTextField</string>
-						<string key="label_password">NSTextField</string>
-						<string key="label_port">NSTextField</string>
-						<string key="label_server">NSTextField</string>
-						<string key="label_typing">NSTextField</string>
-						<string key="popUp_encryption">NSPopUpButton</string>
-						<string key="progressIndicator_registering">NSProgressIndicator</string>
-						<string key="textField_accountUID">NSTextField</string>
-						<string key="textField_accountUIDLabel">NSTextField</string>
-						<string key="textField_alias">NSTextField</string>
-						<string key="textField_connectHost">NSTextField</string>
-						<string key="textField_connectPort">NSTextField</string>
-						<string key="textField_password">NSTextField</string>
-						<string key="textField_registering">NSTextField</string>
-						<string key="view_auxiliaryTabView">NSTabView</string>
-						<string key="view_options">NSView</string>
-						<string key="view_privacy">NSView</string>
-						<string key="view_profile">NSView</string>
-						<string key="view_setup">NSView</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="checkBox_checkMail">
-							<string key="name">checkBox_checkMail</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="checkBox_sendTyping">
-							<string key="name">checkBox_sendTyping</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="label_alias">
-							<string key="name">label_alias</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="label_encryption">
-							<string key="name">label_encryption</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="label_password">
-							<string key="name">label_password</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="label_port">
-							<string key="name">label_port</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="label_server">
-							<string key="name">label_server</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="label_typing">
-							<string key="name">label_typing</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="popUp_encryption">
-							<string key="name">popUp_encryption</string>
-							<string key="candidateClassName">NSPopUpButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="progressIndicator_registering">
-							<string key="name">progressIndicator_registering</string>
-							<string key="candidateClassName">NSProgressIndicator</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="textField_accountUID">
-							<string key="name">textField_accountUID</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="textField_accountUIDLabel">
-							<string key="name">textField_accountUIDLabel</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="textField_alias">
-							<string key="name">textField_alias</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="textField_connectHost">
-							<string key="name">textField_connectHost</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="textField_connectPort">
-							<string key="name">textField_connectPort</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="textField_password">
-							<string key="name">textField_password</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="textField_registering">
-							<string key="name">textField_registering</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="view_auxiliaryTabView">
-							<string key="name">view_auxiliaryTabView</string>
-							<string key="candidateClassName">NSTabView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="view_options">
-							<string key="name">view_options</string>
-							<string key="candidateClassName">NSView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="view_privacy">
-							<string key="name">view_privacy</string>
-							<string key="candidateClassName">NSView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="view_profile">
-							<string key="name">view_profile</string>
-							<string key="candidateClassName">NSView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="view_setup">
-							<string key="name">view_setup</string>
-							<string key="candidateClassName">NSView</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/AIAccountViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">ESPurpleGaduGaduAccountViewController</string>
-					<string key="superclassName">PurpleAccountViewController</string>
-					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">registerNewAccount:</string>
-						<string key="NS.object.0">id</string>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<string key="NS.key.0">registerNewAccount:</string>
-						<object class="IBActionInfo" key="NS.object.0">
-							<string key="name">registerNewAccount:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/ESPurpleGaduGaduAccountViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">PurpleAccountViewController</string>
-					<string key="superclassName">AIAccountViewController</string>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="checkBox_broadcastMusic">NSButton</string>
-						<string key="checkBox_displayCustomEmoticons">NSButton</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="checkBox_broadcastMusic">
-							<string key="name">checkBox_broadcastMusic</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="checkBox_displayCustomEmoticons">
-							<string key="name">checkBox_displayCustomEmoticons</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/PurpleAccountViewController.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
 			<real value="1060" key="NS.object.0"/>
 		</object>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
-			<real value="1060" key="NS.object.0"/>
-		</object>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
 			<real value="3200" key="NS.object.0"/>
--- a/Plugins/Purple Service/Resources/en.lproj/ESPurpleJabberAccountView.xib	Mon Aug 13 00:26:14 2012 +0200
+++ b/Plugins/Purple Service/Resources/en.lproj/ESPurpleJabberAccountView.xib	Thu Sep 06 00:18:31 2012 +0200
@@ -2,36 +2,36 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
 	<data>
 		<int key="IBDocument.SystemTarget">1060</int>
-		<string key="IBDocument.SystemVersion">11D50b</string>
-		<string key="IBDocument.InterfaceBuilderVersion">2182</string>
-		<string key="IBDocument.AppKitVersion">1138.32</string>
-		<string key="IBDocument.HIToolboxVersion">568.00</string>
+		<string key="IBDocument.SystemVersion">12A269</string>
+		<string key="IBDocument.InterfaceBuilderVersion">2549</string>
+		<string key="IBDocument.AppKitVersion">1187</string>
+		<string key="IBDocument.HIToolboxVersion">624.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">2182</string>
+			<string key="NS.object.0">2549</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
-			<string>NSScroller</string>
-			<string>NSMenu</string>
 			<string>NSButton</string>
-			<string>NSCustomObject</string>
-			<string>NSTableView</string>
-			<string>NSCustomView</string>
+			<string>NSButtonCell</string>
 			<string>NSComboBox</string>
 			<string>NSComboBoxCell</string>
-			<string>NSTextField</string>
+			<string>NSCustomObject</string>
+			<string>NSCustomView</string>
+			<string>NSMenu</string>
+			<string>NSMenuItem</string>
 			<string>NSNumberFormatter</string>
-			<string>NSWindowTemplate</string>
-			<string>NSTextFieldCell</string>
-			<string>NSButtonCell</string>
+			<string>NSPopUpButton</string>
+			<string>NSPopUpButtonCell</string>
+			<string>NSProgressIndicator</string>
+			<string>NSScrollView</string>
+			<string>NSScroller</string>
 			<string>NSTableColumn</string>
-			<string>NSPopUpButtonCell</string>
+			<string>NSTableView</string>
+			<string>NSTextField</string>
+			<string>NSTextFieldCell</string>
+			<string>NSTextView</string>
 			<string>NSView</string>
-			<string>NSScrollView</string>
-			<string>NSProgressIndicator</string>
-			<string>NSTextView</string>
-			<string>NSPopUpButton</string>
-			<string>NSMenuItem</string>
+			<string>NSWindowTemplate</string>
 		</array>
 		<array key="IBDocument.PluginDependencies">
 			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -51,7 +51,7 @@
 				<string key="NSClassName">NSApplication</string>
 			</object>
 			<object class="NSCustomView" id="837853317">
-				<nil key="NSNextResponder"/>
+				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">256</int>
 				<array class="NSMutableArray" key="NSSubviews">
 					<object class="NSTextField" id="779272059">
@@ -61,7 +61,7 @@
 						<reference key="NSSuperview" ref="837853317"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="763478478">
-							<int key="NSCellFlags">67142656</int>
+							<int key="NSCellFlags">67108864</int>
 							<int key="NSCellFlags2">71303168</int>
 							<string key="NSContents">Password:</string>
 							<object class="NSFont" key="NSSupport" id="745543233">
@@ -89,6 +89,7 @@
 								</object>
 							</object>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="385654329">
 						<reference key="NSNextResponder" ref="837853317"/>
@@ -97,7 +98,7 @@
 						<reference key="NSSuperview" ref="837853317"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="1072137665">
-							<int key="NSCellFlags">67142656</int>
+							<int key="NSCellFlags">67108864</int>
 							<int key="NSCellFlags2">71303168</int>
 							<string key="NSContents">User Name:</string>
 							<reference key="NSSupport" ref="745543233"/>
@@ -105,6 +106,7 @@
 							<reference key="NSBackgroundColor" ref="701108434"/>
 							<reference key="NSTextColor" ref="564835922"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="812273374">
 						<reference key="NSNextResponder" ref="837853317"/>
@@ -113,7 +115,7 @@
 						<reference key="NSSuperview" ref="837853317"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="819061816">
-							<int key="NSCellFlags">-1804565439</int>
+							<int key="NSCellFlags">-1804599231</int>
 							<int key="NSCellFlags2">4195328</int>
 							<string key="NSContents"/>
 							<reference key="NSSupport" ref="745543233"/>
@@ -136,6 +138,7 @@
 								<reference key="NSColor" ref="38993316"/>
 							</object>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="286029264">
 						<reference key="NSNextResponder" ref="837853317"/>
@@ -144,7 +147,7 @@
 						<reference key="NSSuperview" ref="837853317"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="619892709">
-							<int key="NSCellFlags">-1804565439</int>
+							<int key="NSCellFlags">-1804599231</int>
 							<int key="NSCellFlags2">4195328</int>
 							<string key="NSContents"/>
 							<reference key="NSSupport" ref="745543233"/>
@@ -153,6 +156,7 @@
 							<reference key="NSBackgroundColor" ref="427835941"/>
 							<reference key="NSTextColor" ref="185594471"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSButton" id="272517914">
 						<reference key="NSNextResponder" ref="837853317"/>
@@ -161,7 +165,7 @@
 						<reference key="NSSuperview" ref="837853317"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="712274320">
-							<int key="NSCellFlags">67238400</int>
+							<int key="NSCellFlags">67108864</int>
 							<int key="NSCellFlags2">134217728</int>
 							<string key="NSContents">Register New Account</string>
 							<reference key="NSSupport" ref="745543233"/>
@@ -176,6 +180,7 @@
 							<int key="NSPeriodicDelay">200</int>
 							<int key="NSPeriodicInterval">25</int>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSProgressIndicator" id="850011028">
 						<reference key="NSNextResponder" ref="837853317"/>
@@ -192,7 +197,7 @@
 						<reference key="NSSuperview" ref="837853317"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="924854234">
-							<int key="NSCellFlags">67142656</int>
+							<int key="NSCellFlags">67108864</int>
 							<int key="NSCellFlags2">272629760</int>
 							<string key="NSContents">Registering…</string>
 							<object class="NSFont" key="NSSupport" id="26">
@@ -204,9 +209,11 @@
 							<reference key="NSBackgroundColor" ref="701108434"/>
 							<reference key="NSTextColor" ref="564835922"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 				</array>
 				<string key="NSFrameSize">{457, 127}</string>
+				<reference key="NSSuperview"/>
 				<string key="NSClassName">NSView</string>
 				<string key="NSExtension">NSResponder</string>
 			</object>
@@ -240,6 +247,7 @@
 							<int key="NSPeriodicDelay">200</int>
 							<int key="NSPeriodicInterval">25</int>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSButton" id="1069823102">
 						<reference key="NSNextResponder" ref="881248978"/>
@@ -262,6 +270,7 @@
 							<int key="NSPeriodicDelay">200</int>
 							<int key="NSPeriodicInterval">25</int>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSButton" id="767871570">
 						<reference key="NSNextResponder" ref="881248978"/>
@@ -284,6 +293,7 @@
 							<int key="NSPeriodicDelay">200</int>
 							<int key="NSPeriodicInterval">25</int>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="23953802">
 						<reference key="NSNextResponder" ref="881248978"/>
@@ -292,7 +302,7 @@
 						<reference key="NSSuperview" ref="881248978"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="557983517">
-							<int key="NSCellFlags">-1804565439</int>
+							<int key="NSCellFlags">-1804599231</int>
 							<int key="NSCellFlags2">4195328</int>
 							<string key="NSContents"/>
 							<reference key="NSSupport" ref="745543233"/>
@@ -301,6 +311,7 @@
 							<reference key="NSBackgroundColor" ref="427835941"/>
 							<reference key="NSTextColor" ref="185594471"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="795157005">
 						<reference key="NSNextResponder" ref="881248978"/>
@@ -309,7 +320,7 @@
 						<reference key="NSSuperview" ref="881248978"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="1046731873">
-							<int key="NSCellFlags">67142656</int>
+							<int key="NSCellFlags">67108864</int>
 							<int key="NSCellFlags2">71303168</int>
 							<string key="NSContents">BOSH Server:</string>
 							<reference key="NSSupport" ref="745543233"/>
@@ -317,6 +328,7 @@
 							<reference key="NSBackgroundColor" ref="701108434"/>
 							<reference key="NSTextColor" ref="564835922"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="993950755">
 						<reference key="NSNextResponder" ref="881248978"/>
@@ -325,7 +337,7 @@
 						<reference key="NSSuperview" ref="881248978"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="897297612">
-							<int key="NSCellFlags">-1804565439</int>
+							<int key="NSCellFlags">-1804599231</int>
 							<int key="NSCellFlags2">4195328</int>
 							<string key="NSContents"/>
 							<reference key="NSSupport" ref="745543233"/>
@@ -334,6 +346,7 @@
 							<reference key="NSBackgroundColor" ref="427835941"/>
 							<reference key="NSTextColor" ref="185594471"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="416544706">
 						<reference key="NSNextResponder" ref="881248978"/>
@@ -342,7 +355,7 @@
 						<reference key="NSSuperview" ref="881248978"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="675922156">
-							<int key="NSCellFlags">67142656</int>
+							<int key="NSCellFlags">67108864</int>
 							<int key="NSCellFlags2">71303168</int>
 							<string key="NSContents">Connect Server:</string>
 							<reference key="NSSupport" ref="745543233"/>
@@ -350,6 +363,7 @@
 							<reference key="NSBackgroundColor" ref="701108434"/>
 							<reference key="NSTextColor" ref="564835922"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="223022732">
 						<reference key="NSNextResponder" ref="881248978"/>
@@ -358,7 +372,7 @@
 						<reference key="NSSuperview" ref="881248978"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="483716033">
-							<int key="NSCellFlags">-1804565439</int>
+							<int key="NSCellFlags">-1804599231</int>
 							<int key="NSCellFlags2">4195328</int>
 							<string key="NSContents"/>
 							<reference key="NSSupport" ref="745543233"/>
@@ -367,6 +381,7 @@
 							<reference key="NSBackgroundColor" ref="427835941"/>
 							<reference key="NSTextColor" ref="185594471"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="1071692987">
 						<reference key="NSNextResponder" ref="881248978"/>
@@ -375,7 +390,7 @@
 						<reference key="NSSuperview" ref="881248978"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="275398507">
-							<int key="NSCellFlags">67142656</int>
+							<int key="NSCellFlags">67108864</int>
 							<int key="NSCellFlags2">71303168</int>
 							<string key="NSContents">File Transfer Proxies:</string>
 							<reference key="NSSupport" ref="745543233"/>
@@ -383,6 +398,7 @@
 							<reference key="NSBackgroundColor" ref="701108434"/>
 							<reference key="NSTextColor" ref="564835922"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="979941359">
 						<reference key="NSNextResponder" ref="881248978"/>
@@ -391,7 +407,7 @@
 						<reference key="NSSuperview" ref="881248978"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="474262400">
-							<int key="NSCellFlags">-1804565439</int>
+							<int key="NSCellFlags">-1804599231</int>
 							<int key="NSCellFlags2">4195328</int>
 							<string key="NSContents"/>
 							<reference key="NSSupport" ref="745543233"/>
@@ -400,6 +416,7 @@
 							<reference key="NSBackgroundColor" ref="427835941"/>
 							<reference key="NSTextColor" ref="185594471"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="198507305">
 						<reference key="NSNextResponder" ref="881248978"/>
@@ -408,7 +425,7 @@
 						<reference key="NSSuperview" ref="881248978"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="937801845">
-							<int key="NSCellFlags">67142656</int>
+							<int key="NSCellFlags">67108864</int>
 							<int key="NSCellFlags2">71303168</int>
 							<string key="NSContents">Port:</string>
 							<reference key="NSSupport" ref="745543233"/>
@@ -416,6 +433,7 @@
 							<reference key="NSBackgroundColor" ref="701108434"/>
 							<reference key="NSTextColor" ref="564835922"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="56382938">
 						<reference key="NSNextResponder" ref="881248978"/>
@@ -424,7 +442,7 @@
 						<reference key="NSSuperview" ref="881248978"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="27008867">
-							<int key="NSCellFlags">-1804565439</int>
+							<int key="NSCellFlags">-1804599231</int>
 							<int key="NSCellFlags2">4195328</int>
 							<string key="NSContents"/>
 							<reference key="NSSupport" ref="745543233"/>
@@ -433,6 +451,7 @@
 							<reference key="NSBackgroundColor" ref="427835941"/>
 							<reference key="NSTextColor" ref="185594471"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="164156726">
 						<reference key="NSNextResponder" ref="881248978"/>
@@ -441,7 +460,7 @@
 						<reference key="NSSuperview" ref="881248978"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="820922822">
-							<int key="NSCellFlags">67142656</int>
+							<int key="NSCellFlags">67108864</int>
 							<int key="NSCellFlags2">71303168</int>
 							<string key="NSContents">Resource:</string>
 							<reference key="NSSupport" ref="745543233"/>
@@ -449,6 +468,7 @@
 							<reference key="NSBackgroundColor" ref="701108434"/>
 							<reference key="NSTextColor" ref="564835922"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="1036357624">
 						<reference key="NSNextResponder" ref="881248978"/>
@@ -457,7 +477,7 @@
 						<reference key="NSSuperview" ref="881248978"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="260175574">
-							<int key="NSCellFlags">67142656</int>
+							<int key="NSCellFlags">67108864</int>
 							<int key="NSCellFlags2">71303168</int>
 							<string key="NSContents">Mail:</string>
 							<reference key="NSSupport" ref="745543233"/>
@@ -465,6 +485,7 @@
 							<reference key="NSBackgroundColor" ref="701108434"/>
 							<reference key="NSTextColor" ref="564835922"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="835653998">
 						<reference key="NSNextResponder" ref="881248978"/>
@@ -473,7 +494,7 @@
 						<reference key="NSSuperview" ref="881248978"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="230227050">
-							<int key="NSCellFlags">67142656</int>
+							<int key="NSCellFlags">67108864</int>
 							<int key="NSCellFlags2">71303168</int>
 							<string key="NSContents">Security:</string>
 							<reference key="NSSupport" ref="745543233"/>
@@ -481,6 +502,7 @@
 							<reference key="NSBackgroundColor" ref="701108434"/>
 							<reference key="NSTextColor" ref="564835922"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="909698960">
 						<reference key="NSNextResponder" ref="881248978"/>
@@ -489,7 +511,7 @@
 						<reference key="NSSuperview" ref="881248978"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="1007024952">
-							<int key="NSCellFlags">67142656</int>
+							<int key="NSCellFlags">67108864</int>
 							<int key="NSCellFlags2">71303168</int>
 							<string key="NSContents">Available Priority:</string>
 							<reference key="NSSupport" ref="745543233"/>
@@ -497,6 +519,7 @@
 							<reference key="NSBackgroundColor" ref="701108434"/>
 							<reference key="NSTextColor" ref="564835922"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="348268130">
 						<reference key="NSNextResponder" ref="881248978"/>
@@ -505,7 +528,7 @@
 						<reference key="NSSuperview" ref="881248978"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="1041524998">
-							<int key="NSCellFlags">-1804565439</int>
+							<int key="NSCellFlags">-1804599231</int>
 							<int key="NSCellFlags2">272630784</int>
 							<string key="NSContents"/>
 							<reference key="NSSupport" ref="745543233"/>
@@ -514,6 +537,7 @@
 							<reference key="NSBackgroundColor" ref="427835941"/>
 							<reference key="NSTextColor" ref="185594471"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="463018609">
 						<reference key="NSNextResponder" ref="881248978"/>
@@ -522,7 +546,7 @@
 						<reference key="NSSuperview" ref="881248978"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="277652672">
-							<int key="NSCellFlags">67142656</int>
+							<int key="NSCellFlags">67108864</int>
 							<int key="NSCellFlags2">71303168</int>
 							<string key="NSContents">Away Priority:</string>
 							<reference key="NSSupport" ref="745543233"/>
@@ -530,6 +554,7 @@
 							<reference key="NSBackgroundColor" ref="701108434"/>
 							<reference key="NSTextColor" ref="564835922"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="400793057">
 						<reference key="NSNextResponder" ref="881248978"/>
@@ -538,7 +563,7 @@
 						<reference key="NSSuperview" ref="881248978"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="481365549">
-							<int key="NSCellFlags">-1804565439</int>
+							<int key="NSCellFlags">-1804599231</int>
 							<int key="NSCellFlags2">272630784</int>
 							<string key="NSContents"/>
 							<reference key="NSSupport" ref="745543233"/>
@@ -547,6 +572,7 @@
 							<reference key="NSBackgroundColor" ref="427835941"/>
 							<reference key="NSTextColor" ref="185594471"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSPopUpButton" id="86797681">
 						<reference key="NSNextResponder" ref="881248978"/>
@@ -555,7 +581,7 @@
 						<reference key="NSSuperview" ref="881248978"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSPopUpButtonCell" key="NSCell" id="686819324">
-							<int key="NSCellFlags">-2080244160</int>
+							<int key="NSCellFlags">-2080374720</int>
 							<int key="NSCellFlags2">2048</int>
 							<reference key="NSSupport" ref="745543233"/>
 							<reference key="NSControlView" ref="86797681"/>
@@ -636,6 +662,7 @@
 							<bool key="NSAltersState">YES</bool>
 							<int key="NSArrowPosition">1</int>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="129057903">
 						<reference key="NSNextResponder" ref="881248978"/>
@@ -644,7 +671,7 @@
 						<reference key="NSSuperview" ref="881248978"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="21353665">
-							<int key="NSCellFlags">67142656</int>
+							<int key="NSCellFlags">67108864</int>
 							<int key="NSCellFlags2">71303168</int>
 							<string key="NSContents">Presence Subscriptions:</string>
 							<reference key="NSSupport" ref="745543233"/>
@@ -652,6 +679,7 @@
 							<reference key="NSBackgroundColor" ref="701108434"/>
 							<reference key="NSTextColor" ref="564835922"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="520236742">
 						<reference key="NSNextResponder" ref="881248978"/>
@@ -660,7 +688,7 @@
 						<reference key="NSSuperview" ref="881248978"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="414517125">
-							<int key="NSCellFlags">67142656</int>
+							<int key="NSCellFlags">67108864</int>
 							<int key="NSCellFlags2">71303168</int>
 							<string key="NSContents">...add to list in group:</string>
 							<reference key="NSSupport" ref="745543233"/>
@@ -668,6 +696,7 @@
 							<reference key="NSBackgroundColor" ref="701108434"/>
 							<reference key="NSTextColor" ref="564835922"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSComboBox" id="71054177">
 						<reference key="NSNextResponder" ref="881248978"/>
@@ -693,13 +722,15 @@
 							<object class="NSComboTableView" key="NSTableView" id="68718431">
 								<reference key="NSNextResponder"/>
 								<int key="NSvFlags">274</int>
-								<string key="NSFrameSize">{13, 0}</string>
+								<string key="NSFrameSize">{15, 0}</string>
 								<reference key="NSSuperview"/>
 								<reference key="NSWindow"/>
 								<bool key="NSEnabled">YES</bool>
+								<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+								<bool key="NSControlAllowsExpansionToolTips">YES</bool>
 								<array class="NSMutableArray" key="NSTableColumns">
 									<object class="NSTableColumn">
-										<double key="NSWidth">10</double>
+										<double key="NSWidth">12</double>
 										<double key="NSMinWidth">10</double>
 										<double key="NSMaxWidth">1000</double>
 										<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -752,7 +783,7 @@
 								</object>
 								<double key="NSRowHeight">19</double>
 								<string key="NSAction">tableViewAction:</string>
-								<int key="NSTvFlags">-765427712</int>
+								<int key="NSTvFlags">-767524864</int>
 								<reference key="NSDelegate" ref="863874436"/>
 								<reference key="NSTarget" ref="863874436"/>
 								<int key="NSColumnAutoresizingStyle">1</int>
@@ -763,6 +794,7 @@
 								<int key="NSTableViewGroupRowStyle">1</int>
 							</object>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						<nil key="NSDataSource"/>
 					</object>
 					<object class="NSButton" id="755212957">
@@ -786,6 +818,7 @@
 							<int key="NSPeriodicDelay">200</int>
 							<int key="NSPeriodicInterval">25</int>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSButton" id="1011876758">
 						<reference key="NSNextResponder" ref="881248978"/>
@@ -808,6 +841,7 @@
 							<int key="NSPeriodicDelay">200</int>
 							<int key="NSPeriodicInterval">25</int>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="13153345">
 						<reference key="NSNextResponder" ref="881248978"/>
@@ -816,7 +850,7 @@
 						<reference key="NSSuperview" ref="881248978"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="499131302">
-							<int key="NSCellFlags">68191296</int>
+							<int key="NSCellFlags">68157504</int>
 							<int key="NSCellFlags2">272630784</int>
 							<string key="NSContents">Emoticons:</string>
 							<reference key="NSSupport" ref="745543233"/>
@@ -824,6 +858,7 @@
 							<reference key="NSBackgroundColor" ref="701108434"/>
 							<reference key="NSTextColor" ref="564835922"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSButton" id="753162121">
 						<reference key="NSNextResponder" ref="881248978"/>
@@ -846,6 +881,7 @@
 							<int key="NSPeriodicDelay">200</int>
 							<int key="NSPeriodicInterval">25</int>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 				</array>
 				<string key="NSFrameSize">{424, 333}</string>
@@ -877,6 +913,7 @@
 							<int key="NSPeriodicDelay">200</int>
 							<int key="NSPeriodicInterval">25</int>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="174273451">
 						<reference key="NSNextResponder" ref="809544060"/>
@@ -885,7 +922,7 @@
 						<reference key="NSSuperview" ref="809544060"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="492202865">
-							<int key="NSCellFlags">67142656</int>
+							<int key="NSCellFlags">67108864</int>
 							<int key="NSCellFlags2">71303168</int>
 							<string key="NSContents">Typing:</string>
 							<reference key="NSSupport" ref="745543233"/>
@@ -893,6 +930,7 @@
 							<reference key="NSBackgroundColor" ref="701108434"/>
 							<reference key="NSTextColor" ref="564835922"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="571454235">
 						<reference key="NSNextResponder" ref="809544060"/>
@@ -901,7 +939,7 @@
 						<reference key="NSSuperview" ref="809544060"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="632016050">
-							<int key="NSCellFlags">67142656</int>
+							<int key="NSCellFlags">67108864</int>
 							<int key="NSCellFlags2">71303168</int>
 							<string key="NSContents">Encryption:</string>
 							<reference key="NSSupport" ref="745543233"/>
@@ -909,6 +947,7 @@
 							<reference key="NSBackgroundColor" ref="701108434"/>
 							<reference key="NSTextColor" ref="564835922"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSPopUpButton" id="918185157">
 						<reference key="NSNextResponder" ref="809544060"/>
@@ -917,7 +956,7 @@
 						<reference key="NSSuperview" ref="809544060"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSPopUpButtonCell" key="NSCell" id="1034471844">
-							<int key="NSCellFlags">-2080244160</int>
+							<int key="NSCellFlags">-2080374720</int>
 							<int key="NSCellFlags2">1024</int>
 							<reference key="NSSupport" ref="745543233"/>
 							<reference key="NSControlView" ref="918185157"/>
@@ -956,6 +995,7 @@
 							<bool key="NSAltersState">YES</bool>
 							<int key="NSArrowPosition">1</int>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="609337263">
 						<reference key="NSNextResponder" ref="809544060"/>
@@ -964,7 +1004,7 @@
 						<reference key="NSSuperview" ref="809544060"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="457025165">
-							<int key="NSCellFlags">67142656</int>
+							<int key="NSCellFlags">67108864</int>
 							<int key="NSCellFlags2">71303168</int>
 							<string key="NSContents">Music:</string>
 							<reference key="NSSupport" ref="745543233"/>
@@ -972,6 +1012,7 @@
 							<reference key="NSBackgroundColor" ref="701108434"/>
 							<reference key="NSTextColor" ref="564835922"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSButton" id="462740945">
 						<reference key="NSNextResponder" ref="809544060"/>
@@ -994,6 +1035,7 @@
 							<int key="NSPeriodicDelay">200</int>
 							<int key="NSPeriodicInterval">25</int>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 				</array>
 				<string key="NSFrameSize">{393, 75}</string>
@@ -1025,7 +1067,7 @@
 							<reference key="NSSuperview" ref="76601519"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="377334044">
-								<int key="NSCellFlags">67142656</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">272629760</int>
 								<string key="NSContents">Either enter your XMPP server address here:</string>
 								<reference key="NSSupport" ref="745543233"/>
@@ -1033,6 +1075,7 @@
 								<reference key="NSBackgroundColor" ref="701108434"/>
 								<reference key="NSTextColor" ref="564835922"/>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSTextField" id="179284965">
 							<reference key="NSNextResponder" ref="76601519"/>
@@ -1041,7 +1084,7 @@
 							<reference key="NSSuperview" ref="76601519"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="3174051">
-								<int key="NSCellFlags">-1804565439</int>
+								<int key="NSCellFlags">-1804599231</int>
 								<int key="NSCellFlags2">272630784</int>
 								<string key="NSContents"/>
 								<reference key="NSSupport" ref="745543233"/>
@@ -1050,6 +1093,7 @@
 								<reference key="NSBackgroundColor" ref="427835941"/>
 								<reference key="NSTextColor" ref="185594471"/>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSTextField" id="596837261">
 							<reference key="NSNextResponder" ref="76601519"/>
@@ -1058,7 +1102,7 @@
 							<reference key="NSSuperview" ref="76601519"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="129129203">
-								<int key="NSCellFlags">67142656</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">71303168</int>
 								<string key="NSContents">Server:</string>
 								<reference key="NSSupport" ref="745543233"/>
@@ -1066,6 +1110,7 @@
 								<reference key="NSBackgroundColor" ref="701108434"/>
 								<reference key="NSTextColor" ref="564835922"/>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSTextField" id="687226273">
 							<reference key="NSNextResponder" ref="76601519"/>
@@ -1074,7 +1119,7 @@
 							<reference key="NSSuperview" ref="76601519"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="228444455">
-								<int key="NSCellFlags">-1804565439</int>
+								<int key="NSCellFlags">-1804599231</int>
 								<int key="NSCellFlags2">272630784</int>
 								<reference key="NSSupport" ref="745543233"/>
 								<object class="NSNumberFormatter" key="NSFormatter" id="143337838">
@@ -1134,6 +1179,7 @@
 								<reference key="NSBackgroundColor" ref="427835941"/>
 								<reference key="NSTextColor" ref="185594471"/>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSTextField" id="723971470">
 							<reference key="NSNextResponder" ref="76601519"/>
@@ -1142,7 +1188,7 @@
 							<reference key="NSSuperview" ref="76601519"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="688292495">
-								<int key="NSCellFlags">67142656</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">71303168</int>
 								<string key="NSContents">Port:</string>
 								<reference key="NSSupport" ref="745543233"/>
@@ -1150,6 +1196,7 @@
 								<reference key="NSBackgroundColor" ref="701108434"/>
 								<reference key="NSTextColor" ref="564835922"/>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSTextField" id="717094965">
 							<reference key="NSNextResponder" ref="76601519"/>
@@ -1158,7 +1205,7 @@
 							<reference key="NSSuperview" ref="76601519"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="995640262">
-								<int key="NSCellFlags">67142656</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">272629760</int>
 								<string key="NSContents">or select a public server from the list:</string>
 								<reference key="NSSupport" ref="745543233"/>
@@ -1166,6 +1213,7 @@
 								<reference key="NSBackgroundColor" ref="701108434"/>
 								<reference key="NSTextColor" ref="564835922"/>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSScrollView" id="208815502">
 							<reference key="NSNextResponder" ref="76601519"/>
@@ -1181,6 +1229,8 @@
 											<string key="NSFrameSize">{243, 157}</string>
 											<reference key="NSSuperview" ref="514102083"/>
 											<bool key="NSEnabled">YES</bool>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+											<bool key="NSControlAllowsExpansionToolTips">YES</bool>
 											<object class="_NSCornerView" key="NSCornerView">
 												<nil key="NSNextResponder"/>
 												<int key="NSvFlags">256</int>
@@ -1193,7 +1243,7 @@
 													<double key="NSMinWidth">40</double>
 													<double key="NSMaxWidth">1000</double>
 													<object class="NSTableHeaderCell" key="NSHeaderCell">
-														<int key="NSCellFlags">75531328</int>
+														<int key="NSCellFlags">75497536</int>
 														<int key="NSCellFlags2">2048</int>
 														<string key="NSContents">Server Name</string>
 														<reference key="NSSupport" ref="26"/>
@@ -1209,7 +1259,7 @@
 														</object>
 													</object>
 													<object class="NSTextFieldCell" key="NSDataCell" id="511846284">
-														<int key="NSCellFlags">337675328</int>
+														<int key="NSCellFlags">337641536</int>
 														<int key="NSCellFlags2">2048</int>
 														<string key="NSContents"/>
 														<reference key="NSSupport" ref="745543233"/>
@@ -1248,6 +1298,7 @@
 									<int key="NSvFlags">256</int>
 									<string key="NSFrame">{{207, 1}, {11, 157}}</string>
 									<reference key="NSSuperview" ref="208815502"/>
+									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 									<int key="NSsFlags">256</int>
 									<reference key="NSTarget" ref="208815502"/>
 									<string key="NSAction">_doScroller:</string>
@@ -1259,6 +1310,7 @@
 									<string key="NSFrame">{{-100, -100}, {431, 15}}</string>
 									<reference key="NSSuperview" ref="208815502"/>
 									<bool key="NSEnabled">YES</bool>
+									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 									<int key="NSsFlags">257</int>
 									<reference key="NSTarget" ref="208815502"/>
 									<string key="NSAction">_doScroller:</string>
@@ -1273,6 +1325,9 @@
 							<reference key="NSHScroller" ref="1065021731"/>
 							<reference key="NSContentView" ref="514102083"/>
 							<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
+							<double key="NSMinMagnification">0.25</double>
+							<double key="NSMaxMagnification">4</double>
+							<double key="NSMagnification">1</double>
 						</object>
 						<object class="NSButton" id="738913079">
 							<reference key="NSNextResponder" ref="76601519"/>
@@ -1294,6 +1349,7 @@
 								<int key="NSPeriodicDelay">200</int>
 								<int key="NSPeriodicInterval">25</int>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSButton" id="887523460">
 							<reference key="NSNextResponder" ref="76601519"/>
@@ -1315,6 +1371,7 @@
 								<int key="NSPeriodicDelay">200</int>
 								<int key="NSPeriodicInterval">25</int>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSScrollView" id="1073507928">
 							<reference key="NSNextResponder" ref="76601519"/>
@@ -1537,7 +1594,7 @@
 											</object>
 											<int key="NSTVFlags">6</int>
 											<string key="NSMaxSize">{463, 10000000}</string>
-											<string key="NSMinize">{164, 46}</string>
+											<string key="NSMinize">{175, 157}</string>
 											<nil key="NSDelegate"/>
 										</object>
 									</array>
@@ -1578,6 +1635,7 @@
 									<string key="NSFrame">{{176, 1}, {11, 157}}</string>
 									<reference key="NSSuperview" ref="1073507928"/>
 									<bool key="NSEnabled">YES</bool>
+									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 									<int key="NSsFlags">256</int>
 									<reference key="NSTarget" ref="1073507928"/>
 									<string key="NSAction">_doScroller:</string>
@@ -1588,6 +1646,7 @@
 									<int key="NSvFlags">-2147483392</int>
 									<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
 									<reference key="NSSuperview" ref="1073507928"/>
+									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 									<int key="NSsFlags">1</int>
 									<reference key="NSTarget" ref="1073507928"/>
 									<string key="NSAction">_doScroller:</string>
@@ -1602,6 +1661,9 @@
 							<reference key="NSVScroller" ref="53572490"/>
 							<reference key="NSHScroller" ref="136865453"/>
 							<reference key="NSContentView" ref="913185530"/>
+							<double key="NSMinMagnification">0.25</double>
+							<double key="NSMaxMagnification">4</double>
+							<double key="NSMagnification">1</double>
 						</object>
 						<object class="NSButton" id="862273329">
 							<reference key="NSNextResponder" ref="76601519"/>
@@ -1622,6 +1684,7 @@
 								<int key="NSPeriodicDelay">400</int>
 								<int key="NSPeriodicInterval">75</int>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 					</array>
 					<string key="NSFrameSize">{455, 344}</string>
@@ -2052,6 +2115,14 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
+						<string key="label">button_SignUp</string>
+						<reference key="source" ref="393462939"/>
+						<reference key="destination" ref="272517914"/>
+					</object>
+					<int key="connectionID">649</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
 						<string key="label">dataSource</string>
 						<reference key="source" ref="71054177"/>
 						<reference key="destination" ref="393462939"/>
@@ -3224,7 +3295,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">646</int>
+			<int key="maxID">649</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
@@ -3233,10 +3304,6 @@
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
 			<real value="1060" key="NS.object.0"/>
 		</object>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
-			<real value="1070" key="NS.object.0"/>
-		</object>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
 			<real value="3200" key="NS.object.0"/>
--- a/Plugins/Purple Service/Resources/en.lproj/ESPurpleMeanwhileAccountView.xib	Mon Aug 13 00:26:14 2012 +0200
+++ b/Plugins/Purple Service/Resources/en.lproj/ESPurpleMeanwhileAccountView.xib	Thu Sep 06 00:18:31 2012 +0200
@@ -2,21 +2,21 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
 	<data>
 		<int key="IBDocument.SystemTarget">1060</int>
-		<string key="IBDocument.SystemVersion">11D50b</string>
-		<string key="IBDocument.InterfaceBuilderVersion">2182</string>
-		<string key="IBDocument.AppKitVersion">1138.32</string>
-		<string key="IBDocument.HIToolboxVersion">568.00</string>
+		<string key="IBDocument.SystemVersion">12A269</string>
+		<string key="IBDocument.InterfaceBuilderVersion">2549</string>
+		<string key="IBDocument.AppKitVersion">1187</string>
+		<string key="IBDocument.HIToolboxVersion">624.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">2182</string>
+			<string key="NS.object.0">2549</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
+			<string>NSButton</string>
+			<string>NSButtonCell</string>
+			<string>NSCustomObject</string>
 			<string>NSCustomView</string>
 			<string>NSTextField</string>
 			<string>NSTextFieldCell</string>
-			<string>NSButtonCell</string>
-			<string>NSCustomObject</string>
-			<string>NSButton</string>
 		</array>
 		<array key="IBDocument.PluginDependencies">
 			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -25,38 +25,60 @@
 			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
 			<integer value="1" key="NS.object.0"/>
 		</object>
-		<array class="NSMutableArray" key="IBDocument.RootObjects" id="65162756">
-			<object class="NSCustomObject" id="359413908">
+		<array class="NSMutableArray" key="IBDocument.RootObjects" id="376150513">
+			<object class="NSCustomObject" id="489696043">
 				<string key="NSClassName">ESGaimMeanwhileAccountViewController</string>
 			</object>
-			<object class="NSCustomObject" id="186331853">
+			<object class="NSCustomObject" id="139893652">
 				<string key="NSClassName">FirstResponder</string>
 			</object>
-			<object class="NSCustomObject" id="999691793">
+			<object class="NSCustomObject" id="443882121">
 				<string key="NSClassName">NSApplication</string>
 			</object>
-			<object class="NSCustomView" id="726035085">
-				<nil key="NSNextResponder"/>
+			<object class="NSCustomView" id="456936276">
+				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">256</int>
 				<array class="NSMutableArray" key="NSSubviews">
-					<object class="NSTextField" id="21255589">
-						<reference key="NSNextResponder" ref="726035085"/>
-						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{145, 67}, {206, 22}}</string>
-						<reference key="NSSuperview" ref="726035085"/>
+					<object class="NSButton" id="786387184">
+						<reference key="NSNextResponder" ref="456936276"/>
+						<int key="NSvFlags">268</int>
+						<string key="NSFrame">{{153, 21}, {144, 32}}</string>
+						<reference key="NSSuperview" ref="456936276"/>
 						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="772544792">
-							<int key="NSCellFlags">-1804468671</int>
-							<int key="NSCellFlags2">4195328</int>
-							<string key="NSContents"/>
-							<object class="NSFont" key="NSSupport" id="257141036">
+						<object class="NSButtonCell" key="NSCell" id="9092894">
+							<int key="NSCellFlags">67108864</int>
+							<int key="NSCellFlags2">134217728</int>
+							<string key="NSContents">About Sametime</string>
+							<object class="NSFont" key="NSSupport" id="345890644">
 								<string key="NSName">LucidaGrande</string>
 								<double key="NSSize">13</double>
 								<int key="NSfFlags">1044</int>
 							</object>
-							<reference key="NSControlView" ref="21255589"/>
+							<reference key="NSControlView" ref="786387184"/>
+							<int key="NSButtonFlags">-2038284288</int>
+							<int key="NSButtonFlags2">129</int>
+							<string key="NSAlternateContents"/>
+							<string key="NSKeyEquivalent"/>
+							<int key="NSPeriodicDelay">200</int>
+							<int key="NSPeriodicInterval">25</int>
+						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+					</object>
+					<object class="NSTextField" id="300786686">
+						<reference key="NSNextResponder" ref="456936276"/>
+						<int key="NSvFlags">264</int>
+						<string key="NSFrame">{{145, 129}, {206, 22}}</string>
+						<reference key="NSSuperview" ref="456936276"/>
+						<reference key="NSNextKeyView" ref="788263204"/>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSTextFieldCell" key="NSCell" id="668957424">
+							<int key="NSCellFlags">-1804599231</int>
+							<int key="NSCellFlags2">4195328</int>
+							<string key="NSContents"/>
+							<reference key="NSSupport" ref="345890644"/>
+							<reference key="NSControlView" ref="300786686"/>
 							<bool key="NSDrawsBackground">YES</bool>
-							<object class="NSColor" key="NSBackgroundColor" id="823291161">
+							<object class="NSColor" key="NSBackgroundColor" id="688191201">
 								<int key="NSColorSpace">6</int>
 								<string key="NSCatalogName">System</string>
 								<string key="NSColorName">textBackgroundColor</string>
@@ -65,30 +87,32 @@
 									<bytes key="NSWhite">MQA</bytes>
 								</object>
 							</object>
-							<object class="NSColor" key="NSTextColor" id="134958876">
+							<object class="NSColor" key="NSTextColor" id="299746091">
 								<int key="NSColorSpace">6</int>
 								<string key="NSCatalogName">System</string>
 								<string key="NSColorName">textColor</string>
-								<object class="NSColor" key="NSColor" id="1017664545">
+								<object class="NSColor" key="NSColor" id="57705174">
 									<int key="NSColorSpace">3</int>
 									<bytes key="NSWhite">MAA</bytes>
 								</object>
 							</object>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
-					<object class="NSTextField" id="434147659">
-						<reference key="NSNextResponder" ref="726035085"/>
+					<object class="NSTextField" id="360877538">
+						<reference key="NSNextResponder" ref="456936276"/>
 						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{0, 69}, {140, 17}}</string>
-						<reference key="NSSuperview" ref="726035085"/>
+						<string key="NSFrame">{{0, 131}, {140, 17}}</string>
+						<reference key="NSSuperview" ref="456936276"/>
+						<reference key="NSNextKeyView" ref="300786686"/>
 						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="236291556">
-							<int key="NSCellFlags">67239424</int>
+						<object class="NSTextFieldCell" key="NSCell" id="92280095">
+							<int key="NSCellFlags">67108864</int>
 							<int key="NSCellFlags2">71303168</int>
 							<string key="NSContents">User:</string>
-							<reference key="NSSupport" ref="257141036"/>
-							<reference key="NSControlView" ref="434147659"/>
-							<object class="NSColor" key="NSBackgroundColor" id="1055422716">
+							<reference key="NSSupport" ref="345890644"/>
+							<reference key="NSControlView" ref="360877538"/>
+							<object class="NSColor" key="NSBackgroundColor" id="877577968">
 								<int key="NSColorSpace">6</int>
 								<string key="NSCatalogName">System</string>
 								<string key="NSColorName">controlColor</string>
@@ -97,159 +121,175 @@
 									<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
 								</object>
 							</object>
-							<object class="NSColor" key="NSTextColor" id="932679863">
+							<object class="NSColor" key="NSTextColor" id="76897757">
 								<int key="NSColorSpace">6</int>
 								<string key="NSCatalogName">System</string>
 								<string key="NSColorName">controlTextColor</string>
-								<reference key="NSColor" ref="1017664545"/>
+								<reference key="NSColor" ref="57705174"/>
 							</object>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
-					<object class="NSTextField" id="480284112">
-						<reference key="NSNextResponder" ref="726035085"/>
+					<object class="NSTextField" id="83212388">
+						<reference key="NSNextResponder" ref="456936276"/>
 						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{0, 9}, {140, 17}}</string>
-						<reference key="NSSuperview" ref="726035085"/>
+						<string key="NSFrame">{{0, 71}, {140, 17}}</string>
+						<reference key="NSSuperview" ref="456936276"/>
+						<reference key="NSNextKeyView" ref="1017257793"/>
 						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="226408535">
-							<int key="NSCellFlags">67239424</int>
+						<object class="NSTextFieldCell" key="NSCell" id="403480781">
+							<int key="NSCellFlags">67108864</int>
 							<int key="NSCellFlags2">71303168</int>
 							<string key="NSContents">Password:</string>
-							<reference key="NSSupport" ref="257141036"/>
-							<reference key="NSControlView" ref="480284112"/>
-							<reference key="NSBackgroundColor" ref="1055422716"/>
-							<reference key="NSTextColor" ref="932679863"/>
+							<reference key="NSSupport" ref="345890644"/>
+							<reference key="NSControlView" ref="83212388"/>
+							<reference key="NSBackgroundColor" ref="877577968"/>
+							<reference key="NSTextColor" ref="76897757"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
-					<object class="NSTextField" id="164619599">
-						<reference key="NSNextResponder" ref="726035085"/>
+					<object class="NSTextField" id="1017257793">
+						<reference key="NSNextResponder" ref="456936276"/>
 						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{145, 7}, {206, 22}}</string>
-						<reference key="NSSuperview" ref="726035085"/>
+						<string key="NSFrame">{{145, 69}, {206, 22}}</string>
+						<reference key="NSSuperview" ref="456936276"/>
+						<reference key="NSNextKeyView" ref="786387184"/>
 						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="442931251">
-							<int key="NSCellFlags">-1804468671</int>
-							<int key="NSCellFlags2">4195328</int>
-							<string key="NSContents"/>
-							<reference key="NSSupport" ref="257141036"/>
-							<reference key="NSControlView" ref="164619599"/>
-							<bool key="NSDrawsBackground">YES</bool>
-							<reference key="NSBackgroundColor" ref="823291161"/>
-							<reference key="NSTextColor" ref="134958876"/>
-						</object>
-					</object>
-					<object class="NSTextField" id="818186015">
-						<reference key="NSNextResponder" ref="726035085"/>
-						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{145, 37}, {206, 22}}</string>
-						<reference key="NSSuperview" ref="726035085"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="59908056">
-							<int key="NSCellFlags">-1804468671</int>
+						<object class="NSTextFieldCell" key="NSCell" id="52149877">
+							<int key="NSCellFlags">-1804599231</int>
 							<int key="NSCellFlags2">4195328</int>
 							<string key="NSContents"/>
-							<reference key="NSSupport" ref="257141036"/>
-							<reference key="NSControlView" ref="818186015"/>
+							<reference key="NSSupport" ref="345890644"/>
+							<reference key="NSControlView" ref="1017257793"/>
 							<bool key="NSDrawsBackground">YES</bool>
-							<reference key="NSBackgroundColor" ref="823291161"/>
-							<reference key="NSTextColor" ref="134958876"/>
+							<reference key="NSBackgroundColor" ref="688191201"/>
+							<reference key="NSTextColor" ref="299746091"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
-					<object class="NSTextField" id="462623921">
-						<reference key="NSNextResponder" ref="726035085"/>
+					<object class="NSTextField" id="845496339">
+						<reference key="NSNextResponder" ref="456936276"/>
 						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{0, 39}, {140, 17}}</string>
-						<reference key="NSSuperview" ref="726035085"/>
+						<string key="NSFrame">{{145, 99}, {206, 22}}</string>
+						<reference key="NSSuperview" ref="456936276"/>
+						<reference key="NSNextKeyView" ref="265420786"/>
 						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="1034518480">
-							<int key="NSCellFlags">67239424</int>
+						<object class="NSTextFieldCell" key="NSCell" id="256163992">
+							<int key="NSCellFlags">-1804599231</int>
+							<int key="NSCellFlags2">4195328</int>
+							<string key="NSContents"/>
+							<reference key="NSSupport" ref="345890644"/>
+							<reference key="NSControlView" ref="845496339"/>
+							<bool key="NSDrawsBackground">YES</bool>
+							<reference key="NSBackgroundColor" ref="688191201"/>
+							<reference key="NSTextColor" ref="299746091"/>
+						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+					</object>
+					<object class="NSTextField" id="788263204">
+						<reference key="NSNextResponder" ref="456936276"/>
+						<int key="NSvFlags">264</int>
+						<string key="NSFrame">{{0, 101}, {140, 17}}</string>
+						<reference key="NSSuperview" ref="456936276"/>
+						<reference key="NSNextKeyView" ref="845496339"/>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSTextFieldCell" key="NSCell" id="40290300">
+							<int key="NSCellFlags">67108864</int>
 							<int key="NSCellFlags2">71303168</int>
 							<string key="NSContents">Server:</string>
-							<reference key="NSSupport" ref="257141036"/>
-							<reference key="NSControlView" ref="462623921"/>
-							<reference key="NSBackgroundColor" ref="1055422716"/>
-							<reference key="NSTextColor" ref="932679863"/>
+							<reference key="NSSupport" ref="345890644"/>
+							<reference key="NSControlView" ref="788263204"/>
+							<reference key="NSBackgroundColor" ref="877577968"/>
+							<reference key="NSTextColor" ref="76897757"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
-					<object class="NSTextField" id="146812833">
-						<reference key="NSNextResponder" ref="726035085"/>
+					<object class="NSTextField" id="265420786">
+						<reference key="NSNextResponder" ref="456936276"/>
 						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{351, 39}, {46, 17}}</string>
-						<reference key="NSSuperview" ref="726035085"/>
+						<string key="NSFrame">{{351, 101}, {46, 17}}</string>
+						<reference key="NSSuperview" ref="456936276"/>
+						<reference key="NSNextKeyView" ref="387570325"/>
 						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="95222513">
-							<int key="NSCellFlags">67239424</int>
+						<object class="NSTextFieldCell" key="NSCell" id="838534063">
+							<int key="NSCellFlags">67108864</int>
 							<int key="NSCellFlags2">71303168</int>
 							<string key="NSContents">Port:</string>
-							<reference key="NSSupport" ref="257141036"/>
-							<reference key="NSControlView" ref="146812833"/>
-							<reference key="NSBackgroundColor" ref="1055422716"/>
-							<reference key="NSTextColor" ref="932679863"/>
+							<reference key="NSSupport" ref="345890644"/>
+							<reference key="NSControlView" ref="265420786"/>
+							<reference key="NSBackgroundColor" ref="877577968"/>
+							<reference key="NSTextColor" ref="76897757"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
-					<object class="NSTextField" id="340013624">
-						<reference key="NSNextResponder" ref="726035085"/>
+					<object class="NSTextField" id="387570325">
+						<reference key="NSNextResponder" ref="456936276"/>
 						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{397, 37}, {50, 22}}</string>
-						<reference key="NSSuperview" ref="726035085"/>
+						<string key="NSFrame">{{397, 99}, {50, 22}}</string>
+						<reference key="NSSuperview" ref="456936276"/>
+						<reference key="NSNextKeyView" ref="83212388"/>
 						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="384330899">
-							<int key="NSCellFlags">-1804468671</int>
+						<object class="NSTextFieldCell" key="NSCell" id="1044426197">
+							<int key="NSCellFlags">-1804599231</int>
 							<int key="NSCellFlags2">4195328</int>
 							<string key="NSContents"/>
-							<reference key="NSSupport" ref="257141036"/>
-							<reference key="NSControlView" ref="340013624"/>
+							<reference key="NSSupport" ref="345890644"/>
+							<reference key="NSControlView" ref="387570325"/>
 							<bool key="NSDrawsBackground">YES</bool>
-							<reference key="NSBackgroundColor" ref="823291161"/>
-							<reference key="NSTextColor" ref="134958876"/>
+							<reference key="NSBackgroundColor" ref="688191201"/>
+							<reference key="NSTextColor" ref="299746091"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 				</array>
-				<string key="NSFrameSize">{450, 89}</string>
+				<string key="NSFrameSize">{450, 151}</string>
+				<reference key="NSSuperview"/>
+				<reference key="NSNextKeyView" ref="360877538"/>
 				<object class="NSMutableString" key="NSClassName">
 					<characters key="NS.bytes">NSView</characters>
 				</object>
 				<string key="NSExtension">NSResponder</string>
 			</object>
-			<object class="NSCustomView" id="205319121">
+			<object class="NSCustomView" id="1027741058">
 				<nil key="NSNextResponder"/>
 				<int key="NSvFlags">256</int>
 				<array class="NSMutableArray" key="NSSubviews">
-					<object class="NSTextField" id="446201637">
-						<reference key="NSNextResponder" ref="205319121"/>
+					<object class="NSTextField" id="120106116">
+						<reference key="NSNextResponder" ref="1027741058"/>
 						<int key="NSvFlags">264</int>
 						<string key="NSFrame">{{-3, 39}, {140, 17}}</string>
-						<reference key="NSSuperview" ref="205319121"/>
+						<reference key="NSSuperview" ref="1027741058"/>
 						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="1055771071">
-							<int key="NSCellFlags">67239424</int>
+						<object class="NSTextFieldCell" key="NSCell" id="386179944">
+							<int key="NSCellFlags">67108864</int>
 							<int key="NSCellFlags2">71303168</int>
 							<string key="NSContents">Login:</string>
-							<reference key="NSSupport" ref="257141036"/>
-							<reference key="NSControlView" ref="446201637"/>
-							<reference key="NSBackgroundColor" ref="1055422716"/>
-							<reference key="NSTextColor" ref="932679863"/>
+							<reference key="NSSupport" ref="345890644"/>
+							<reference key="NSControlView" ref="120106116"/>
+							<reference key="NSBackgroundColor" ref="877577968"/>
+							<reference key="NSTextColor" ref="76897757"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
-					<object class="NSButton" id="914475048">
-						<reference key="NSNextResponder" ref="205319121"/>
+					<object class="NSButton" id="634737218">
+						<reference key="NSNextResponder" ref="1027741058"/>
 						<int key="NSvFlags">264</int>
 						<string key="NSFrame">{{140, 18}, {250, 18}}</string>
-						<reference key="NSSuperview" ref="205319121"/>
+						<reference key="NSSuperview" ref="1027741058"/>
 						<bool key="NSEnabled">YES</bool>
-						<object class="NSButtonCell" key="NSCell" id="352362550">
-							<int key="NSCellFlags">67239424</int>
+						<object class="NSButtonCell" key="NSCell" id="65578924">
+							<int key="NSCellFlags">67108864</int>
 							<int key="NSCellFlags2">0</int>
 							<string key="NSContents">Force login (ignore server redirects)</string>
-							<reference key="NSSupport" ref="257141036"/>
-							<reference key="NSControlView" ref="914475048"/>
-							<int key="NSButtonFlags">1211912703</int>
+							<reference key="NSSupport" ref="345890644"/>
+							<reference key="NSControlView" ref="634737218"/>
+							<int key="NSButtonFlags">1211912448</int>
 							<int key="NSButtonFlags2">2</int>
-							<object class="NSCustomResource" key="NSNormalImage" id="625613219">
+							<object class="NSCustomResource" key="NSNormalImage" id="596121627">
 								<string key="NSClassName">NSImage</string>
 								<string key="NSResourceName">NSSwitch</string>
 							</object>
-							<object class="NSButtonImageSource" key="NSAlternateImage" id="129905979">
+							<object class="NSButtonImageSource" key="NSAlternateImage" id="710399894">
 								<string key="NSImageName">NSSwitch</string>
 							</object>
 							<string key="NSAlternateContents"/>
@@ -257,28 +297,30 @@
 							<int key="NSPeriodicDelay">200</int>
 							<int key="NSPeriodicInterval">25</int>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
-					<object class="NSButton" id="165228241">
-						<reference key="NSNextResponder" ref="205319121"/>
+					<object class="NSButton" id="436065848">
+						<reference key="NSNextResponder" ref="1027741058"/>
 						<int key="NSvFlags">264</int>
 						<string key="NSFrame">{{140, 38}, {250, 18}}</string>
-						<reference key="NSSuperview" ref="205319121"/>
+						<reference key="NSSuperview" ref="1027741058"/>
 						<bool key="NSEnabled">YES</bool>
-						<object class="NSButtonCell" key="NSCell" id="818475560">
-							<int key="NSCellFlags">67239424</int>
+						<object class="NSButtonCell" key="NSCell" id="331559912">
+							<int key="NSCellFlags">67108864</int>
 							<int key="NSCellFlags2">0</int>
 							<string key="NSContents">Hide client identity</string>
-							<reference key="NSSupport" ref="257141036"/>
-							<reference key="NSControlView" ref="165228241"/>
-							<int key="NSButtonFlags">1211912703</int>
+							<reference key="NSSupport" ref="345890644"/>
+							<reference key="NSControlView" ref="436065848"/>
+							<int key="NSButtonFlags">1211912448</int>
 							<int key="NSButtonFlags2">2</int>
-							<reference key="NSNormalImage" ref="625613219"/>
-							<reference key="NSAlternateImage" ref="129905979"/>
+							<reference key="NSNormalImage" ref="596121627"/>
+							<reference key="NSAlternateImage" ref="710399894"/>
 							<string key="NSAlternateContents"/>
 							<string key="NSKeyEquivalent"/>
 							<int key="NSPeriodicDelay">200</int>
 							<int key="NSPeriodicInterval">25</int>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 				</array>
 				<string key="NSFrameSize">{408, 56}</string>
@@ -293,120 +335,120 @@
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">textField_accountUID</string>
-						<reference key="source" ref="359413908"/>
-						<reference key="destination" ref="21255589"/>
+						<reference key="source" ref="489696043"/>
+						<reference key="destination" ref="300786686"/>
 					</object>
 					<int key="connectionID">232</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">textField_accountUIDLabel</string>
-						<reference key="source" ref="359413908"/>
-						<reference key="destination" ref="434147659"/>
+						<reference key="source" ref="489696043"/>
+						<reference key="destination" ref="360877538"/>
 					</object>
 					<int key="connectionID">233</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">textField_connectHost</string>
-						<reference key="source" ref="359413908"/>
-						<reference key="destination" ref="818186015"/>
+						<reference key="source" ref="489696043"/>
+						<reference key="destination" ref="845496339"/>
 					</object>
 					<int key="connectionID">234</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">textField_connectPort</string>
-						<reference key="source" ref="359413908"/>
-						<reference key="destination" ref="340013624"/>
+						<reference key="source" ref="489696043"/>
+						<reference key="destination" ref="387570325"/>
 					</object>
 					<int key="connectionID">235</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">textField_password</string>
-						<reference key="source" ref="359413908"/>
-						<reference key="destination" ref="164619599"/>
+						<reference key="source" ref="489696043"/>
+						<reference key="destination" ref="1017257793"/>
 					</object>
 					<int key="connectionID">236</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">view_setup</string>
-						<reference key="source" ref="359413908"/>
-						<reference key="destination" ref="726035085"/>
+						<reference key="source" ref="489696043"/>
+						<reference key="destination" ref="456936276"/>
 					</object>
 					<int key="connectionID">237</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">changedPreference:</string>
-						<reference key="source" ref="359413908"/>
-						<reference key="destination" ref="21255589"/>
+						<reference key="source" ref="489696043"/>
+						<reference key="destination" ref="300786686"/>
 					</object>
 					<int key="connectionID">238</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">changedPreference:</string>
-						<reference key="source" ref="359413908"/>
-						<reference key="destination" ref="818186015"/>
+						<reference key="source" ref="489696043"/>
+						<reference key="destination" ref="845496339"/>
 					</object>
 					<int key="connectionID">239</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">changedPreference:</string>
-						<reference key="source" ref="359413908"/>
-						<reference key="destination" ref="340013624"/>
+						<reference key="source" ref="489696043"/>
+						<reference key="destination" ref="387570325"/>
 					</object>
 					<int key="connectionID">240</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">changedPreference:</string>
-						<reference key="source" ref="359413908"/>
-						<reference key="destination" ref="164619599"/>
+						<reference key="source" ref="489696043"/>
+						<reference key="destination" ref="1017257793"/>
 					</object>
 					<int key="connectionID">241</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">view_options</string>
-						<reference key="source" ref="359413908"/>
-						<reference key="destination" ref="205319121"/>
+						<reference key="source" ref="489696043"/>
+						<reference key="destination" ref="1027741058"/>
 					</object>
 					<int key="connectionID">243</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">checkBox_fakeClientId</string>
-						<reference key="source" ref="359413908"/>
-						<reference key="destination" ref="165228241"/>
+						<reference key="source" ref="489696043"/>
+						<reference key="destination" ref="436065848"/>
 					</object>
 					<int key="connectionID">248</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">checkBox_forceLogin</string>
-						<reference key="source" ref="359413908"/>
-						<reference key="destination" ref="914475048"/>
+						<reference key="source" ref="489696043"/>
+						<reference key="destination" ref="634737218"/>
 					</object>
 					<int key="connectionID">249</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">changedPreference:</string>
-						<reference key="source" ref="359413908"/>
-						<reference key="destination" ref="914475048"/>
+						<reference key="source" ref="489696043"/>
+						<reference key="destination" ref="634737218"/>
 					</object>
 					<int key="connectionID">250</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">changedPreference:</string>
-						<reference key="source" ref="359413908"/>
-						<reference key="destination" ref="165228241"/>
+						<reference key="source" ref="489696043"/>
+						<reference key="destination" ref="436065848"/>
 					</object>
 					<int key="connectionID">251</int>
 				</object>
@@ -416,197 +458,211 @@
 					<object class="IBObjectRecord">
 						<int key="objectID">0</int>
 						<array key="object" id="0"/>
-						<reference key="children" ref="65162756"/>
+						<reference key="children" ref="376150513"/>
 						<nil key="parent"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">-2</int>
-						<reference key="object" ref="359413908"/>
+						<reference key="object" ref="489696043"/>
 						<reference key="parent" ref="0"/>
 						<string key="objectName">File's Owner</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">-1</int>
-						<reference key="object" ref="186331853"/>
+						<reference key="object" ref="139893652"/>
 						<reference key="parent" ref="0"/>
 						<string key="objectName">First Responder</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">223</int>
-						<reference key="object" ref="726035085"/>
+						<reference key="object" ref="456936276"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="21255589"/>
-							<reference ref="434147659"/>
-							<reference ref="480284112"/>
-							<reference ref="164619599"/>
-							<reference ref="818186015"/>
-							<reference ref="462623921"/>
-							<reference ref="146812833"/>
-							<reference ref="340013624"/>
+							<reference ref="300786686"/>
+							<reference ref="360877538"/>
+							<reference ref="83212388"/>
+							<reference ref="1017257793"/>
+							<reference ref="845496339"/>
+							<reference ref="788263204"/>
+							<reference ref="265420786"/>
+							<reference ref="387570325"/>
+							<reference ref="786387184"/>
 						</array>
 						<reference key="parent" ref="0"/>
 						<string key="objectName">Setup</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">224</int>
-						<reference key="object" ref="21255589"/>
+						<reference key="object" ref="300786686"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="772544792"/>
+							<reference ref="668957424"/>
 						</array>
-						<reference key="parent" ref="726035085"/>
+						<reference key="parent" ref="456936276"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">225</int>
-						<reference key="object" ref="434147659"/>
+						<reference key="object" ref="360877538"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="236291556"/>
+							<reference ref="92280095"/>
 						</array>
-						<reference key="parent" ref="726035085"/>
+						<reference key="parent" ref="456936276"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">226</int>
-						<reference key="object" ref="480284112"/>
+						<reference key="object" ref="83212388"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="226408535"/>
+							<reference ref="403480781"/>
 						</array>
-						<reference key="parent" ref="726035085"/>
+						<reference key="parent" ref="456936276"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">227</int>
-						<reference key="object" ref="164619599"/>
+						<reference key="object" ref="1017257793"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="442931251"/>
+							<reference ref="52149877"/>
 						</array>
-						<reference key="parent" ref="726035085"/>
+						<reference key="parent" ref="456936276"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">228</int>
-						<reference key="object" ref="818186015"/>
+						<reference key="object" ref="845496339"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="59908056"/>
+							<reference ref="256163992"/>
 						</array>
-						<reference key="parent" ref="726035085"/>
+						<reference key="parent" ref="456936276"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">229</int>
-						<reference key="object" ref="462623921"/>
+						<reference key="object" ref="788263204"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="1034518480"/>
+							<reference ref="40290300"/>
 						</array>
-						<reference key="parent" ref="726035085"/>
+						<reference key="parent" ref="456936276"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">230</int>
-						<reference key="object" ref="146812833"/>
+						<reference key="object" ref="265420786"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="95222513"/>
+							<reference ref="838534063"/>
 						</array>
-						<reference key="parent" ref="726035085"/>
+						<reference key="parent" ref="456936276"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">231</int>
-						<reference key="object" ref="340013624"/>
+						<reference key="object" ref="387570325"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="384330899"/>
+							<reference ref="1044426197"/>
 						</array>
-						<reference key="parent" ref="726035085"/>
+						<reference key="parent" ref="456936276"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">242</int>
-						<reference key="object" ref="205319121"/>
+						<reference key="object" ref="1027741058"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="446201637"/>
-							<reference ref="914475048"/>
-							<reference ref="165228241"/>
+							<reference ref="120106116"/>
+							<reference ref="634737218"/>
+							<reference ref="436065848"/>
 						</array>
 						<reference key="parent" ref="0"/>
 						<string key="objectName">Options</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">245</int>
-						<reference key="object" ref="446201637"/>
+						<reference key="object" ref="120106116"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="1055771071"/>
+							<reference ref="386179944"/>
 						</array>
-						<reference key="parent" ref="205319121"/>
+						<reference key="parent" ref="1027741058"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">246</int>
-						<reference key="object" ref="914475048"/>
+						<reference key="object" ref="634737218"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="352362550"/>
+							<reference ref="65578924"/>
 						</array>
-						<reference key="parent" ref="205319121"/>
+						<reference key="parent" ref="1027741058"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">247</int>
-						<reference key="object" ref="165228241"/>
+						<reference key="object" ref="436065848"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="818475560"/>
+							<reference ref="331559912"/>
 						</array>
-						<reference key="parent" ref="205319121"/>
+						<reference key="parent" ref="1027741058"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">253</int>
-						<reference key="object" ref="772544792"/>
-						<reference key="parent" ref="21255589"/>
+						<reference key="object" ref="668957424"/>
+						<reference key="parent" ref="300786686"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">254</int>
-						<reference key="object" ref="236291556"/>
-						<reference key="parent" ref="434147659"/>
+						<reference key="object" ref="92280095"/>
+						<reference key="parent" ref="360877538"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">255</int>
-						<reference key="object" ref="226408535"/>
-						<reference key="parent" ref="480284112"/>
+						<reference key="object" ref="403480781"/>
+						<reference key="parent" ref="83212388"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">256</int>
-						<reference key="object" ref="442931251"/>
-						<reference key="parent" ref="164619599"/>
+						<reference key="object" ref="52149877"/>
+						<reference key="parent" ref="1017257793"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">257</int>
-						<reference key="object" ref="59908056"/>
-						<reference key="parent" ref="818186015"/>
+						<reference key="object" ref="256163992"/>
+						<reference key="parent" ref="845496339"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">258</int>
-						<reference key="object" ref="1034518480"/>
-						<reference key="parent" ref="462623921"/>
+						<reference key="object" ref="40290300"/>
+						<reference key="parent" ref="788263204"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">259</int>
-						<reference key="object" ref="95222513"/>
-						<reference key="parent" ref="146812833"/>
+						<reference key="object" ref="838534063"/>
+						<reference key="parent" ref="265420786"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">260</int>
-						<reference key="object" ref="384330899"/>
-						<reference key="parent" ref="340013624"/>
+						<reference key="object" ref="1044426197"/>
+						<reference key="parent" ref="387570325"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">261</int>
-						<reference key="object" ref="1055771071"/>
-						<reference key="parent" ref="446201637"/>
+						<reference key="object" ref="386179944"/>
+						<reference key="parent" ref="120106116"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">262</int>
-						<reference key="object" ref="352362550"/>
-						<reference key="parent" ref="914475048"/>
+						<reference key="object" ref="65578924"/>
+						<reference key="parent" ref="634737218"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">263</int>
-						<reference key="object" ref="818475560"/>
-						<reference key="parent" ref="165228241"/>
+						<reference key="object" ref="331559912"/>
+						<reference key="parent" ref="436065848"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">-3</int>
-						<reference key="object" ref="999691793"/>
+						<reference key="object" ref="443882121"/>
 						<reference key="parent" ref="0"/>
 						<string key="objectName">Application</string>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">264</int>
+						<reference key="object" ref="786387184"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="9092894"/>
+						</array>
+						<reference key="parent" ref="456936276"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">265</int>
+						<reference key="object" ref="9092894"/>
+						<reference key="parent" ref="786387184"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -638,12 +694,15 @@
 				<string key="261.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="262.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="263.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="264.CustomClassName">AILocalizationButton</string>
+				<string key="264.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="265.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 			</dictionary>
 			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">263</int>
+			<int key="maxID">265</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
@@ -652,10 +711,6 @@
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
 			<real value="1060" key="NS.object.0"/>
 		</object>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
-			<real value="1060" key="NS.object.0"/>
-		</object>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
 			<real value="3200" key="NS.object.0"/>
--- a/Plugins/Purple Service/adiumPurpleCertificateTrustWarning.m	Mon Aug 13 00:26:14 2012 +0200
+++ b/Plugins/Purple Service/adiumPurpleCertificateTrustWarning.m	Thu Sep 06 00:18:31 2012 +0200
@@ -22,6 +22,8 @@
 #import "ESPurpleJabberAccount.h"
 
 void adium_query_cert_chain(PurpleSslConnection *gsc, const char *hostname, CFArrayRef certs, void (*query_cert_cb)(gboolean trusted, void *userdata), void *userdata) {
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+	
 	// only the jabber service supports this right now
 	for (ESPurpleJabberAccount *account in [adium.accountController accountsCompatibleWithService:[adium.accountController firstServiceWithServiceID:@"Jabber"]]) {
 		if([account secureConnection] == gsc) {
@@ -33,9 +35,12 @@
 																				 userData:userdata];
 			else
 				query_cert_cb(true, userdata);
+			[pool release];
 			return;
 		}
 	}
 	// default fallback
 	query_cert_cb(true, userdata);
+	
+	[pool release];
 }
--- a/Plugins/Purple Service/adiumPurpleCore.m	Mon Aug 13 00:26:14 2012 +0200
+++ b/Plugins/Purple Service/adiumPurpleCore.m	Thu Sep 06 00:18:31 2012 +0200
@@ -155,8 +155,12 @@
 
 static void adiumPurpleCoreDebugInit(void)
 {
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+	
 	AILogWithSignature(@"");
 	configurePurpleDebugLogging();
+	
+	[pool release];
 }
 
 static void associateLibpurpleAccounts(void)
@@ -255,6 +259,8 @@
 
 static GHashTable *adiumPurpleCoreGetUiInfo(void)
 {
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+	
 	static GHashTable *ui_info = NULL;
 	if (!ui_info) {
 		ui_info = g_hash_table_new(g_str_hash, g_str_equal);
@@ -281,6 +287,8 @@
 		 * points, we now use the key used by the offical AIR (Mac/Linux) client. */
 		g_hash_table_insert(ui_info, "prpl-icq-clientkey", "ic1-IIcaJnnNV5xA");
 	}
+	
+	[pool release];
 
 	return ui_info;
 }
--- a/Plugins/Purple Service/adiumPurpleDnsRequest.m	Mon Aug 13 00:26:14 2012 +0200
+++ b/Plugins/Purple Service/adiumPurpleDnsRequest.m	Thu Sep 06 00:18:31 2012 +0200
@@ -102,6 +102,8 @@
 						   const CFStreamError *streamError,
 						   void *info)
 {
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+	
 	AdiumPurpleDnsRequest *self = (AdiumPurpleDnsRequest *)info;
 	if (streamError && (streamError->error != 0)) {
 		[self lookupFailedWithError:streamError];
@@ -119,6 +121,8 @@
 			[self lookupFailedWithError:NULL];
 		}
 	}
+	
+	[pool release];
 }
 
 /*!
--- a/Plugins/Purple Service/adiumPurpleSignals.m	Mon Aug 13 00:26:14 2012 +0200
+++ b/Plugins/Purple Service/adiumPurpleSignals.m	Thu Sep 06 00:18:31 2012 +0200
@@ -27,6 +27,8 @@
 
 static void buddy_event_cb(PurpleBuddy *buddy, PurpleBuddyEvent event)
 {
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+	
 	if (buddy) {
 		SEL				updateSelector = nil;
 		id				data = nil;
@@ -121,10 +123,13 @@
 			}
 		}
 	}
+	
+	[pool release];
 }
 
 static void buddy_status_changed_cb(PurpleBuddy *buddy, PurpleStatus *oldstatus, PurpleStatus *status, PurpleBuddyEvent event)
 {
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 	CBPurpleAccount		*account = accountLookup(purple_buddy_get_account(buddy));
 	AIListContact		*theContact = contactLookupFromBuddy(buddy);
 	NSNumber			*statusTypeNumber;
@@ -148,10 +153,12 @@
 						 statusName:statusName
 					  statusMessage:statusMessage
 						   isMobile:isMobile];
+	[pool release];
 }
 
 static void buddy_idle_changed_cb(PurpleBuddy *buddy, gboolean old_idle, gboolean idle, PurpleBuddyEvent event)
 {
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 	CBPurpleAccount	*account = accountLookup(purple_buddy_get_account(buddy));
 	AIListContact	*theContact = contactLookupFromBuddy(buddy);
 	PurplePresence	*presence = purple_buddy_get_presence(buddy);
@@ -167,11 +174,14 @@
 		[account updateIdleReturn:theContact
 						 withData:nil];
 	}
+	
+	[pool release];
 }
 
 //This is called when a buddy is added or changes groups
 static void buddy_added_cb(PurpleBuddy *buddy)
 {
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 	PurpleAccount	*purpleAccount = purple_buddy_get_account(buddy);
 	if (purple_account_is_connected(purpleAccount)) {
 		CBPurpleAccount	*account = accountLookup(purpleAccount);
@@ -202,10 +212,12 @@
 		// Force a status update for the user. Useful for things like XMPP which might display an error message for an offline contact.
 		buddy_status_changed_cb(buddy, NULL, purple_presence_get_active_status(purple_buddy_get_presence(buddy)), PURPLE_BUDDY_NONE);
 	}
+	[pool release];
 }
 
 static void buddy_removed_cb(PurpleBuddy *buddy)
 {
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 	PurpleAccount	*purpleAccount = purple_buddy_get_account(buddy);
 	if (purple_account_is_connected(purpleAccount)) {
 		CBPurpleAccount	*account = accountLookup(purpleAccount);
@@ -219,20 +231,25 @@
 		 */
 		[account removeContact:listContact fromGroupName:groupName];
 	}
+	[pool release];
 }
 
 static void connection_signed_on_cb(PurpleConnection *gc)
 {
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 	GSList *buddies = purple_find_buddies(purple_connection_get_account(gc), /* buddy_name */ NULL);
 	GSList *cur;
 	for (cur = buddies; cur; cur = cur->next) {
 		buddy_added_cb((PurpleBuddy *)cur->data);
 	}
 	g_slist_free(buddies);
+	
+	[pool release];
 }
 
 static void node_aliased_cb(PurpleBlistNode *node, char *old_alias)
 {
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 	if (PURPLE_BLIST_NODE_IS_BUDDY(node)) {
 		PurpleBuddy		*buddy = (PurpleBuddy *)node;
 		CBPurpleAccount	*account = accountLookup(purple_buddy_get_account(buddy));
@@ -247,6 +264,8 @@
 		[account updateContact:contactLookupFromBuddy(buddy)
 					   toAlias:(alias ? [NSString stringWithUTF8String:alias] : nil)];
 	}
+	
+	[pool release];
 }
 
 static NSDictionary *dictionaryFromHashTable(GHashTable *data)
@@ -273,6 +292,7 @@
 
 static void chat_join_failed_cb(PurpleConnection *gc, GHashTable *components)
 {
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 	CBPurpleAccount	*account = accountLookup(purple_connection_get_account(gc));
 	NSDictionary *componentDict = dictionaryFromHashTable(components);
 
@@ -283,15 +303,19 @@
 			break;
 		}
 	}
+	
+	[pool release];
 }
 
 static void typing_changed(PurpleAccount *account, const char *name, AITypingState typingState)
 {
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 	CBPurpleAccount	*cbaccount = accountLookup(account);
 	AIListContact *contact = contactLookupFromBuddy(purple_find_buddy(account, name));
 	
 	// Don't do anything for those who aren't on our contact list.
 	if (contact.isStranger) {
+		[pool release];
 		return;
 	}
 
@@ -304,14 +328,18 @@
 
 	if (chat)
 		[cbaccount typingUpdateForIMChat:chat typing:[NSNumber numberWithInteger:typingState]];
+	
+	[pool release];
 }
 
 static void conversation_created_cb(PurpleConversation *conv, void *data) {
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 	if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM) {
 		AIChat *chat = imChatLookupFromConv(conv);
 		//When a conversation is created, we must clear the typing flag, as libpurple won't notify us properly
 		[accountLookup(purple_conversation_get_account(conv)) typingUpdateForIMChat:chat typing:[NSNumber numberWithInteger:AINotTyping]];
 	}
+	[pool release];
 }
 
 /* The buddy-typing, buddy-typed, and buddy-typing-stopped signals will only be sent
@@ -337,19 +365,23 @@
 
 static void
 chat_joined_cb(PurpleConversation *conv, void *data) {
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 	//Pass chats along to the account
 	if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT) {
 		
 		AIChat *chat = groupChatLookupFromConv(conv);
 		
 		[accountLookup(purple_conversation_get_account(conv)) addChat:chat];
-	}	
+	}
+	
+	[pool release];
 }
 
 
 static void
 file_recv_request_cb(PurpleXfer *xfer)
 {
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 	ESFileTransfer  *fileTransfer;
 	
     //Purple doesn't return normalized user id, so it should be normalized manually
@@ -374,10 +406,13 @@
 	
 	//Tell the account that we are ready to request the reception
 	[accountLookup(purple_xfer_get_account(xfer)) requestReceiveOfFileTransfer:fileTransfer];
+	
+	[pool release];
 }
 
 void configureAdiumPurpleSignals(void)
 {
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 	void *blist_handle = purple_blist_get_handle();
 	void *handle       = adium_purple_get_handle();
 	
@@ -448,4 +483,6 @@
 
 	purple_signal_connect(purple_xfers_get_handle(), "file-recv-request",
 						  handle, PURPLE_CALLBACK(file_recv_request_cb), NULL);
+	
+	[pool release];
 }
--- a/Plugins/Twitter Plugin/AILaconicaService.m	Mon Aug 13 00:26:14 2012 +0200
+++ b/Plugins/Twitter Plugin/AILaconicaService.m	Thu Sep 06 00:18:31 2012 +0200
@@ -52,6 +52,14 @@
 - (NSString *)longDescription{
 	return @"StatusNet";
 }
+- (NSURL *)serviceAccountSetupURL
+{
+	return [NSURL URLWithString:AILocalizedString(@"http://status.net/signup", @"URL for StatusNet signup or about page. Replace with the URL to an equivalent page in your language if one exists.")];
+}
+- (NSString *)accountSetupLabel
+{
+	return AILocalizedString(@"Sign up for StatusNet", @"Text for StatusNet sign up button");
+}
 - (NSCharacterSet *)allowedCharacters{
 	return [NSCharacterSet characterSetWithCharactersInString:@"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_"];
 }
--- a/Plugins/Twitter Plugin/Resources/en.lproj/AITwitterAccountView.xib	Mon Aug 13 00:26:14 2012 +0200
+++ b/Plugins/Twitter Plugin/Resources/en.lproj/AITwitterAccountView.xib	Thu Sep 06 00:18:31 2012 +0200
@@ -2,29 +2,29 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
 	<data>
 		<int key="IBDocument.SystemTarget">1060</int>
-		<string key="IBDocument.SystemVersion">11D50b</string>
-		<string key="IBDocument.InterfaceBuilderVersion">2182</string>
-		<string key="IBDocument.AppKitVersion">1138.32</string>
-		<string key="IBDocument.HIToolboxVersion">568.00</string>
+		<string key="IBDocument.SystemVersion">12A269</string>
+		<string key="IBDocument.InterfaceBuilderVersion">2549</string>
+		<string key="IBDocument.AppKitVersion">1187</string>
+		<string key="IBDocument.HIToolboxVersion">624.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">2182</string>
+			<string key="NS.object.0">2549</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
-			<string>NSPopUpButton</string>
 			<string>NSButton</string>
+			<string>NSButtonCell</string>
+			<string>NSCustomObject</string>
+			<string>NSCustomView</string>
 			<string>NSMenu</string>
-			<string>NSTextFieldCell</string>
-			<string>NSButtonCell</string>
 			<string>NSMenuItem</string>
+			<string>NSPopUpButton</string>
+			<string>NSPopUpButtonCell</string>
 			<string>NSProgressIndicator</string>
 			<string>NSTabView</string>
-			<string>NSCustomView</string>
 			<string>NSTabViewItem</string>
+			<string>NSTextField</string>
+			<string>NSTextFieldCell</string>
 			<string>NSView</string>
-			<string>NSPopUpButtonCell</string>
-			<string>NSTextField</string>
-			<string>NSCustomObject</string>
 		</array>
 		<array key="IBDocument.PluginDependencies">
 			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -44,7 +44,7 @@
 				<string key="NSClassName">NSApplication</string>
 			</object>
 			<object class="NSCustomView" id="928353753">
-				<nil key="NSNextResponder"/>
+				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">256</int>
 				<array class="NSMutableArray" key="NSSubviews">
 					<object class="NSTextField" id="491413815">
@@ -52,9 +52,10 @@
 						<int key="NSvFlags">264</int>
 						<string key="NSFrame">{{-3, 118}, {140, 17}}</string>
 						<reference key="NSSuperview" ref="928353753"/>
+						<reference key="NSNextKeyView" ref="839358336"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="64531480">
-							<int key="NSCellFlags">67239424</int>
+							<int key="NSCellFlags">67108864</int>
 							<int key="NSCellFlags2">71303168</int>
 							<string key="NSContents">Update tweets:</string>
 							<object class="NSFont" key="NSSupport" id="102052516">
@@ -82,15 +83,17 @@
 								</object>
 							</object>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="852387789">
 						<reference key="NSNextResponder" ref="928353753"/>
 						<int key="NSvFlags">264</int>
 						<string key="NSFrame">{{-3, 203}, {140, 17}}</string>
 						<reference key="NSSuperview" ref="928353753"/>
+						<reference key="NSNextKeyView" ref="56151798"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="645394660">
-							<int key="NSCellFlags">67239424</int>
+							<int key="NSCellFlags">67108864</int>
 							<int key="NSCellFlags2">71303168</int>
 							<string key="NSContents">Server:</string>
 							<reference key="NSSupport" ref="102052516"/>
@@ -98,15 +101,17 @@
 							<reference key="NSBackgroundColor" ref="475075482"/>
 							<reference key="NSTextColor" ref="27965426"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="305057378">
 						<reference key="NSNextResponder" ref="928353753"/>
 						<int key="NSvFlags">264</int>
 						<string key="NSFrame">{{-3, 143}, {140, 17}}</string>
 						<reference key="NSSuperview" ref="928353753"/>
+						<reference key="NSNextKeyView" ref="299750509"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="562410717">
-							<int key="NSCellFlags">67239424</int>
+							<int key="NSCellFlags">67108864</int>
 							<int key="NSCellFlags2">71303168</int>
 							<string key="NSContents">Security:</string>
 							<reference key="NSSupport" ref="102052516"/>
@@ -114,20 +119,22 @@
 							<reference key="NSBackgroundColor" ref="475075482"/>
 							<reference key="NSTextColor" ref="27965426"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSButton" id="299750509">
 						<reference key="NSNextResponder" ref="928353753"/>
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{140, 142}, {294, 18}}</string>
 						<reference key="NSSuperview" ref="928353753"/>
+						<reference key="NSNextKeyView" ref="491413815"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="370529910">
-							<int key="NSCellFlags">-2080244224</int>
+							<int key="NSCellFlags">-2080374784</int>
 							<int key="NSCellFlags2">0</int>
 							<string key="NSContents">Encrypt connection using SSL</string>
 							<reference key="NSSupport" ref="102052516"/>
 							<reference key="NSControlView" ref="299750509"/>
-							<int key="NSButtonFlags">1211912703</int>
+							<int key="NSButtonFlags">1211912448</int>
 							<int key="NSButtonFlags2">2</int>
 							<object class="NSCustomResource" key="NSNormalImage" id="874485579">
 								<string key="NSClassName">NSImage</string>
@@ -141,15 +148,17 @@
 							<int key="NSPeriodicDelay">200</int>
 							<int key="NSPeriodicInterval">25</int>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="937825823">
 						<reference key="NSNextResponder" ref="928353753"/>
 						<int key="NSvFlags">264</int>
 						<string key="NSFrame">{{-3, 54}, {140, 17}}</string>
 						<reference key="NSSuperview" ref="928353753"/>
+						<reference key="NSNextKeyView" ref="120473249"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="68349451">
-							<int key="NSCellFlags">67239424</int>
+							<int key="NSCellFlags">67108864</int>
 							<int key="NSCellFlags2">71303168</int>
 							<string key="NSContents">Global status:</string>
 							<reference key="NSSupport" ref="102052516"/>
@@ -157,15 +166,17 @@
 							<reference key="NSBackgroundColor" ref="475075482"/>
 							<reference key="NSTextColor" ref="27965426"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="59881669">
 						<reference key="NSNextResponder" ref="928353753"/>
 						<int key="NSvFlags">264</int>
 						<string key="NSFrame">{{-3, 7}, {140, 17}}</string>
 						<reference key="NSSuperview" ref="928353753"/>
+						<reference key="NSNextKeyView" ref="377578690"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="256340354">
-							<int key="NSCellFlags">67239424</int>
+							<int key="NSCellFlags">67108864</int>
 							<int key="NSCellFlags2">71303168</int>
 							<string key="NSContents">Display options:</string>
 							<reference key="NSSupport" ref="102052516"/>
@@ -173,19 +184,21 @@
 							<reference key="NSBackgroundColor" ref="475075482"/>
 							<reference key="NSTextColor" ref="27965426"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSPopUpButton" id="839358336">
 						<reference key="NSNextResponder" ref="928353753"/>
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{139, 110}, {227, 26}}</string>
 						<reference key="NSSuperview" ref="928353753"/>
+						<reference key="NSNextKeyView" ref="278799254"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSPopUpButtonCell" key="NSCell" id="105235792">
-							<int key="NSCellFlags">-2076049856</int>
+							<int key="NSCellFlags">-2076180416</int>
 							<int key="NSCellFlags2">2048</int>
 							<reference key="NSSupport" ref="102052516"/>
 							<reference key="NSControlView" ref="839358336"/>
-							<int key="NSButtonFlags">109199615</int>
+							<int key="NSButtonFlags">109199360</int>
 							<int key="NSButtonFlags2">129</int>
 							<string key="NSAlternateContents"/>
 							<string key="NSKeyEquivalent"/>
@@ -243,20 +256,22 @@
 							<bool key="NSAltersState">YES</bool>
 							<int key="NSArrowPosition">2</int>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSButton" id="278799254">
 						<reference key="NSNextResponder" ref="928353753"/>
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{140, 84}, {322, 18}}</string>
 						<reference key="NSSuperview" ref="928353753"/>
+						<reference key="NSNextKeyView" ref="937825823"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="74226557">
-							<int key="NSCellFlags">-2080244224</int>
+							<int key="NSCellFlags">-2080374784</int>
 							<int key="NSCellFlags2">0</int>
 							<string key="NSContents">After sending a tweet</string>
 							<reference key="NSSupport" ref="102052516"/>
 							<reference key="NSControlView" ref="278799254"/>
-							<int key="NSButtonFlags">1211912703</int>
+							<int key="NSButtonFlags">1211912448</int>
 							<int key="NSButtonFlags2">2</int>
 							<reference key="NSNormalImage" ref="874485579"/>
 							<reference key="NSAlternateImage" ref="63880930"/>
@@ -265,20 +280,22 @@
 							<int key="NSPeriodicDelay">200</int>
 							<int key="NSPeriodicInterval">25</int>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSButton" id="120473249">
 						<reference key="NSNextResponder" ref="928353753"/>
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{140, 53}, {294, 18}}</string>
 						<reference key="NSSuperview" ref="928353753"/>
+						<reference key="NSNextKeyView" ref="101049228"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="155130154">
-							<int key="NSCellFlags">-2080244224</int>
+							<int key="NSCellFlags">-2080374784</int>
 							<int key="NSCellFlags2">0</int>
 							<string key="NSContents">Update global status when sending a tweet</string>
 							<reference key="NSSupport" ref="102052516"/>
 							<reference key="NSControlView" ref="120473249"/>
-							<int key="NSButtonFlags">1211912703</int>
+							<int key="NSButtonFlags">1211912448</int>
 							<int key="NSButtonFlags2">2</int>
 							<reference key="NSNormalImage" ref="874485579"/>
 							<reference key="NSAlternateImage" ref="63880930"/>
@@ -287,20 +304,22 @@
 							<int key="NSPeriodicDelay">200</int>
 							<int key="NSPeriodicInterval">25</int>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSButton" id="101049228">
 						<reference key="NSNextResponder" ref="928353753"/>
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{164, 32}, {133, 18}}</string>
 						<reference key="NSSuperview" ref="928353753"/>
+						<reference key="NSNextKeyView" ref="59881669"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="85058144">
-							<int key="NSCellFlags">-2080244224</int>
+							<int key="NSCellFlags">-2080374784</int>
 							<int key="NSCellFlags2">0</int>
 							<string key="NSContents">Include @replies</string>
 							<reference key="NSSupport" ref="102052516"/>
 							<reference key="NSControlView" ref="101049228"/>
-							<int key="NSButtonFlags">1211912703</int>
+							<int key="NSButtonFlags">1211912448</int>
 							<int key="NSButtonFlags2">2</int>
 							<reference key="NSNormalImage" ref="874485579"/>
 							<reference key="NSAlternateImage" ref="63880930"/>
@@ -309,15 +328,17 @@
 							<int key="NSPeriodicDelay">200</int>
 							<int key="NSPeriodicInterval">25</int>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="56151798">
 						<reference key="NSNextResponder" ref="928353753"/>
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{142, 198}, {221, 22}}</string>
 						<reference key="NSSuperview" ref="928353753"/>
+						<reference key="NSNextKeyView" ref="640789319"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="273693255">
-							<int key="NSCellFlags">-1804468671</int>
+							<int key="NSCellFlags">-1804599231</int>
 							<int key="NSCellFlags2">272630784</int>
 							<string key="NSContents"/>
 							<reference key="NSSupport" ref="102052516"/>
@@ -339,15 +360,17 @@
 								<reference key="NSColor" ref="745055878"/>
 							</object>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="640789319">
 						<reference key="NSNextResponder" ref="928353753"/>
 						<int key="NSvFlags">264</int>
 						<string key="NSFrame">{{-3, 173}, {140, 17}}</string>
 						<reference key="NSSuperview" ref="928353753"/>
+						<reference key="NSNextKeyView" ref="273876235"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="400944111">
-							<int key="NSCellFlags">67239424</int>
+							<int key="NSCellFlags">67108864</int>
 							<int key="NSCellFlags2">71303168</int>
 							<string key="NSContents">Path:</string>
 							<reference key="NSSupport" ref="102052516"/>
@@ -355,15 +378,17 @@
 							<reference key="NSBackgroundColor" ref="475075482"/>
 							<reference key="NSTextColor" ref="27965426"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="273876235">
 						<reference key="NSNextResponder" ref="928353753"/>
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{142, 168}, {221, 22}}</string>
 						<reference key="NSSuperview" ref="928353753"/>
+						<reference key="NSNextKeyView" ref="305057378"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="448446555">
-							<int key="NSCellFlags">-1804468671</int>
+							<int key="NSCellFlags">-1804599231</int>
 							<int key="NSCellFlags2">272630784</int>
 							<string key="NSContents"/>
 							<reference key="NSSupport" ref="102052516"/>
@@ -372,20 +397,22 @@
 							<reference key="NSBackgroundColor" ref="906566001"/>
 							<reference key="NSTextColor" ref="1040924361"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSButton" id="377578690">
 						<reference key="NSNextResponder" ref="928353753"/>
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{140, 5}, {266, 18}}</string>
 						<reference key="NSSuperview" ref="928353753"/>
+						<reference key="NSNextKeyView"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="17114962">
-							<int key="NSCellFlags">-2080244224</int>
+							<int key="NSCellFlags">-2080374784</int>
 							<int key="NSCellFlags2">0</int>
 							<string key="NSContents">Show people I follow in the contact list</string>
 							<reference key="NSSupport" ref="102052516"/>
 							<reference key="NSControlView" ref="377578690"/>
-							<int key="NSButtonFlags">1211912703</int>
+							<int key="NSButtonFlags">1211912448</int>
 							<int key="NSButtonFlags2">2</int>
 							<reference key="NSNormalImage" ref="874485579"/>
 							<reference key="NSAlternateImage" ref="63880930"/>
@@ -394,9 +421,12 @@
 							<int key="NSPeriodicDelay">200</int>
 							<int key="NSPeriodicInterval">25</int>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 				</array>
 				<string key="NSFrameSize">{432, 220}</string>
+				<reference key="NSSuperview"/>
+				<reference key="NSNextKeyView" ref="852387789"/>
 				<object class="NSMutableString" key="NSClassName">
 					<characters key="NS.bytes">NSView</characters>
 				</object>
@@ -413,7 +443,7 @@
 						<reference key="NSSuperview" ref="1062292978"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="418990434">
-							<int key="NSCellFlags">68288064</int>
+							<int key="NSCellFlags">68157504</int>
 							<int key="NSCellFlags2">71304192</int>
 							<string key="NSContents">Name:</string>
 							<reference key="NSSupport" ref="102052516"/>
@@ -421,6 +451,7 @@
 							<reference key="NSBackgroundColor" ref="475075482"/>
 							<reference key="NSTextColor" ref="27965426"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="101971727">
 						<reference key="NSNextResponder" ref="1062292978"/>
@@ -429,7 +460,7 @@
 						<reference key="NSSuperview" ref="1062292978"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="183971351">
-							<int key="NSCellFlags">68288064</int>
+							<int key="NSCellFlags">68157504</int>
 							<int key="NSCellFlags2">71304192</int>
 							<string key="NSContents">URL:</string>
 							<reference key="NSSupport" ref="102052516"/>
@@ -437,6 +468,7 @@
 							<reference key="NSBackgroundColor" ref="475075482"/>
 							<reference key="NSTextColor" ref="27965426"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="90601672">
 						<reference key="NSNextResponder" ref="1062292978"/>
@@ -445,7 +477,7 @@
 						<reference key="NSSuperview" ref="1062292978"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="651913293">
-							<int key="NSCellFlags">68288064</int>
+							<int key="NSCellFlags">68157504</int>
 							<int key="NSCellFlags2">71304192</int>
 							<string key="NSContents">Location:</string>
 							<reference key="NSSupport" ref="102052516"/>
@@ -453,6 +485,7 @@
 							<reference key="NSBackgroundColor" ref="475075482"/>
 							<reference key="NSTextColor" ref="27965426"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="10832587">
 						<reference key="NSNextResponder" ref="1062292978"/>
@@ -461,7 +494,7 @@
 						<reference key="NSSuperview" ref="1062292978"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="265049406">
-							<int key="NSCellFlags">68288064</int>
+							<int key="NSCellFlags">68157504</int>
 							<int key="NSCellFlags2">71304192</int>
 							<string key="NSContents">Description:</string>
 							<reference key="NSSupport" ref="102052516"/>
@@ -469,6 +502,7 @@
 							<reference key="NSBackgroundColor" ref="475075482"/>
 							<reference key="NSTextColor" ref="27965426"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="577046209">
 						<reference key="NSNextResponder" ref="1062292978"/>
@@ -477,7 +511,7 @@
 						<reference key="NSSuperview" ref="1062292978"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="367435290">
-							<int key="NSCellFlags">-1804468671</int>
+							<int key="NSCellFlags">-1804599231</int>
 							<int key="NSCellFlags2">272630784</int>
 							<string key="NSContents"/>
 							<reference key="NSSupport" ref="102052516"/>
@@ -486,6 +520,7 @@
 							<reference key="NSBackgroundColor" ref="906566001"/>
 							<reference key="NSTextColor" ref="1040924361"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="118564100">
 						<reference key="NSNextResponder" ref="1062292978"/>
@@ -494,7 +529,7 @@
 						<reference key="NSSuperview" ref="1062292978"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="491767056">
-							<int key="NSCellFlags">-1804468671</int>
+							<int key="NSCellFlags">-1804599231</int>
 							<int key="NSCellFlags2">272630784</int>
 							<string key="NSContents"/>
 							<reference key="NSSupport" ref="102052516"/>
@@ -503,6 +538,7 @@
 							<reference key="NSBackgroundColor" ref="906566001"/>
 							<reference key="NSTextColor" ref="1040924361"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="315888965">
 						<reference key="NSNextResponder" ref="1062292978"/>
@@ -511,7 +547,7 @@
 						<reference key="NSSuperview" ref="1062292978"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="985590960">
-							<int key="NSCellFlags">-1804468671</int>
+							<int key="NSCellFlags">-1804599231</int>
 							<int key="NSCellFlags2">272630784</int>
 							<string key="NSContents"/>
 							<reference key="NSSupport" ref="102052516"/>
@@ -520,6 +556,7 @@
 							<reference key="NSBackgroundColor" ref="906566001"/>
 							<reference key="NSTextColor" ref="1040924361"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 					<object class="NSTextField" id="876795718">
 						<reference key="NSNextResponder" ref="1062292978"/>
@@ -528,7 +565,7 @@
 						<reference key="NSSuperview" ref="1062292978"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="614779160">
-							<int key="NSCellFlags">-1805517311</int>
+							<int key="NSCellFlags">-1805647871</int>
 							<int key="NSCellFlags2">272629760</int>
 							<string key="NSContents"/>
 							<reference key="NSSupport" ref="102052516"/>
@@ -537,13 +574,14 @@
 							<reference key="NSBackgroundColor" ref="906566001"/>
 							<reference key="NSTextColor" ref="1040924361"/>
 						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 				</array>
 				<string key="NSFrameSize">{340, 197}</string>
 				<string key="NSClassName">NSView</string>
 			</object>
 			<object class="NSCustomView" id="375767636">
-				<nil key="NSNextResponder"/>
+				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">268</int>
 				<array class="NSMutableArray" key="NSSubviews">
 					<object class="NSTabView" id="183466937">
@@ -551,11 +589,12 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{-8, -10}, {391, 230}}</string>
 						<reference key="NSSuperview" ref="375767636"/>
+						<reference key="NSNextKeyView" ref="642410231"/>
 						<array class="NSMutableArray" key="NSTabViewItems">
 							<object class="NSTabViewItem" id="538204068">
 								<string key="NSIdentifier">1</string>
 								<object class="NSView" key="NSView" id="642410231">
-									<nil key="NSNextResponder"/>
+									<reference key="NSNextResponder" ref="183466937"/>
 									<int key="NSvFlags">256</int>
 									<array class="NSMutableArray" key="NSSubviews">
 										<object class="NSTextField" id="162653078">
@@ -563,9 +602,10 @@
 											<int key="NSvFlags">264</int>
 											<string key="NSFrame">{{98, 200}, {240, 22}}</string>
 											<reference key="NSSuperview" ref="642410231"/>
+											<reference key="NSNextKeyView" ref="634799331"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="452093068">
-												<int key="NSCellFlags">-1804468671</int>
+												<int key="NSCellFlags">-1804599231</int>
 												<int key="NSCellFlags2">4195328</int>
 												<string key="NSContents"/>
 												<reference key="NSSupport" ref="102052516"/>
@@ -574,15 +614,17 @@
 												<reference key="NSBackgroundColor" ref="906566001"/>
 												<reference key="NSTextColor" ref="1040924361"/>
 											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 										</object>
 										<object class="NSTextField" id="481002428">
 											<reference key="NSNextResponder" ref="642410231"/>
 											<int key="NSvFlags">264</int>
 											<string key="NSFrame">{{-44, 203}, {140, 17}}</string>
 											<reference key="NSSuperview" ref="642410231"/>
+											<reference key="NSNextKeyView" ref="162653078"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="733439917">
-												<int key="NSCellFlags">67239424</int>
+												<int key="NSCellFlags">67108864</int>
 												<int key="NSCellFlags2">71303168</int>
 												<string key="NSContents">User Name:</string>
 												<reference key="NSSupport" ref="102052516"/>
@@ -590,15 +632,17 @@
 												<reference key="NSBackgroundColor" ref="475075482"/>
 												<reference key="NSTextColor" ref="27965426"/>
 											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 										</object>
 										<object class="NSTextField" id="634799331">
 											<reference key="NSNextResponder" ref="642410231"/>
 											<int key="NSvFlags">264</int>
 											<string key="NSFrame">{{-44, 173}, {140, 17}}</string>
 											<reference key="NSSuperview" ref="642410231"/>
+											<reference key="NSNextKeyView" ref="919800797"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="918273829">
-												<int key="NSCellFlags">67239424</int>
+												<int key="NSCellFlags">67108864</int>
 												<int key="NSCellFlags2">71303168</int>
 												<string key="NSContents">Password:</string>
 												<reference key="NSSupport" ref="102052516"/>
@@ -606,15 +650,17 @@
 												<reference key="NSBackgroundColor" ref="475075482"/>
 												<reference key="NSTextColor" ref="27965426"/>
 											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 										</object>
 										<object class="NSTextField" id="919800797">
 											<reference key="NSNextResponder" ref="642410231"/>
 											<int key="NSvFlags">264</int>
 											<string key="NSFrame">{{98, 170}, {240, 22}}</string>
 											<reference key="NSSuperview" ref="642410231"/>
+											<reference key="NSNextKeyView" ref="888614745"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="83731136">
-												<int key="NSCellFlags">-1804468671</int>
+												<int key="NSCellFlags">-1804599231</int>
 												<int key="NSCellFlags2">4195328</int>
 												<string key="NSContents"/>
 												<reference key="NSSupport" ref="102052516"/>
@@ -623,9 +669,36 @@
 												<reference key="NSBackgroundColor" ref="906566001"/>
 												<reference key="NSTextColor" ref="1040924361"/>
 											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+										<object class="NSButton" id="888614745">
+											<reference key="NSNextResponder" ref="642410231"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrame">{{95, 122}, {200, 32}}</string>
+											<reference key="NSSuperview" ref="642410231"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSButtonCell" key="NSCell" id="259397695">
+												<int key="NSCellFlags">67108864</int>
+												<int key="NSCellFlags2">134217728</int>
+												<string key="NSContents">Register New Account</string>
+												<reference key="NSSupport" ref="102052516"/>
+												<reference key="NSControlView" ref="888614745"/>
+												<int key="NSButtonFlags">-2038284288</int>
+												<int key="NSButtonFlags2">1</int>
+												<reference key="NSAlternateImage" ref="102052516"/>
+												<string key="NSAlternateContents"/>
+												<object class="NSMutableString" key="NSKeyEquivalent">
+													<characters key="NS.bytes"/>
+												</object>
+												<int key="NSPeriodicDelay">200</int>
+												<int key="NSPeriodicInterval">25</int>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 										</object>
 									</array>
 									<string key="NSFrameSize">{391, 230}</string>
+									<reference key="NSSuperview" ref="183466937"/>
+									<reference key="NSNextKeyView" ref="481002428"/>
 								</object>
 								<string key="NSLabel">Basic Authentication</string>
 								<reference key="NSColor" ref="475075482"/>
@@ -634,7 +707,7 @@
 							<object class="NSTabViewItem" id="705381890">
 								<string key="NSIdentifier">2</string>
 								<object class="NSView" key="NSView" id="913597586">
-									<reference key="NSNextResponder" ref="183466937"/>
+									<nil key="NSNextResponder"/>
 									<int key="NSvFlags">256</int>
 									<array class="NSMutableArray" key="NSSubviews">
 										<object class="NSTextField" id="720544552">
@@ -644,7 +717,7 @@
 											<reference key="NSSuperview" ref="913597586"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="48336369">
-												<int key="NSCellFlags">67239424</int>
+												<int key="NSCellFlags">67108864</int>
 												<int key="NSCellFlags2">272891904</int>
 												<string key="NSContents">To connect you must first allow Adium to have access to your account.</string>
 												<object class="NSFont" key="NSSupport" id="247344870">
@@ -656,6 +729,7 @@
 												<reference key="NSBackgroundColor" ref="475075482"/>
 												<reference key="NSTextColor" ref="27965426"/>
 											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 										</object>
 										<object class="NSTextField" id="1034069835">
 											<reference key="NSNextResponder" ref="913597586"/>
@@ -664,7 +738,7 @@
 											<reference key="NSSuperview" ref="913597586"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="421900909">
-												<int key="NSCellFlags">67239424</int>
+												<int key="NSCellFlags">67108864</int>
 												<int key="NSCellFlags2">272891904</int>
 												<string key="NSContents">Current status information will go here.</string>
 												<reference key="NSSupport" ref="247344870"/>
@@ -672,6 +746,7 @@
 												<reference key="NSBackgroundColor" ref="475075482"/>
 												<reference key="NSTextColor" ref="27965426"/>
 											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 										</object>
 										<object class="NSButton" id="821592780">
 											<reference key="NSNextResponder" ref="913597586"/>
@@ -680,23 +755,23 @@
 											<reference key="NSSuperview" ref="913597586"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="621934204">
-												<int key="NSCellFlags">67239424</int>
+												<int key="NSCellFlags">67108864</int>
 												<int key="NSCellFlags2">134217728</int>
 												<string key="NSContents">Allow Access</string>
 												<reference key="NSSupport" ref="102052516"/>
 												<reference key="NSControlView" ref="821592780"/>
-												<int key="NSButtonFlags">-2038284033</int>
+												<int key="NSButtonFlags">-2038284288</int>
 												<int key="NSButtonFlags2">129</int>
 												<string key="NSAlternateContents"/>
 												<string key="NSKeyEquivalent"/>
 												<int key="NSPeriodicDelay">200</int>
 												<int key="NSPeriodicInterval">25</int>
 											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 										</object>
 										<object class="NSProgressIndicator" id="355818814">
 											<reference key="NSNextResponder" ref="913597586"/>
 											<int key="NSvFlags">-2147482356</int>
-											<object class="NSPSMatrix" key="NSDrawMatrix"/>
 											<string key="NSFrame">{{189, 100}, {16, 16}}</string>
 											<reference key="NSSuperview" ref="913597586"/>
 											<int key="NSpiFlags">20746</int>
@@ -710,7 +785,7 @@
 											<reference key="NSSuperview" ref="913597586"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="404154183">
-												<int key="NSCellFlags">-1804468671</int>
+												<int key="NSCellFlags">-1804599231</int>
 												<int key="NSCellFlags2">272630784</int>
 												<string key="NSContents"/>
 												<reference key="NSSupport" ref="102052516"/>
@@ -720,26 +795,28 @@
 												<reference key="NSBackgroundColor" ref="906566001"/>
 												<reference key="NSTextColor" ref="1040924361"/>
 											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 										</object>
 									</array>
 									<string key="NSFrameSize">{391, 230}</string>
-									<reference key="NSSuperview" ref="183466937"/>
 								</object>
 								<string key="NSLabel">OAuth</string>
 								<reference key="NSColor" ref="475075482"/>
 								<reference key="NSTabView" ref="183466937"/>
 							</object>
 						</array>
-						<reference key="NSSelectedTabViewItem" ref="705381890"/>
+						<reference key="NSSelectedTabViewItem" ref="538204068"/>
 						<reference key="NSFont" ref="102052516"/>
 						<int key="NSTvFlags">6</int>
 						<bool key="NSAllowTruncatedLabels">YES</bool>
 						<array class="NSMutableArray" key="NSSubviews">
-							<reference ref="913597586"/>
+							<reference ref="642410231"/>
 						</array>
 					</object>
 				</array>
 				<string key="NSFrameSize">{375, 214}</string>
+				<reference key="NSSuperview"/>
+				<reference key="NSNextKeyView" ref="183466937"/>
 				<string key="NSClassName">NSView</string>
 			</object>
 		</array>
@@ -1027,6 +1104,22 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
+						<string key="label">button_SignUp</string>
+						<reference key="source" ref="577370903"/>
+						<reference key="destination" ref="888614745"/>
+					</object>
+					<int key="connectionID">670</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">signUpAccount:</string>
+						<reference key="source" ref="577370903"/>
+						<reference key="destination" ref="888614745"/>
+					</object>
+					<int key="connectionID">671</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
 						<string key="label">view_anchorToRightSide</string>
 						<reference key="source" ref="481002428"/>
 						<reference key="destination" ref="162653078"/>
@@ -1300,6 +1393,7 @@
 							<reference ref="481002428"/>
 							<reference ref="634799331"/>
 							<reference ref="919800797"/>
+							<reference ref="888614745"/>
 						</array>
 						<reference key="parent" ref="538204068"/>
 					</object>
@@ -1586,6 +1680,19 @@
 						<reference key="object" ref="370529910"/>
 						<reference key="parent" ref="299750509"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">668</int>
+						<reference key="object" ref="888614745"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="259397695"/>
+						</array>
+						<reference key="parent" ref="642410231"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">669</int>
+						<reference key="object" ref="259397695"/>
+						<reference key="parent" ref="888614745"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -1668,294 +1775,22 @@
 				<string key="661.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="662.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="663.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="668.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="669.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 			</dictionary>
 			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">665</int>
+			<int key="maxID">671</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">AIAccountViewController</string>
-					<string key="superclassName">NSObject</string>
-					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">changedPreference:</string>
-						<string key="NS.object.0">id</string>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<string key="NS.key.0">changedPreference:</string>
-						<object class="IBActionInfo" key="NS.object.0">
-							<string key="name">changedPreference:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</object>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="checkBox_checkMail">NSButton</string>
-						<string key="checkBox_sendTyping">NSButton</string>
-						<string key="label_alias">NSTextField</string>
-						<string key="label_encryption">NSTextField</string>
-						<string key="label_password">NSTextField</string>
-						<string key="label_port">NSTextField</string>
-						<string key="label_server">NSTextField</string>
-						<string key="label_typing">NSTextField</string>
-						<string key="popUp_encryption">NSPopUpButton</string>
-						<string key="progressIndicator_registering">NSProgressIndicator</string>
-						<string key="textField_accountUID">NSTextField</string>
-						<string key="textField_accountUIDLabel">NSTextField</string>
-						<string key="textField_alias">NSTextField</string>
-						<string key="textField_connectHost">NSTextField</string>
-						<string key="textField_connectPort">NSTextField</string>
-						<string key="textField_password">NSTextField</string>
-						<string key="textField_registering">NSTextField</string>
-						<string key="view_auxiliaryTabView">NSTabView</string>
-						<string key="view_options">NSView</string>
-						<string key="view_privacy">NSView</string>
-						<string key="view_profile">NSView</string>
-						<string key="view_setup">NSView</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="checkBox_checkMail">
-							<string key="name">checkBox_checkMail</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="checkBox_sendTyping">
-							<string key="name">checkBox_sendTyping</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="label_alias">
-							<string key="name">label_alias</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="label_encryption">
-							<string key="name">label_encryption</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="label_password">
-							<string key="name">label_password</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="label_port">
-							<string key="name">label_port</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="label_server">
-							<string key="name">label_server</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="label_typing">
-							<string key="name">label_typing</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="popUp_encryption">
-							<string key="name">popUp_encryption</string>
-							<string key="candidateClassName">NSPopUpButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="progressIndicator_registering">
-							<string key="name">progressIndicator_registering</string>
-							<string key="candidateClassName">NSProgressIndicator</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="textField_accountUID">
-							<string key="name">textField_accountUID</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="textField_accountUIDLabel">
-							<string key="name">textField_accountUIDLabel</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="textField_alias">
-							<string key="name">textField_alias</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="textField_connectHost">
-							<string key="name">textField_connectHost</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="textField_connectPort">
-							<string key="name">textField_connectPort</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="textField_password">
-							<string key="name">textField_password</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="textField_registering">
-							<string key="name">textField_registering</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="view_auxiliaryTabView">
-							<string key="name">view_auxiliaryTabView</string>
-							<string key="candidateClassName">NSTabView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="view_options">
-							<string key="name">view_options</string>
-							<string key="candidateClassName">NSView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="view_privacy">
-							<string key="name">view_privacy</string>
-							<string key="candidateClassName">NSView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="view_profile">
-							<string key="name">view_profile</string>
-							<string key="candidateClassName">NSView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="view_setup">
-							<string key="name">view_setup</string>
-							<string key="candidateClassName">NSView</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/AIAccountViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">AILocalizationTextField</string>
-					<string key="superclassName">NSTextField</string>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="view_anchorToLeftSide">NSView</string>
-						<string key="view_anchorToRightSide">NSView</string>
-						<string key="window_anchorOnLeftSide">NSWindow</string>
-						<string key="window_anchorOnRightSide">NSWindow</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="view_anchorToLeftSide">
-							<string key="name">view_anchorToLeftSide</string>
-							<string key="candidateClassName">NSView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="view_anchorToRightSide">
-							<string key="name">view_anchorToRightSide</string>
-							<string key="candidateClassName">NSView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="window_anchorOnLeftSide">
-							<string key="name">window_anchorOnLeftSide</string>
-							<string key="candidateClassName">NSWindow</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="window_anchorOnRightSide">
-							<string key="name">window_anchorOnRightSide</string>
-							<string key="candidateClassName">NSWindow</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/AILocalizationTextField.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">AITwitterAccountViewController</string>
-					<string key="superclassName">AIAccountViewController</string>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="button_OAuthStart">NSButton</string>
-						<string key="checkBox_loadContacts">NSButton</string>
-						<string key="checkBox_updateAfterSend">NSButton</string>
-						<string key="checkBox_updateGlobalIncludeReplies">NSButton</string>
-						<string key="checkBox_updateGlobalStatus">NSButton</string>
-						<string key="checkBox_useSSL">NSButton</string>
-						<string key="popUp_updateInterval">NSPopUpButton</string>
-						<string key="progressIndicator">NSProgressIndicator</string>
-						<string key="tabViewItem_OAuth">NSTabViewItem</string>
-						<string key="tabViewItem_basicAuthentication">NSTabViewItem</string>
-						<string key="tabView_authenticationType">NSTabView</string>
-						<string key="textField_APIpath">NSTextField</string>
-						<string key="textField_OAuthStatus">NSTextField</string>
-						<string key="textField_OAuthVerifier">NSTextField</string>
-						<string key="textField_description">NSTextField</string>
-						<string key="textField_location">NSTextField</string>
-						<string key="textField_name">NSTextField</string>
-						<string key="textField_url">NSTextField</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="button_OAuthStart">
-							<string key="name">button_OAuthStart</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="checkBox_loadContacts">
-							<string key="name">checkBox_loadContacts</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="checkBox_updateAfterSend">
-							<string key="name">checkBox_updateAfterSend</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="checkBox_updateGlobalIncludeReplies">
-							<string key="name">checkBox_updateGlobalIncludeReplies</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="checkBox_updateGlobalStatus">
-							<string key="name">checkBox_updateGlobalStatus</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="checkBox_useSSL">
-							<string key="name">checkBox_useSSL</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="popUp_updateInterval">
-							<string key="name">popUp_updateInterval</string>
-							<string key="candidateClassName">NSPopUpButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="progressIndicator">
-							<string key="name">progressIndicator</string>
-							<string key="candidateClassName">NSProgressIndicator</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="tabViewItem_OAuth">
-							<string key="name">tabViewItem_OAuth</string>
-							<string key="candidateClassName">NSTabViewItem</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="tabViewItem_basicAuthentication">
-							<string key="name">tabViewItem_basicAuthentication</string>
-							<string key="candidateClassName">NSTabViewItem</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="tabView_authenticationType">
-							<string key="name">tabView_authenticationType</string>
-							<string key="candidateClassName">NSTabView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="textField_APIpath">
-							<string key="name">textField_APIpath</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="textField_OAuthStatus">
-							<string key="name">textField_OAuthStatus</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="textField_OAuthVerifier">
-							<string key="name">textField_OAuthVerifier</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="textField_description">
-							<string key="name">textField_description</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="textField_location">
-							<string key="name">textField_location</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="textField_name">
-							<string key="name">textField_name</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="textField_url">
-							<string key="name">textField_url</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/AITwitterAccountViewController.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
 			<real value="1060" key="NS.object.0"/>
 		</object>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
-			<real value="1060" key="NS.object.0"/>
-		</object>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
 			<real value="3200" key="NS.object.0"/>
Binary file Resources/AboutDialog_bg@2x.png has changed
Binary file Resources/AboutDialog_transp_btm.png has changed
Binary file Resources/AboutDialog_transp_top.png has changed
--- a/Resources/AdvancedPreferences.xib	Mon Aug 13 00:26:14 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,626 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
-	<data>
-		<int key="IBDocument.SystemTarget">1060</int>
-		<string key="IBDocument.SystemVersion">11D50b</string>
-		<string key="IBDocument.InterfaceBuilderVersion">2182</string>
-		<string key="IBDocument.AppKitVersion">1138.32</string>
-		<string key="IBDocument.HIToolboxVersion">568.00</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">2182</string>
-		</object>
-		<array key="IBDocument.IntegratedClassDependencies">
-			<string>NSTableView</string>
-			<string>NSCustomObject</string>
-			<string>NSScrollView</string>
-			<string>NSCustomView</string>
-			<string>NSImageCell</string>
-			<string>NSTableColumn</string>
-			<string>NSScroller</string>
-			<string>NSTextFieldCell</string>
-		</array>
-		<array key="IBDocument.PluginDependencies">
-			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-		</array>
-		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
-			<integer value="1" key="NS.object.0"/>
-		</object>
-		<array class="NSMutableArray" key="IBDocument.RootObjects" id="334648337">
-			<object class="NSCustomObject" id="516906790">
-				<string key="NSClassName">AIAdvancedPreferences</string>
-			</object>
-			<object class="NSCustomObject" id="543707274">
-				<string key="NSClassName">FirstResponder</string>
-			</object>
-			<object class="NSCustomObject" id="363476122">
-				<string key="NSClassName">NSApplication</string>
-			</object>
-			<object class="NSCustomView" id="53881124">
-				<nil key="NSNextResponder"/>
-				<int key="NSvFlags">256</int>
-				<array class="NSMutableArray" key="NSSubviews">
-					<object class="NSScrollView" id="196563190">
-						<reference key="NSNextResponder" ref="53881124"/>
-						<int key="NSvFlags">276</int>
-						<array class="NSMutableArray" key="NSSubviews">
-							<object class="NSClipView" id="863562398">
-								<reference key="NSNextResponder" ref="196563190"/>
-								<int key="NSvFlags">2304</int>
-								<array class="NSMutableArray" key="NSSubviews">
-									<object class="NSTableView" id="557685908">
-										<reference key="NSNextResponder" ref="863562398"/>
-										<int key="NSvFlags">4352</int>
-										<string key="NSFrameSize">{183, 101}</string>
-										<reference key="NSSuperview" ref="863562398"/>
-										<reference key="NSNextKeyView" ref="31372689"/>
-										<bool key="NSEnabled">YES</bool>
-										<object class="_NSCornerView" key="NSCornerView">
-											<nil key="NSNextResponder"/>
-											<int key="NSvFlags">256</int>
-											<string key="NSFrame">{{-26, 0}, {16, 17}}</string>
-										</object>
-										<array class="NSMutableArray" key="NSTableColumns">
-											<object class="NSTableColumn" id="1020615924">
-												<string key="NSIdentifier">image</string>
-												<double key="NSWidth">36</double>
-												<double key="NSMinWidth">10</double>
-												<double key="NSMaxWidth">3.4028234663852886e+38</double>
-												<object class="NSTableHeaderCell" key="NSHeaderCell">
-													<int key="NSCellFlags">75628096</int>
-													<int key="NSCellFlags2">201328640</int>
-													<string key="NSContents"/>
-													<object class="NSFont" key="NSSupport" id="26">
-														<string key="NSName">LucidaGrande</string>
-														<double key="NSSize">11</double>
-														<int key="NSfFlags">3100</int>
-													</object>
-													<object class="NSColor" key="NSBackgroundColor">
-														<int key="NSColorSpace">6</int>
-														<string key="NSCatalogName">System</string>
-														<string key="NSColorName">headerColor</string>
-														<object class="NSColor" key="NSColor" id="273636539">
-															<int key="NSColorSpace">3</int>
-															<bytes key="NSWhite">MQA</bytes>
-														</object>
-													</object>
-													<object class="NSColor" key="NSTextColor" id="523366753">
-														<int key="NSColorSpace">6</int>
-														<string key="NSCatalogName">System</string>
-														<string key="NSColorName">headerTextColor</string>
-														<object class="NSColor" key="NSColor" id="1034811579">
-															<int key="NSColorSpace">3</int>
-															<bytes key="NSWhite">MAA</bytes>
-														</object>
-													</object>
-												</object>
-												<object class="NSImageCell" key="NSDataCell" id="971407898">
-													<int key="NSCellFlags">67239424</int>
-													<int key="NSCellFlags2">33685504</int>
-													<reference key="NSSupport" ref="26"/>
-													<int key="NSAlign">0</int>
-													<int key="NSScale">0</int>
-													<int key="NSStyle">0</int>
-													<bool key="NSAnimates">NO</bool>
-												</object>
-												<bool key="NSIsEditable">YES</bool>
-												<reference key="NSTableView" ref="557685908"/>
-											</object>
-											<object class="NSTableColumn" id="653637384">
-												<string key="NSIdentifier">description</string>
-												<double key="NSWidth">141.08999633789062</double>
-												<double key="NSMinWidth">30</double>
-												<double key="NSMaxWidth">1000</double>
-												<object class="NSTableHeaderCell" key="NSHeaderCell">
-													<int key="NSCellFlags">75628096</int>
-													<int key="NSCellFlags2">2048</int>
-													<string key="NSContents">Description</string>
-													<reference key="NSSupport" ref="26"/>
-													<object class="NSColor" key="NSBackgroundColor">
-														<int key="NSColorSpace">3</int>
-														<bytes key="NSWhite">MC4zMzMzMzI5OQA</bytes>
-													</object>
-													<reference key="NSTextColor" ref="523366753"/>
-												</object>
-												<object class="NSTextFieldCell" key="NSDataCell" id="819754658">
-													<int key="NSCellFlags">338820672</int>
-													<int key="NSCellFlags2">1024</int>
-													<object class="NSFont" key="NSSupport">
-														<string key="NSName">LucidaGrande</string>
-														<double key="NSSize">13</double>
-														<int key="NSfFlags">1044</int>
-													</object>
-													<reference key="NSControlView" ref="557685908"/>
-													<reference key="NSBackgroundColor" ref="273636539"/>
-													<object class="NSColor" key="NSTextColor">
-														<int key="NSColorSpace">6</int>
-														<string key="NSCatalogName">System</string>
-														<string key="NSColorName">controlTextColor</string>
-														<reference key="NSColor" ref="1034811579"/>
-													</object>
-												</object>
-												<int key="NSResizingMask">3</int>
-												<bool key="NSIsResizeable">YES</bool>
-												<reference key="NSTableView" ref="557685908"/>
-											</object>
-										</array>
-										<double key="NSIntercellSpacingWidth">3</double>
-										<double key="NSIntercellSpacingHeight">2</double>
-										<object class="NSColor" key="NSBackgroundColor">
-											<int key="NSColorSpace">6</int>
-											<string key="NSCatalogName">System</string>
-											<string key="NSColorName">_sourceListBackgroundColor</string>
-											<object class="NSColor" key="NSColor">
-												<int key="NSColorSpace">6</int>
-												<string key="NSCatalogName">System</string>
-												<string key="NSColorName">alternateSelectedControlColor</string>
-												<object class="NSColor" key="NSColor">
-													<int key="NSColorSpace">1</int>
-													<bytes key="NSRGB">MCAwIDEAA</bytes>
-												</object>
-											</object>
-										</object>
-										<object class="NSColor" key="NSGridColor">
-											<int key="NSColorSpace">6</int>
-											<string key="NSCatalogName">System</string>
-											<string key="NSColorName">gridColor</string>
-											<object class="NSColor" key="NSColor">
-												<int key="NSColorSpace">3</int>
-												<bytes key="NSWhite">MC41AA</bytes>
-											</object>
-										</object>
-										<double key="NSRowHeight">32</double>
-										<int key="NSTvFlags">37781504</int>
-										<reference key="NSDelegate"/>
-										<reference key="NSDataSource"/>
-										<int key="NSColumnAutoresizingStyle">1</int>
-										<int key="NSDraggingSourceMaskForLocal">15</int>
-										<int key="NSDraggingSourceMaskForNonLocal">0</int>
-										<bool key="NSAllowsTypeSelect">YES</bool>
-										<int key="NSTableViewSelectionHighlightStyle">1</int>
-										<int key="NSTableViewDraggingDestinationStyle">1</int>
-										<int key="NSTableViewGroupRowStyle">1</int>
-									</object>
-								</array>
-								<string key="NSFrameSize">{178, 101}</string>
-								<reference key="NSSuperview" ref="196563190"/>
-								<reference key="NSNextKeyView" ref="557685908"/>
-								<reference key="NSDocView" ref="557685908"/>
-								<object class="NSColor" key="NSBGColor">
-									<int key="NSColorSpace">6</int>
-									<string key="NSCatalogName">System</string>
-									<string key="NSColorName">controlBackgroundColor</string>
-									<object class="NSColor" key="NSColor">
-										<int key="NSColorSpace">3</int>
-										<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
-									</object>
-								</object>
-								<int key="NScvFlags">4</int>
-							</object>
-							<object class="NSScroller" id="31372689">
-								<reference key="NSNextResponder" ref="196563190"/>
-								<int key="NSvFlags">-2147483392</int>
-								<string key="NSFrame">{{-100, -100}, {15, 319}}</string>
-								<reference key="NSSuperview" ref="196563190"/>
-								<reference key="NSNextKeyView" ref="660980177"/>
-								<reference key="NSTarget" ref="196563190"/>
-								<string key="NSAction">_doScroller:</string>
-								<double key="NSPercent">0.9105263352394104</double>
-							</object>
-							<object class="NSScroller" id="660980177">
-								<reference key="NSNextResponder" ref="196563190"/>
-								<int key="NSvFlags">-2147483392</int>
-								<string key="NSFrame">{{-100, -100}, {98, 15}}</string>
-								<reference key="NSSuperview" ref="196563190"/>
-								<reference key="NSNextKeyView" ref="863562398"/>
-								<bool key="NSEnabled">YES</bool>
-								<int key="NSsFlags">1</int>
-								<reference key="NSTarget" ref="196563190"/>
-								<string key="NSAction">_doScroller:</string>
-								<double key="NSPercent">0.99047619104385376</double>
-							</object>
-						</array>
-						<string key="NSFrame">{{0, 5}, {178, 101}}</string>
-						<reference key="NSSuperview" ref="53881124"/>
-						<reference key="NSNextKeyView" ref="863562398"/>
-						<int key="NSsFlags">133248</int>
-						<reference key="NSVScroller" ref="31372689"/>
-						<reference key="NSHScroller" ref="660980177"/>
-						<reference key="NSContentView" ref="863562398"/>
-						<bytes key="NSScrollAmts">QSAAAEEgAABCCAAAQggAAA</bytes>
-					</object>
-					<object class="NSCustomView" id="915397879">
-						<reference key="NSNextResponder" ref="53881124"/>
-						<int key="NSvFlags">274</int>
-						<string key="NSFrame">{{0, 175}, {260, 203}}</string>
-						<reference key="NSSuperview" ref="53881124"/>
-						<reference key="NSNextKeyView" ref="196563190"/>
-						<string key="NSClassName">KNShelfSplitView</string>
-						<string key="NSExtension">NSView</string>
-					</object>
-					<object class="NSCustomView" id="154725182">
-						<reference key="NSNextResponder" ref="53881124"/>
-						<int key="NSvFlags">274</int>
-						<array class="NSMutableArray" key="NSSubviews">
-							<object class="NSCustomView" id="779513454">
-								<reference key="NSNextResponder" ref="154725182"/>
-								<int key="NSvFlags">274</int>
-								<string key="NSFrame">{{8, 8}, {282, 101}}</string>
-								<reference key="NSSuperview" ref="154725182"/>
-								<string key="NSClassName">AIModularPaneCategoryView</string>
-								<string key="NSExtension">NSView</string>
-							</object>
-						</array>
-						<string key="NSFrame">{{238, 95}, {298, 117}}</string>
-						<reference key="NSSuperview" ref="53881124"/>
-						<reference key="NSNextKeyView" ref="779513454"/>
-						<string key="NSClassName">NSView</string>
-					</object>
-				</array>
-				<string key="NSFrameSize">{580, 378}</string>
-				<reference key="NSNextKeyView" ref="915397879"/>
-				<object class="NSMutableString" key="NSClassName">
-					<characters key="NS.bytes">NSView</characters>
-				</object>
-				<string key="NSExtension">NSResponder</string>
-			</object>
-		</array>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<array class="NSMutableArray" key="connectionRecords">
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">shelf_splitView</string>
-						<reference key="source" ref="516906790"/>
-						<reference key="destination" ref="915397879"/>
-					</object>
-					<int key="connectionID">22</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">modularPane</string>
-						<reference key="source" ref="516906790"/>
-						<reference key="destination" ref="779513454"/>
-					</object>
-					<int key="connectionID">25</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">view</string>
-						<reference key="source" ref="516906790"/>
-						<reference key="destination" ref="53881124"/>
-					</object>
-					<int key="connectionID">23</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">tableView_categories</string>
-						<reference key="source" ref="516906790"/>
-						<reference key="destination" ref="557685908"/>
-					</object>
-					<int key="connectionID">24</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">dataSource</string>
-						<reference key="source" ref="557685908"/>
-						<reference key="destination" ref="516906790"/>
-					</object>
-					<int key="connectionID">26</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="557685908"/>
-						<reference key="destination" ref="516906790"/>
-					</object>
-					<int key="connectionID">27</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">shelfView</string>
-						<reference key="source" ref="915397879"/>
-						<reference key="destination" ref="196563190"/>
-					</object>
-					<int key="connectionID">20</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">contentView</string>
-						<reference key="source" ref="915397879"/>
-						<reference key="destination" ref="154725182"/>
-					</object>
-					<int key="connectionID">29</int>
-				</object>
-			</array>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<array key="orderedObjects">
-					<object class="IBObjectRecord">
-						<int key="objectID">0</int>
-						<array key="object" id="0"/>
-						<reference key="children" ref="334648337"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-2</int>
-						<reference key="object" ref="516906790"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">File's Owner</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-1</int>
-						<reference key="object" ref="543707274"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">First Responder</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-3</int>
-						<reference key="object" ref="363476122"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Application</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">14</int>
-						<reference key="object" ref="53881124"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="196563190"/>
-							<reference ref="915397879"/>
-							<reference ref="154725182"/>
-						</array>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">View</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">15</int>
-						<reference key="object" ref="196563190"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="557685908"/>
-							<reference ref="660980177"/>
-							<reference ref="31372689"/>
-						</array>
-						<reference key="parent" ref="53881124"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">16</int>
-						<reference key="object" ref="557685908"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="653637384"/>
-							<reference ref="1020615924"/>
-						</array>
-						<reference key="parent" ref="196563190"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">17</int>
-						<reference key="object" ref="653637384"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="819754658"/>
-						</array>
-						<reference key="parent" ref="557685908"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">40</int>
-						<reference key="object" ref="819754658"/>
-						<reference key="parent" ref="653637384"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">34</int>
-						<reference key="object" ref="1020615924"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="971407898"/>
-						</array>
-						<reference key="parent" ref="557685908"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">37</int>
-						<reference key="object" ref="971407898"/>
-						<reference key="parent" ref="1020615924"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">19</int>
-						<reference key="object" ref="915397879"/>
-						<reference key="parent" ref="53881124"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">28</int>
-						<reference key="object" ref="154725182"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="779513454"/>
-						</array>
-						<reference key="parent" ref="53881124"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">18</int>
-						<reference key="object" ref="779513454"/>
-						<reference key="parent" ref="154725182"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">44</int>
-						<reference key="object" ref="660980177"/>
-						<reference key="parent" ref="196563190"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">45</int>
-						<reference key="object" ref="31372689"/>
-						<reference key="parent" ref="196563190"/>
-					</object>
-				</array>
-			</object>
-			<dictionary class="NSMutableDictionary" key="flattenedProperties">
-				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="14.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="15.CustomClassName">AIAutoScrollView</string>
-				<string key="15.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="16.CustomClassName">AIAlternatingRowTableView</string>
-				<string key="16.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="17.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="18.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="19.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="28.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="34.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="37.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="40.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="44.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="45.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			</dictionary>
-			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
-			<nil key="activeLocalization"/>
-			<dictionary class="NSMutableDictionary" key="localizations"/>
-			<nil key="sourceID"/>
-			<int key="maxID">45</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">AIAdvancedPreferences</string>
-					<string key="superclassName">AIPreferencePane</string>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="modularPane">AIModularPaneCategoryView</string>
-						<string key="shelf_splitView">KNShelfSplitView</string>
-						<string key="tableView_categories">NSTableView</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="modularPane">
-							<string key="name">modularPane</string>
-							<string key="candidateClassName">AIModularPaneCategoryView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="shelf_splitView">
-							<string key="name">shelf_splitView</string>
-							<string key="candidateClassName">KNShelfSplitView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="tableView_categories">
-							<string key="name">tableView_categories</string>
-							<string key="candidateClassName">NSTableView</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/AIAdvancedPreferences.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">AIAlternatingRowTableView</string>
-					<string key="superclassName">NSTableView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/AIAlternatingRowTableView.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">AIAutoScrollView</string>
-					<string key="superclassName">NSScrollView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/AIAutoScrollView.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">AIModularPane</string>
-					<string key="superclassName">NSObject</string>
-					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">changePreference:</string>
-						<string key="NS.object.0">id</string>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<string key="NS.key.0">changePreference:</string>
-						<object class="IBActionInfo" key="NS.object.0">
-							<string key="name">changePreference:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">view</string>
-						<string key="NS.object.0">NSView</string>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<string key="NS.key.0">view</string>
-						<object class="IBToOneOutletInfo" key="NS.object.0">
-							<string key="name">view</string>
-							<string key="candidateClassName">NSView</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/AIModularPane.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">AIModularPaneCategoryView</string>
-					<string key="superclassName">NSView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/AIModularPaneCategoryView.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">AIPreferencePane</string>
-					<string key="superclassName">AIModularPane</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/AIPreferencePane.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">KNShelfSplitView</string>
-					<string key="superclassName">NSView</string>
-					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">toggleShelf:</string>
-						<string key="NS.object.0">id</string>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<string key="NS.key.0">toggleShelf:</string>
-						<object class="IBActionInfo" key="NS.object.0">
-							<string key="name">toggleShelf:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</object>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="contentView">NSView</string>
-						<string key="delegate">id</string>
-						<string key="shelfView">NSView</string>
-						<string key="target">id</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="contentView">
-							<string key="name">contentView</string>
-							<string key="candidateClassName">NSView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="delegate">
-							<string key="name">delegate</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="shelfView">
-							<string key="name">shelfView</string>
-							<string key="candidateClassName">NSView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="target">
-							<string key="name">target</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/KNShelfSplitView.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
-			<real value="1060" key="NS.object.0"/>
-		</object>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
-			<real value="1060" key="NS.object.0"/>
-		</object>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
-			<real value="3200" key="NS.object.0"/>
-		</object>
-		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-	</data>
-</archive>
--- a/Resources/Emoticons/iChat.AdiumEmoticonset/Emoticons.plist	Mon Aug 13 00:26:14 2012 +0200
+++ b/Resources/Emoticons/iChat.AdiumEmoticonset/Emoticons.plist	Thu Sep 06 00:18:31 2012 +0200
@@ -9,6 +9,7 @@
 	<key>Location</key>
 	<array>
 		<string>/System/Library/PrivateFrameworks/InstantMessage.framework/Versions/A/Resources</string>
+		<string>/System/Library/PrivateFrameworks/SocialUI.framework/Versions/A/Resources/Standard.smileypack/Contents/Resources</string>
 		<string>com.apple.iChat////Contents/PlugIns/Standard.smileypack/Contents/Resources</string>
 		<string>com.apple.iChat////Contents/Resources</string>
 	</array>
--- a/Source/AIInterfaceController.m	Mon Aug 13 00:26:14 2012 +0200
+++ b/Source/AIInterfaceController.m	Thu Sep 06 00:18:31 2012 +0200
@@ -43,7 +43,6 @@
 #import <Adium/AISortController.h>
 #import "AIMessageWindowController.h"
 #import "AIMessageTabViewItem.h"
-#import "KNShelfSplitview.h"
 #import <Adium/AIContactList.h>
 #import "AIListOutlineView.h"
 
@@ -217,7 +216,14 @@
 																				action:@selector(toggleContactList:)
 																		 keyEquivalent:@"/"];
 	[adium.menuController addMenuItem:menuItem toLocation:LOC_Window_Fixed];
-	[adium.menuController addMenuItem:[[menuItem copy] autorelease] toLocation:LOC_Dock_Status];
+	[menuItem release];
+	
+	//Contact list menu item for the dock menu
+	menuItem = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:AILocalizedString(@"Contact List","Name of the window which lists contacts")
+																	target:self
+																	action:@selector(showContactListAndBringToFront:)
+															 keyEquivalent:@""];
+	[adium.menuController addMenuItem:menuItem toLocation:LOC_Dock_Status];
 	[menuItem release];
 	
 	menuItem = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:AILocalizedString(@"Close Chat","Title for the close chat menu item")
--- a/Source/AIPreferenceContainer.h	Mon Aug 13 00:26:14 2012 +0200
+++ b/Source/AIPreferenceContainer.h	Thu Sep 06 00:18:31 2012 +0200
@@ -19,24 +19,16 @@
 @interface AIPreferenceContainer : NSObject {
 	NSString			*group;
 	AIListObject		*object;
-
 	NSMutableDictionary	*prefs;
-	NSMutableDictionary	*prefsWithDefaults;
-
 	NSMutableDictionary	*defaults;
 	NSInteger			preferenceChangeDelays;
-	
-	NSMutableDictionary **myGlobalPrefs;
-	NSInteger			*myUsersOfGlobalPrefs;
-	NSTimer				**myTimerForSavingGlobalPrefs;
-	NSString			*globalPrefsName;
 }
 
-+ (AIPreferenceContainer *)preferenceContainerForGroup:(NSString *)inGroup object:(AIListObject *)inObject;
++ (AIPreferenceContainer *)preferenceContainerForGroup:(NSString *)inGroup object:(AIListObject *)inObject create:(BOOL)create;
 + (void)preferenceControllerWillClose;
 
 //Return a dictionary of preferences and defaults, appropriately merged together
-- (NSDictionary *)dictionary;
+@property (readonly, nonatomic) NSDictionary *dictionary;
 
 //Replace all preferences for this container with the values and keys in inPreferences
 - (void)setPreferences:(NSDictionary *)inPreferences;
@@ -50,6 +42,6 @@
 
 - (void)setPreferenceChangedNotificationsEnabled:(BOOL)inEnbaled;
 
-- (void)setGroup:(NSString *)inGroup;
+@property (readwrite, nonatomic, copy) NSString *group;
 
 @end
--- a/Source/AIPreferenceContainer.m	Mon Aug 13 00:26:14 2012 +0200
+++ b/Source/AIPreferenceContainer.m	Thu Sep 06 00:18:31 2012 +0200
@@ -26,7 +26,7 @@
 - (id)initForGroup:(NSString *)inGroup object:(AIListObject *)inObject;
 - (void)save;
 @property (readonly, nonatomic) NSMutableDictionary *prefs;
-- (void) loadGlobalPrefs;
++ (void) loadGlobalPrefsForObject:(AIListObject *)object;
 
 //Lazily sets up our pref dict if needed
 - (void) setPrefValue:(id)val forKey:(id)key;
@@ -62,8 +62,39 @@
  */
 @implementation AIPreferenceContainer
 
-+ (AIPreferenceContainer *)preferenceContainerForGroup:(NSString *)inGroup object:(AIListObject *)inObject
+static NSString *globalPrefsNameForObject(AIListObject *object) {
+    if (!object) return NULL;
+    return [object isKindOfClass:[AIAccount class]] ? @"AccountPrefs" : @"ByObjectPrefs";
+}
+#define globalPrefsName globalPrefsNameForObject(object)
+
+static NSMutableDictionary **globalPrefsPtrForObject(AIListObject *object) {
+    if (!object) return NULL;
+    return [object isKindOfClass:[AIAccount class]] ? &accountPrefs : &objectPrefs;
+}
+#define myGlobalPrefs globalPrefsPtrForObject(object)
+
+static NSTimer **globalPrefsSaveTimerForObject(AIListObject *object) {
+    if (!object) return NULL;
+    return [object isKindOfClass:[AIAccount class]] ? &timer_savingOfAccountCache : &timer_savingOfObjectCache;
+}
+#define myTimerForSavingGlobalPrefs globalPrefsSaveTimerForObject(object)
+
++ (AIPreferenceContainer *)preferenceContainerForGroup:(NSString *)inGroup object:(AIListObject *)inObject create:(BOOL)create
 {
+    BOOL found = YES;
+    if (inObject) {
+        NSMutableDictionary **prefs = globalPrefsPtrForObject(inObject);
+        if (!*prefs) {
+            [self loadGlobalPrefsForObject:inObject];
+            prefs = globalPrefsPtrForObject(inObject);
+        }
+        
+        NSString *globalPrefsKey = [inObject.internalObjectID safeFilenameString];
+        found = (nil != [*prefs objectForKey:globalPrefsKey]);
+    }
+
+    if (inObject && !found && !create) return nil;
 	return [[[self alloc] initForGroup:inGroup object:inObject] autorelease];
 }
 
@@ -97,18 +128,6 @@
 	if ((self = [super init])) {
 		group = [inGroup retain];
 		object = [inObject retain];
-		if (object) {
-			if ([object isKindOfClass:[AIAccount class]]) {
-				myGlobalPrefs = &accountPrefs;
-				myTimerForSavingGlobalPrefs = &timer_savingOfAccountCache;
-				globalPrefsName = @"AccountPrefs";
-				
-			} else {
-				myGlobalPrefs = &objectPrefs;
-				myTimerForSavingGlobalPrefs = &timer_savingOfObjectCache;
-				globalPrefsName = @"ByObjectPrefs";
-			}
-		}
 	}
 
 	return self;
@@ -116,11 +135,11 @@
 
 - (void)dealloc
 {
-	[defaults release]; defaults = nil;
+	[defaults release];
+    [prefs release];
 	[group release];
 	[object release];
-	[globalPrefsName release]; globalPrefsName = nil;
-	
+
 	[super dealloc];
 }
 
@@ -131,7 +150,7 @@
 
 #pragma mark Defaults
 
-@synthesize defaults;
+@synthesize defaults, group;
 
 /*!
  * @brief Register defaults
@@ -143,14 +162,11 @@
 	if (!defaults) defaults = [[NSMutableDictionary alloc] init];
 	
 	[defaults addEntriesFromDictionary:inDefaults];
-	
-	//Clear the cached defaults dictionary so it will be recreated as needed
-	[prefsWithDefaults release]; prefsWithDefaults = nil;
 }
 
 #pragma mark Get and set
 
-- (void) loadGlobalPrefs
++ (void) loadGlobalPrefsForObject:(AIListObject *)object
 {
 	NSAssert(*myGlobalPrefs == nil, @"Attempting to load global prefs when they're already loaded");
 	NSString	*objectPrefsPath = [[adium.loginController.userDirectory stringByAppendingPathComponent:globalPrefsName] stringByAppendingPathExtension:@"plist"];
@@ -230,9 +246,6 @@
 		NSString	*userDirectory = adium.loginController.userDirectory;
 		
 		if (object) {
-			if (!(*myGlobalPrefs))
-				[self loadGlobalPrefs];
-
 			//For compatibility with having loaded individual object prefs from previous version of Adium, we key by the safe filename string
 			NSString *globalPrefsKey = [object.internalObjectID safeFilenameString];
 			prefs = [[*myGlobalPrefs objectForKey:globalPrefsKey] retain];
@@ -252,20 +265,13 @@
  */
 - (NSDictionary *)dictionary
 {
-	if (!prefsWithDefaults) {
-		//Add our own preferences to the defaults dictionary to get a dict with the set keys overriding the default keys
-		if (defaults) {
-			prefsWithDefaults = [defaults mutableCopy];
-			NSDictionary *prefDict = self.prefs;
-			if (prefDict)
-				[prefsWithDefaults addEntriesFromDictionary:prefDict];
-
-		} else {
-			prefsWithDefaults = [self.prefs retain];
-		}
-	}
-
-	return prefsWithDefaults;
+    NSDictionary *myPrefs = self.prefs;
+    if (!defaults) return [[myPrefs copy] autorelease];
+    
+    NSMutableDictionary *prefsWithDefaults = [defaults mutableCopy];
+    //Add our own preferences to the defaults dictionary to get a dict with the set keys overriding the default keys
+    if (myPrefs) [prefsWithDefaults addEntriesFromDictionary:myPrefs];
+    return [prefsWithDefaults autorelease];
 }
 
 /*!
@@ -276,7 +282,7 @@
 - (void)setValue:(id)value forKey:(NSString *)key
 {
 	BOOL	valueChanged = YES;
-	/* Comparing pointers, numbers, and strings is far cheapear than writing out to disk;
+	/* Comparing pointers, numbers, and strings is far cheaper than writing out to disk;
 	 * check to see if we don't need to change anything at all. However, we still want to post notifications
 	 * for observers that we were set.
 	 */
@@ -287,13 +293,6 @@
 	[self willChangeValueForKey:key];
 
 	if (valueChanged) {
-		//Clear the cached defaults dictionary so it will be recreated as needed
-		if (value)
-			[prefsWithDefaults setValue:value forKey:key];
-		else {
-			[prefsWithDefaults autorelease]; prefsWithDefaults = nil;
-		}
-		
 		[self setPrefValue:value forKey:key];		
 	}
 
@@ -309,7 +308,10 @@
 
 - (id)valueForKey:(NSString *)key
 {
-	return [[self dictionary] valueForKey:key];
+    id result = nil;
+    result = [self.prefs objectForKey:key];
+    if (!result) result = [self.defaults objectForKey:key];
+    return result;
 }
 
 /*!
@@ -328,7 +330,7 @@
 
 - (id)defaultValueForKey:(NSString *)key
 {
-	return [[self defaults] valueForKey:key];
+	return [self.defaults valueForKey:key];
 }
 
 /*!
@@ -375,7 +377,7 @@
 //		if (theDict && [theDict count] > 0 && [immutablePrefsToWrite count] == 0)
 //		{
 //			NSLog(@"Writing out an empty ByObjectPrefs when we have an existing non-empty one!");
-//			*((int*)0xdeadbeef) = 42;
+//			abort();
 //		}
 //	}
 #endif
@@ -384,7 +386,7 @@
 		[immutablePrefsToWrite asyncWriteToPath:adium.loginController.userDirectory withName:globalPrefsName];
 	} else {
 		NSLog(@"Attempted to write an empty ByObject Prefs. Uh oh!");
-		*((int*)0xdeadbeef) = 42;
+		abort();
 	}
 	if (inTimer == timer_savingOfObjectCache) {
 			[timer_savingOfObjectCache release]; timer_savingOfObjectCache = nil;
@@ -426,14 +428,6 @@
 	}
 }
 
-- (void)setGroup:(NSString *)inGroup
-{
-	if (group != inGroup) {
-		[group release];
-		group = [inGroup retain];
-	}
-}
-
 #pragma mark Debug
 - (NSString *)description
 {
--- a/Source/AIPreferenceController.m	Mon Aug 13 00:26:14 2012 +0200
+++ b/Source/AIPreferenceController.m	Thu Sep 06 00:18:31 2012 +0200
@@ -38,7 +38,7 @@
 #define PREFS_GROUP				@"Preferences"
 
 @interface AIPreferenceController ()
-- (AIPreferenceContainer *)preferenceContainerForGroup:(NSString *)group object:(AIListObject *)object;
+- (AIPreferenceContainer *)preferenceContainerForGroup:(NSString *)group object:(AIListObject *)object create:(BOOL)create;
 - (void)upgradeToSingleObjectPrefsDictIfNeeded;
 @end
 
@@ -246,7 +246,7 @@
 	[observer preferencesChangedForGroup:group
 									 key:nil
 								  object:nil
-						  preferenceDict:[[self preferenceContainerForGroup:group object:nil] dictionary]
+						  preferenceDict:[[self preferenceContainerForGroup:group object:nil create:NO] dictionary] ?: [NSDictionary dictionary]
 							   firstTime:YES];
 }
 
@@ -279,7 +279,7 @@
 	if (!object && preferenceChangeDelays > 0) {
         [delayedNotificationGroups addObject:group];
     } else {
-		NSDictionary	*preferenceDict = [[[self preferenceContainerForGroup:group object:object] dictionary] retain];
+		NSDictionary	*preferenceDict = [[[self preferenceContainerForGroup:group object:object create:NO] dictionary] retain] ?: [NSDictionary dictionary];
 		for (NSValue *observerValue in [[[observers objectForKey:group] copy] autorelease]) {
 			id observer = observerValue.nonretainedObjectValue;
 			[observer preferencesChangedForGroup:group
@@ -347,7 +347,7 @@
  */
 - (void)setPreferences:(NSDictionary *)inPrefDict inGroup:(NSString *)group object:(AIListObject *)object
 {
-	AIPreferenceContainer	*prefContainer = [self preferenceContainerForGroup:group object:object];
+	AIPreferenceContainer	*prefContainer = [self preferenceContainerForGroup:group object:object create:YES];
 
 	[prefContainer setPreferenceChangedNotificationsEnabled:NO];
 	[prefContainer setValuesForKeysWithDictionary:inPrefDict];
@@ -376,7 +376,7 @@
 				group:(NSString *)group
 			   object:(AIListObject *)object
 {
-	[[self preferenceContainerForGroup:group object:object] setValue:value forKey:key];
+	[[self preferenceContainerForGroup:group object:object create:YES] setValue:value forKey:key];
 }
 
 
@@ -397,7 +397,7 @@
  */
 - (id)_noDefaultsPreferenceForKey:(NSString *)key group:(NSString *)group object:(AIListObject *)object
 {
-	return [[self preferenceContainerForGroup:group object:object] valueForKey:key ignoringDefaults:YES];
+	return [[self preferenceContainerForGroup:group object:object create:NO] valueForKey:key ignoringDefaults:YES];
 }
 
 /*!
@@ -405,7 +405,7 @@
  */
 - (id)defaultPreferenceForKey:(NSString *)key group:(NSString *)group object:(AIListObject *)object
 {
-	return [[self preferenceContainerForGroup:group object:object] defaultValueForKey:key];
+	return [[self preferenceContainerForGroup:group object:object create:NO] defaultValueForKey:key];
 }
 
 /*!
@@ -434,7 +434,7 @@
 - (id)preferenceForKey:(NSString *)key group:(NSString *)group objectIgnoringInheritance:(AIListObject *)object
 {
 	//We are ignoring inheritance, so we can ignore inherited defaults, too, and use the preferenceContainerForGroup:object: dict
-	id result = [[self preferenceContainerForGroup:group object:object] valueForKey:key];
+	id result = [[self preferenceContainerForGroup:group object:object create:NO] valueForKey:key];
 	
 	return result;
 }
@@ -446,7 +446,7 @@
  */
 - (NSDictionary *)preferencesForGroup:(NSString *)group
 {
-    return [[self preferenceContainerForGroup:group object:nil] dictionary];
+    return [[self preferenceContainerForGroup:group object:nil create:NO] dictionary];
 }
 
 //Defaults -------------------------------------------------------------------------------------------------------------
@@ -463,7 +463,7 @@
  */
 - (void)registerDefaults:(NSDictionary *)defaultDict forGroup:(NSString *)group object:(AIListObject *)object
 {
-	AIPreferenceContainer	*prefContainer = [self preferenceContainerForGroup:group object:object];
+	AIPreferenceContainer	*prefContainer = [self preferenceContainerForGroup:group object:object create:YES];
 
 	[prefContainer registerDefaults:defaultDict];
 	
@@ -478,7 +478,7 @@
  * @param group The group
  * @param object The object, or nil for global
  */
-- (AIPreferenceContainer *)preferenceContainerForGroup:(NSString *)group object:(AIListObject *)object
+- (AIPreferenceContainer *)preferenceContainerForGroup:(NSString *)group object:(AIListObject *)object create:(BOOL)create
 {
 	AIPreferenceContainer	*prefContainer;
 	
@@ -491,14 +491,16 @@
 
 		} else {
 			prefContainer = [AIPreferenceContainer preferenceContainerForGroup:group
-																		object:object];
-			[objectPrefCache setObject:prefContainer forKey:cacheKey];
+																		object:object
+                                                                        create:create];
+			if (prefContainer) [objectPrefCache setObject:prefContainer forKey:cacheKey];
 		}
 		
 	} else {
 		if (!(prefContainer = [prefCache objectForKey:group])) {
 			prefContainer = [AIPreferenceContainer preferenceContainerForGroup:group
-																		object:object];
+																		object:object
+                                                                        create:YES];
 			[prefCache setObject:prefContainer forKey:group];
 		}
 	}
@@ -611,7 +613,8 @@
 		parseKeypath(keyPath, &group, &newKeyPath, &internalObjectID);
 
 		AIPreferenceContainer *prefContainer = [self preferenceContainerForGroup:group
-																		  object:(internalObjectID ? [adium.contactController existingListObjectWithUniqueID:internalObjectID] : nil)];
+																		  object:(internalObjectID ? [adium.contactController existingListObjectWithUniqueID:internalObjectID] : nil)
+                                                                          create:YES];
 		[prefContainer addObserver:anObserver forKeyPath:newKeyPath options:options context:context];
 	}	
 }
@@ -621,7 +624,7 @@
 	NSString *group, *newKeyPath, *internalObjectID;
 	parseKeypath(keyPath, &group, &newKeyPath, &internalObjectID);
 
-	AIPreferenceContainer *prefContainer = [self preferenceContainerForGroup:group object:listObject];		
+	AIPreferenceContainer *prefContainer = [self preferenceContainerForGroup:group object:listObject create:YES];
 	[prefContainer addObserver:anObserver forKeyPath:newKeyPath options:options context:context];
 }
 
@@ -634,15 +637,16 @@
 	} else {
 		NSString *group, *newKeyPath, *internalObjectID;
 		parseKeypath(keyPath, &group, &newKeyPath, &internalObjectID);
-		
+
 		AIPreferenceContainer *prefContainer = [self preferenceContainerForGroup:group
-																		  object:(internalObjectID ? [adium.contactController existingListObjectWithUniqueID:internalObjectID] : nil)];
+																		  object:(internalObjectID ? [adium.contactController existingListObjectWithUniqueID:internalObjectID] : nil)
+                                                                          create:NO];
 		[prefContainer removeObserver:anObserver forKeyPath:newKeyPath];
 	}	
 }
 
 - (id) valueForKey:(NSString *)key {
-	return [self preferenceContainerForGroup:key object:nil];
+	return [self preferenceContainerForGroup:key object:nil create:YES];
 }
 
 - (id) valueForKeyPath:(NSString *)keyPath {
@@ -654,8 +658,9 @@
 		NSString *group, *newKeyPath, *internalObjectID;
 		parseKeypath(keyPath, &group, &newKeyPath, &internalObjectID);
 
-		return [[self preferenceContainerForGroup:group 
-										   object:(internalObjectID ? [adium.contactController existingListObjectWithUniqueID:internalObjectID] : nil)]
+		return [[self preferenceContainerForGroup:group
+										   object:(internalObjectID ? [adium.contactController existingListObjectWithUniqueID:internalObjectID] : nil)
+                                           create:YES]
 				valueForKeyPath:newKeyPath];
 	}
 }
@@ -678,7 +683,8 @@
 	[[self preferenceContainerForGroup:group
 								object:(internalObjectID ?
 										[adium.contactController existingListObjectWithUniqueID:internalObjectID] :
-										nil)] setPreferences:value];
+										nil)
+                                create:YES] setPreferences:value];
 }
 
 /* 
@@ -698,10 +704,11 @@
 	} else {
 		NSString *group, *newKeyPath, *internalObjectID;
 		parseKeypath(keyPath, &group, &newKeyPath, &internalObjectID);
-		
+
 		//Change the value.
 		AIPreferenceContainer *prefContainer = [self preferenceContainerForGroup:group
-																		  object:(internalObjectID ? [adium.contactController existingListObjectWithUniqueID:internalObjectID] : nil)];
+																		  object:(internalObjectID ? [adium.contactController existingListObjectWithUniqueID:internalObjectID] : nil)
+                                                                          create:YES];
 		[prefContainer setValue:value forKeyPath:newKeyPath];
 	}
 }
--- a/Source/AIXtrasManager.m	Mon Aug 13 00:26:14 2012 +0200
+++ b/Source/AIXtrasManager.m	Thu Sep 06 00:18:31 2012 +0200
@@ -19,7 +19,6 @@
 #import "AIXtraPreviewController.h"
 #import <Adium/AIDockControllerProtocol.h>
 #import <Adium/AIPathUtilities.h>
-#import <Adium/KNShelfSplitView.h>
 #import <AIUtilities/AIArrayAdditions.h>
 #import <AIUtilities/AIFileManagerAdditions.h>
 #import <AIUtilities/AIImageTextCell.h>
--- a/Source/AdiumOTREncryption.m	Mon Aug 13 00:26:14 2012 +0200
+++ b/Source/AdiumOTREncryption.m	Thu Sep 06 00:18:31 2012 +0200
@@ -372,7 +372,13 @@
 
 static OtrlPolicy policy_cb(void *opdata, ConnContext *context)
 {
-	return policyForContact(contactForContext(context));	
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+	
+	OtrlPolicy ret = policyForContact(contactForContext(context));
+	
+	[pool release];
+	
+	return ret;
 }
 
 /* Generate a private key for the given accountname/protocol */
@@ -400,7 +406,9 @@
 static void create_privkey_cb(void *opdata, const char *accountname,
 							  const char *protocol)
 {
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 	otrg_plugin_create_privkey(accountname, protocol);
+	[pool release];
 }
 
 /* Report whether you think the given user is online.  Return 1 if
@@ -412,20 +420,29 @@
 static int is_logged_in_cb(void *opdata, const char *accountname,
 						   const char *protocol, const char *recipient)
 {
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+	
 	AIListContact *contact = contactFromInfo(accountname, protocol, recipient);
+	int ret;
 	if ([contact statusSummary] == AIUnknownStatus)
-		return -1;
+		ret = -1;
 	else
-		return (contact.online ? 1 : 0);
+		ret = (contact.online ? 1 : 0);
+	
+	[pool release];
+	
+	return ret;
 }
 
 /* Send the given IM to the given recipient from the given
  * accountname/protocol. */
 static void inject_message_cb(void *opdata, const char *accountname,
 							  const char *protocol, const char *recipient, const char *message)
-{	
+{
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 	[adium.contentController sendRawMessage:[NSString stringWithUTF8String:message]
 															 toContact:contactFromInfo(accountname, protocol, recipient)];
+	[pool release];
 }
 
 /*!
@@ -517,6 +534,7 @@
 					  const char *accountname, const char *protocol, const char *username,
 					  const char *title, const char *primary, const char *secondary)
 {
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 	AIListContact	*listContact = contactFromInfo(accountname, protocol, username);
 	NSString		*displayName = listContact.displayName;
 
@@ -529,6 +547,7 @@
 							  secondary:[adiumOTREncryption localizedOTRMessage:[NSString stringWithUTF8String:secondary]
 																   withUsername:displayName
 																 isWorthOpeningANewChat:NULL]];
+	[pool release];
 }
 
 /* Display an OTR control message for a particular accountname /
@@ -540,21 +559,36 @@
 static int display_otr_message_cb(void *opdata, const char *accountname,
 								  const char *protocol, const char *username, const char *msg)
 {
-	return display_otr_message(accountname, protocol, username, msg);
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+	int ret = display_otr_message(accountname, protocol, username, msg);
+	
+	[pool release];
+	
+	return ret;
 }
 
 /* When the list of ConnContexts changes (including a change in
  * state), this is called so the UI can be updated. */
 static void update_context_list_cb(void *opdata)
 {
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+	
 	otrg_ui_update_keylist();
+	
+	[pool release];
 }
 
 /* Return a newly allocated string containing a human-friendly
  * representation for the given account */
 static const char *account_display_name_cb(void *opdata, const char *accountname, const char *protocol)
 {
-	return strdup([[accountFromAccountID(accountname) formattedUID] UTF8String]);
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+	
+	const char *ret = strdup([[accountFromAccountID(accountname) formattedUID] UTF8String]);
+	
+	[pool release];
+	
+	return ret;
 }
 
 /* Deallocate a string returned by account_name */
@@ -568,7 +602,12 @@
  * for the given protocol id */
 static const char *protocol_name_cb(void *opdata, const char *protocol)
 {
-	return strdup([[serviceFromServiceID(protocol) shortDescription] UTF8String]);
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+	const char *ret = strdup([[serviceFromServiceID(protocol) shortDescription] UTF8String]);
+	
+	[pool release];
+	
+	return ret;
 }
 
 /* Deallocate a string allocated by protocol_name */
@@ -584,6 +623,7 @@
 								   const char *accountname, const char *protocol, const char *username,
 								   unsigned char fingerprint[20])
 {
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 	ConnContext			*context;
 	
 	context = otrl_context_find(us, username, accountname,
@@ -597,6 +637,7 @@
 	[adiumOTREncryption performSelector:@selector(verifyUnknownFingerprint:)
 							 withObject:[NSValue valueWithPointer:context]
 							 afterDelay:0];
+	[pool release];
 }
 
 /* The list of known fingerprints has changed.  Write them to disk. */
@@ -608,35 +649,50 @@
 /* A ConnContext has entered a secure state. */
 static void gone_secure_cb(void *opdata, ConnContext *context)
 {
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 	AIChat *chat = chatForContext(context);
 
     update_security_details_for_chat(chat);
 	otrg_ui_update_fingerprint();
+	
+	[pool release];
 }
 
 /* A ConnContext has left a secure state. */
 static void gone_insecure_cb(void *opdata, ConnContext *context)
 {
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+	
 	AIChat *chat = chatForContext(context);
 
     update_security_details_for_chat(chat);
 	otrg_ui_update_fingerprint();
+	
+	[pool release];
 }
 
 /* We have completed an authentication, using the D-H keys we
  * already knew.  is_reply indicates whether we initiated the AKE. */
 static void still_secure_cb(void *opdata, ConnContext *context, int is_reply)
 {
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+	
     if (is_reply == 0) {
 		//		otrg_dialog_stillconnected(context);
 		AILog(@"Still secure...");
     }
+	
+	[pool release];
 }
 
 /* Log a message.  The passed message will end in "\n". */
 static void log_message_cb(void *opdata, const char *message)
 {
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+	
     AILog(@"otr: %s", (message ? message : "(null)"));
+	
+	[pool release];
 }
 
 /*!
@@ -653,6 +709,8 @@
  */
 int max_message_size_cb(void *opdata, ConnContext *context)
 {
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+	
 	AIChat *chat = chatForContext(context);
 	
 	/* Values from http://www.cypherpunks.ca/otr/UPGRADING-libotr-3.1.0.txt */
@@ -670,7 +728,11 @@
 	/* This will return 0 if we don't know (unknown protocol) or don't need it (Jabber),
 	 * which will disable fragmentation.
 	 */
-	return [[maxSizeByServiceClassDict objectForKey:chat.account.service.serviceClass] intValue];
+	int ret = [[maxSizeByServiceClassDict objectForKey:chat.account.service.serviceClass] intValue];
+	
+	[pool release];
+	
+	return ret;
 }
 
 static OtrlMessageAppOps ui_ops = {
--- a/Source/CBContactLastSeenPlugin.m	Mon Aug 13 00:26:14 2012 +0200
+++ b/Source/CBContactLastSeenPlugin.m	Thu Sep 06 00:18:31 2012 +0200
@@ -45,7 +45,7 @@
 - (NSSet *)updateListObject:(AIListObject *)inObject keys:(NSSet *)inModifiedKeys silent:(BOOL)silent
 {
 	/* Update only for contacts whose online status has changed */
-	if ([inObject isKindOfClass:[AIListContact class]]) {
+	if ([inObject isKindOfClass:[AIListContact class]] && !inObject.isStranger) {
 		if ([inModifiedKeys containsObject:@"isOnline"]) {
 			if (inObject.online) {
 				//Either they are online, or we've come online. Either way, update both their status and the time
@@ -110,7 +110,7 @@
 	NSAttributedString	*entry = nil;
 	
 	//Only display for offline contacts
-	if (!inObject.online) {
+	if (!inObject.online && !inObject.isStranger) {
 	
 		lastSeenStatus = [adium.preferenceController preferenceForKey:KEY_LAST_SEEN_STATUS 
 																  group:PREF_GROUP_LAST_SEEN
--- a/Source/ESiTunesPlugin.m	Mon Aug 13 00:26:14 2012 +0200
+++ b/Source/ESiTunesPlugin.m	Thu Sep 06 00:18:31 2012 +0200
@@ -563,8 +563,12 @@
      * here via -TIFFRepresentation to avoid this bug.
      * rdar://11930126 http://trac.adium.im/ticket/16046
      */
-    NSData *imageData = [[[NSWorkspace sharedWorkspace] iconForFile:iTunesPath] TIFFRepresentation];
-	[button setImage:[[[NSImage alloc] initWithData:imageData] autorelease]];
+    if ([NSApp isOnLionOrNewer]) {
+        [button setImage:[[NSWorkspace sharedWorkspace] iconForFile:iTunesPath]];
+    } else {
+        NSData *imageData = [[[NSWorkspace sharedWorkspace] iconForFile:iTunesPath] TIFFRepresentation];
+	    [button setImage:[[[NSImage alloc] initWithData:imageData] autorelease]];
+    }
 	[self createiTunesToolbarItemMenuItems:menu];
 
 	NSToolbarItem * iTunesItem = [AIToolbarUtilities toolbarItemWithIdentifier:KEY_TRIGGERS_TOOLBAR
--- a/Source/KNShelfSplitView.h	Mon Aug 13 00:26:14 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,128 +0,0 @@
-/*
-
-BSD License
-
-Copyright (c) 2006, Keith Anderson
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-*	Redistributions of source code must retain the above copyright notice,
-	this list of conditions and the following disclaimer.
-*	Redistributions in binary form must reproduce the above copyright notice,
-	this list of conditions and the following disclaimer in the documentation
-	and/or other materials provided with the distribution.
-*	Neither the name of keeto.net or Keith Anderson nor the names of its
-	contributors may be used to endorse or promote products derived
-	from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-*/
-
-
-
-@interface KNShelfSplitView : NSView {
-	IBOutlet NSView *			shelfView;
-	IBOutlet NSView *			contentView;
-	IBOutlet id					delegate;
-	IBOutlet id					target;
-	SEL							action;
-	
-	NSString *					autosaveName;
-	NSImage *					actionButtonImage;
-	NSImage *					contextButtonImage;
-	NSColor *					shelfBackgroundColor;
-	CGFloat						currentShelfWidth;
-	CGFloat						prevShelfWidthBeforeDoubleClick;
-	BOOL						isShelfVisible;
-	NSMenu *					contextButtonMenu;
-	
-	NSRect						controlRect;
-	BOOL						shouldDrawActionButton;
-	NSRect						actionButtonRect;
-	BOOL						shouldDrawContextButton;
-	NSRect						contextButtonRect;
-	NSRect						resizeThumbRect;
-	NSRect						resizeBarRect;
-	NSInteger							activeControlPart;
-	BOOL						shouldHilite;
-	
-	BOOL						delegateHasValidateWidth;
-	BOOL						delegateHasContextMenu;
-	
-	BOOL						drawLine;
-	BOOL						shelfOnRight;
-	
-	NSAttributedString *attributedStringValue;
-	CGFloat		stringHeight;
-	
-	NSImage		*background;
-	NSSize		backgroundSize;
-}
-
--(IBAction)toggleShelf:(id)sender;
-
--(id)initWithFrame:(NSRect)aFrame shelfView:(NSView *)aShelfView contentView:(NSView *)aContentView;
-
--(void)setDelegate:(id)aDelegate;
--(id)delegate;
--(void)setTarget:(id)aTarget;
--(id)target;
--(void)setAction:(SEL)aSelector;
--(SEL)action;
-
--(void)setShelfView:(NSView *)aView;
--(NSView *)shelfView;
--(void)setContentView:(NSView *)aView;
--(NSView *)contentView;
-
--(void)setShelfOnRight:(BOOL)inRight;
--(BOOL)shelfOnRight;
-
--(void)setDrawShelfLine:(BOOL)inDraw;
--(BOOL)drawShelfLine;
-
--(void)setShelfWidth:(CGFloat)aWidth;
--(CGFloat)shelfWidth;
-
--(BOOL)isShelfVisible;
--(void)setShelfIsVisible:(BOOL)visible;
-
--(void)setAutosaveName:(NSString *)aName;
--(NSString *)autosaveName;
-
-
--(void)setActionButtonImage:(NSImage *)anImage;
--(NSImage *)actionButtonImage;
--(void)setContextButtonImage:(NSImage *)anImage;
--(NSImage *)contextButtonImage;
--(void)setShelfBackgroundColor:(NSColor *)aColor;
--(NSColor *)shelfBackgroundColor;
-
-
--(void)recalculateSizes;
--(void)drawControlBackgroundInRect:(NSRect)aRect active:(BOOL)isActive;
-
-- (void)setResizeThumbStringValue:(NSString *)inString;
-
-
-@end
-
-@interface NSObject (KNShelfSplitViewDelegate)
-// These are all optional.
--(CGFloat)shelfSplitView:(KNShelfSplitView *)shelfSplitView validateWidth:(CGFloat)proposedWidth;
--(void)splitViewDidHaveResizeDoubleClick:(KNShelfSplitView *)shelfSplitView;
--(NSMenu *)contextMenuForShelfSplitView:(KNShelfSplitView *)shelfSplitView;
-@end
--- a/Source/KNShelfSplitView.m	Mon Aug 13 00:26:14 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,732 +0,0 @@
-/*
-
-BSD License
-
-Copyright (c) 2006, Keith Anderson
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-*	Redistributions of source code must retain the above copyright notice,
-	this list of conditions and the following disclaimer.
-*	Redistributions in binary form must reproduce the above copyright notice,
-	this list of conditions and the following disclaimer in the documentation
-	and/or other materials provided with the distribution.
-*	Neither the name of keeto.net or Keith Anderson nor the names of its
-	contributors may be used to endorse or promote products derived
-	from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-*/
-
-/*
- * Modified to have a glass-style background; this requires the sourceListBackground image.
- */
-
-#import "KNShelfSplitView.h"
-
-#import <AIUtilities/AIAttributedStringAdditions.h>
-#import <AIUtilities/AIParagraphStyleAdditions.h>
-#import <AIUtilities/AIImageAdditions.h>
-#import <AIUtilities/AIToolbarUtilities.h>
-#import "AIAdium.h"
-
-#define DEFAULT_SHELF_WIDTH 200.0f
-#define CONTROL_HEIGHT 22.0f
-#define BUTTON_WIDTH 30.0f
-#define THUMB_LINE_SPACING 2.0f
-#define THUMB_LINE_COUNT 3
-#define THUMB_WIDTH 13
-#define RESIZE_BAR_EFFECTIVE_WIDTH 0.0f
-
-#define CONTROL_PART_NONE 0
-#define CONTROL_PART_ACTION_BUTTON 1
-#define CONTROL_PART_CONTEXT_BUTTON 2
-#define CONTROL_PART_RESIZE_THUMB 3
-#define CONTROL_PART_RESIZE_BAR 4
-
-#define TOOLBAR_TOGGLESHELF_IDENTIFIER @"Toggle Shelf"
-#define TOGGLESHELF @"Toggle Shelf"
-@implementation KNShelfSplitView
-
--(IBAction)toggleShelf:(id)sender
-{
-	#pragma unused(sender)
-	[self setShelfIsVisible: ![self isShelfVisible]];
-	[self setNeedsDisplay: YES];
-}
-
-- (id)initWithFrame:(NSRect)aFrame {
-	return [self initWithFrame: aFrame shelfView: nil contentView: nil];
-}
-
--(id)initWithFrame:(NSRect)aFrame shelfView:(NSView *)aShelfView contentView:(NSView *)aContentView{
-	self = [super initWithFrame: aFrame];
-	if( self ){
-		
-		currentShelfWidth = DEFAULT_SHELF_WIDTH; //change this
-		prevShelfWidthBeforeDoubleClick = currentShelfWidth;
-		isShelfVisible = YES;
-		shouldHilite = NO;
-		activeControlPart = CONTROL_PART_NONE;
-		[self recalculateSizes];
-		
-		autosaveName = nil;
-		shelfBackgroundColor = nil;
-		actionButtonImage = nil;
-		contextButtonImage = nil;
-		
-		drawLine = YES;
-		
-		background = [[NSImage imageNamed:@"sourceListBackground" forClass:[self class]] retain];
-		backgroundSize = [background size];
-
-		[self setDelegate: nil];
-		target = nil;
-		action = nil;
-	
-		[self setShelfView: aShelfView];
-		[self setContentView: aContentView];
-	}
-	return self;
-}
-
-
--(void)dealloc{
-	if( autosaveName ){ [autosaveName release]; }
-	if( contextButtonImage ){ [contextButtonImage release]; }
-	if( actionButtonImage ){ [actionButtonImage release]; }
-	if( shelfBackgroundColor ){ [shelfBackgroundColor release]; }
-	if( background ){ [background release]; }
-
-	[super dealloc];
-}
-
--(void)setDelegate:(id)aDelegate{
-	delegate = aDelegate;
-	
-	delegateHasValidateWidth = NO;
-	delegateHasContextMenu = NO;
-	
-	if( delegate ){
-		if( [delegate respondsToSelector:@selector(shelfSplitView:validateWidth:)] ){
-			delegateHasValidateWidth = YES;
-		}
-		
-		if ([delegate respondsToSelector:@selector(contextMenuForShelfSplitView:)]) {
-			delegateHasContextMenu = YES;
-		}
-	}
-}
-
--(id)delegate{
-	return delegate;
-}
-
--(void)setTarget:(id)aTarget{
-	target = aTarget;
-	[self recalculateSizes];
-}
-
--(id)target{
-	return target;
-}
-
--(void)setAction:(SEL)aSelector{
-	action = aSelector;
-	[self recalculateSizes];
-}
-
--(SEL)action{
-	return action;
-}
-
--(void)didEndContextMenuTracking:(NSNotification *)notification
-{
-	shouldHilite = NO;
-	[self setNeedsDisplayInRect: controlRect];
-	
-	[[NSNotificationCenter defaultCenter] removeObserver:self name:NSMenuDidEndTrackingNotification object:notification.object];
-	
-}
-
--(void)setShelfView:(NSView *)aView{
-	if( shelfView ){
-		[shelfView removeFromSuperview];
-	}
-	
-	shelfView = aView;
-	
-	if( shelfView ){
-		[self addSubview: shelfView];
-	}
-	[self recalculateSizes];
-}
-
--(NSView *)shelfView{
-	return shelfView;
-}
-
--(void)setContentView:(NSView *)aView{
-	if( contentView ){
-		[contentView removeFromSuperview];
-	}
-	
-	contentView = aView;
-	
-	if( contentView ){
-		[self addSubview: contentView];
-	}
-	
-	[self recalculateSizes];
-}
-
--(NSView *)contentView{
-	return contentView;
-}
-
--(void)setDrawShelfLine:(BOOL)inDraw
-{
-	drawLine = inDraw;
-	[self recalculateSizes];
-}
-
--(BOOL)drawShelfLine
-{
-	return drawLine;
-}
-
-- (void)setShelfOnRight:(BOOL)inRight
-{
-	shelfOnRight = inRight;
-	[self recalculateSizes];
-}
-
-- (BOOL)shelfOnRight
-{
-	return shelfOnRight;
-}
-
--(void)setShelfWidthNoConstraints:(CGFloat)aWidth
-{
-	currentShelfWidth = aWidth;
-	
-	[self recalculateSizes];	
-}
-
--(void)setShelfWidth:(CGFloat)aWidth{
-	CGFloat newWidth = aWidth;
-
-	// The shelf can never be completely closed. We always have at least enough to show our resize thumb, otherwise
-	// if the delegate responds to shelfSplitView:validateWidth:, we use that width as our minimum shelf size
-	CGFloat				minShelf = 100; /*NSWidth(resizeThumbRect)
-									+ (shouldDrawContextButton ? NSWidth(contextButtonRect) : 0)
-									+ (shouldDrawActionButton ? NSWidth(actionButtonRect) : 0);*/
-	
-	if( delegateHasValidateWidth ){
-		CGFloat				requestedWidth = [delegate shelfSplitView:self validateWidth: aWidth];
-		if( requestedWidth > minShelf ){
-			minShelf = requestedWidth;
-		}
-	}
-	
-	if( minShelf > newWidth ){
-		newWidth = minShelf;
-	}
-	
-	// The shelf can never be wider than half the entire view
-	CGFloat maxShelf = [self frame].size.width / 2;
-	
-	if( newWidth > maxShelf ){
-		newWidth = maxShelf;
-	}
-	
-	currentShelfWidth = newWidth;
-	
-	[self recalculateSizes];
-}
-
--(CGFloat)shelfWidth{
-	return currentShelfWidth;
-}
-
--(void)setAutosaveName:(NSString *)aName{
-	if( autosaveName ){
-		[autosaveName autorelease];
-	}
-	autosaveName = [aName retain];
-}
-
--(NSString *)autosaveName{
-	return autosaveName;
-}
-
--(void)recalculateSizes
-{
-	CGFloat leftShelfX = shelfOnRight ? NSWidth(self.bounds) - currentShelfWidth : 0;
-	
-	if (isShelfVisible) {
-		controlRect = NSMakeRect(leftShelfX, 0, currentShelfWidth, CONTROL_HEIGHT);
-
-		// Resize control
-		if (shelfOnRight) {
-			resizeThumbRect = NSMakeRect(leftShelfX, 0, THUMB_WIDTH, CONTROL_HEIGHT);
-		} else {
-			resizeThumbRect = NSMakeRect(leftShelfX + currentShelfWidth - THUMB_WIDTH, 0, THUMB_WIDTH, CONTROL_HEIGHT);
-		}
-		
-		// Resize bar
-		if (shelfOnRight) {
-			resizeBarRect = NSMakeRect(leftShelfX - RESIZE_BAR_EFFECTIVE_WIDTH/2.0f, 0, RESIZE_BAR_EFFECTIVE_WIDTH, self.frame.size.height);
-		} else {
-			resizeBarRect = NSMakeRect(leftShelfX + currentShelfWidth - RESIZE_BAR_EFFECTIVE_WIDTH/2.0f, 0, RESIZE_BAR_EFFECTIVE_WIDTH, self.frame.size.height);
-		}
-		
-		// Action button
-		if (target && action && controlRect.size.width) {
-			shouldDrawActionButton = YES;
-			if (shelfOnRight) {
-				actionButtonRect = NSMakeRect(leftShelfX + THUMB_WIDTH, 0, BUTTON_WIDTH, CONTROL_HEIGHT);
-			} else {
-				actionButtonRect = NSMakeRect(leftShelfX, 0, BUTTON_WIDTH, CONTROL_HEIGHT);
-			}
-		}
-
-		// Context button
-		if (delegateHasContextMenu && [delegate contextMenuForShelfSplitView:self].numberOfItems) {
-			shouldDrawContextButton = YES;
-			if (shelfOnRight) {
-				contextButtonRect = NSMakeRect(leftShelfX + THUMB_WIDTH + 2, 0, BUTTON_WIDTH, CONTROL_HEIGHT);
-			} else {
-				contextButtonRect = NSMakeRect(leftShelfX, 0, BUTTON_WIDTH, CONTROL_HEIGHT);
-			}
-		}
-	}
-	
-	if (shelfView) {
-		[shelfView setFrame:NSMakeRect(leftShelfX, CONTROL_HEIGHT + 1, currentShelfWidth, self.bounds.size.height - (CONTROL_HEIGHT + 1))];
-	}
-
-	if(contentView) {
-		CGFloat leftContentX, width;
-		
-		if (isShelfVisible) {
-			leftContentX = shelfOnRight ? 0 : currentShelfWidth + (self.drawShelfLine ? 1 : 0);
-			width = NSWidth(self.bounds) - currentShelfWidth - (self.drawShelfLine ? 1 : 0);
-		} else {
-			leftContentX = 0;
-			width = NSWidth(self.bounds);
-		}
-
-		NSRect newRect = NSMakeRect(leftContentX, 0, width, NSHeight(self.bounds));
-		
-		if (!NSEqualRects(newRect, contentView.frame)){
-			[contentView setFrame:newRect];
-		}
-	}
-	
-	[self setNeedsDisplay: YES];
-	[[self window] invalidateCursorRectsForView: self];
-	
-}
-
--(BOOL)isShelfVisible{
-	return isShelfVisible;
-}
-
--(void)setShelfIsVisible:(BOOL)visible{
-	if( shelfView ){
-		if( isShelfVisible && !visible ){
-			[shelfView retain];
-			[shelfView removeFromSuperview];
-		} else if( !isShelfVisible && visible ){
-			[self addSubview: shelfView];
-			[shelfView release];
-		}
-	}
-
-	isShelfVisible = visible;
-	[self recalculateSizes];
-}
-
--(void)setActionButtonImage:(NSImage *)anImage{
-	if( actionButtonImage ){
-		[actionButtonImage autorelease];
-	}
-	
-	actionButtonImage = [anImage retain];
-	
-	[self setNeedsDisplayInRect: controlRect];
-}
-
--(NSImage *)actionButtonImage{
-		return actionButtonImage;
-}
-
--(void)setContextButtonImage:(NSImage *)anImage{
-	if( contextButtonImage ){
-		[contextButtonImage autorelease];
-	}
-	
-	contextButtonImage = [anImage retain];
-	
-	[self setNeedsDisplayInRect: controlRect];
-}
-
--(NSImage *)contextButtonImage{
-	return contextButtonImage;
-}
-
--(void)setShelfBackgroundColor:(NSColor *)aColor{
-	if( shelfBackgroundColor ){
-		[shelfBackgroundColor autorelease];
-	}
-	
-	shelfBackgroundColor = [aColor retain];
-	[self setNeedsDisplay: YES];
-}
-
--(NSColor *)shelfBackgroundColor{
-	return shelfBackgroundColor;
-}
-
--(void)resetCursorRects{
-	[super resetCursorRects];
-	if( isShelfVisible ){
-		[self addCursorRect: resizeThumbRect cursor: [NSCursor resizeLeftRightCursor]];
-		[self addCursorRect: resizeBarRect cursor: [NSCursor resizeLeftRightCursor]];
-	}
-}
-
--(void)mouseDown:(NSEvent *)anEvent{
-	BOOL					stillMouseDown = YES;
-	NSPoint					currentLocation;
-
-	// determine if we're in a control part we care about
-	currentLocation = [self convertPoint: [anEvent locationInWindow] fromView: nil];
-	
-	if( shouldDrawActionButton && NSPointInRect( currentLocation, actionButtonRect ) ){
-		activeControlPart = CONTROL_PART_ACTION_BUTTON;
-		shouldHilite = YES;
-	}else if( shouldDrawContextButton && NSPointInRect( currentLocation, contextButtonRect ) ){
-		activeControlPart = CONTROL_PART_CONTEXT_BUTTON;
-		shouldHilite = YES;
-
-		NSEvent *			contextEvent = [NSEvent mouseEventWithType:[anEvent type]
-															  location:NSMakePoint( contextButtonRect.origin.x + (contextButtonRect.size.width / 2) , contextButtonRect.origin.y + (contextButtonRect.size.height / 2) )
-														 modifierFlags:[anEvent modifierFlags]
-															 timestamp:[anEvent timestamp]
-														  windowNumber:[anEvent windowNumber]
-															   context:[anEvent context]
-														   eventNumber:[anEvent eventNumber]
-															clickCount:[anEvent clickCount]
-															  pressure:[anEvent pressure]
-											];
-		[self setNeedsDisplayInRect:controlRect];
-		
-		NSMenu *contextMenu = [delegate contextMenuForShelfSplitView:self];
-		
-		[[NSNotificationCenter defaultCenter] addObserver:self
-												 selector:@selector(didEndContextMenuTracking:)
-													 name:NSMenuDidEndTrackingNotification
-												   object:contextMenu];
-		
-		[NSMenu popUpContextMenu:contextMenu withEvent: contextEvent forView: self];
-		[super mouseDown:contextEvent];
-		return;
-		
-	}else if( NSPointInRect( currentLocation, resizeThumbRect ) ){
-		activeControlPart = CONTROL_PART_RESIZE_THUMB;
-	}else if( NSPointInRect( currentLocation, resizeBarRect ) ){
-		activeControlPart = CONTROL_PART_RESIZE_BAR;
-	}else{
-		activeControlPart = CONTROL_PART_NONE;
-	}
-	
-	[self setNeedsDisplayInRect: controlRect];
-
-	if( activeControlPart != CONTROL_PART_NONE ){
-		if([anEvent clickCount] == 2){
-			if( (activeControlPart == CONTROL_PART_RESIZE_THUMB) || (activeControlPart == CONTROL_PART_RESIZE_BAR) ){
-				if([delegate respondsToSelector:@selector(splitViewDidHaveResizeDoubleClick:)]) {
-					[delegate splitViewDidHaveResizeDoubleClick:self];
-				} else {			
-					if (currentShelfWidth > NSWidth(resizeBarRect)) {
-						prevShelfWidthBeforeDoubleClick = currentShelfWidth;
-						[self setShelfWidthNoConstraints:NSWidth(resizeBarRect)];
-					} else {
-						[self setShelfWidth:prevShelfWidthBeforeDoubleClick];
-					}
-				}
-			}
-
-		} else {
-			
-			NSPoint startLocation = currentLocation = [self convertPoint: [anEvent locationInWindow] fromView: nil];
-			CGFloat initialDifference;
-			
-			if (shelfOnRight ) {
-				initialDifference = startLocation.x - NSMinX(controlRect);
-			} else {
-				initialDifference = NSMaxX(controlRect) - startLocation.x;
-			}
-				
-			while( stillMouseDown ){
-				anEvent = [[self window] nextEventMatchingMask: NSLeftMouseUpMask | NSLeftMouseDraggedMask];
-				currentLocation = [self convertPoint: [anEvent locationInWindow] fromView: nil];
-				shouldHilite = NO;
-				
-				if( (activeControlPart == CONTROL_PART_ACTION_BUTTON) && NSPointInRect( currentLocation, actionButtonRect ) ){
-					shouldHilite = YES;
-				}else if( (activeControlPart == CONTROL_PART_CONTEXT_BUTTON) && NSPointInRect( currentLocation, contextButtonRect ) ){
-					shouldHilite = YES;
-				}
-				
-				switch( [anEvent type] ){
-					case NSLeftMouseDragged:
-						if( (activeControlPart == CONTROL_PART_RESIZE_THUMB) || (activeControlPart == CONTROL_PART_RESIZE_BAR) ){
-							CGFloat width;
-							
-							if (shelfOnRight) {
-								width = self.bounds.size.width - currentLocation.x + initialDifference;
-							} else {
-								width = currentLocation.x + initialDifference;
-							}
-							
-							[self setShelfWidth:width];
-						}else{
-							[self setNeedsDisplayInRect: controlRect];
-						}
-						break;
-						
-					case NSLeftMouseUp:
-						shouldHilite = NO;
-						[self setNeedsDisplayInRect: controlRect];
-						
-						if( (activeControlPart == CONTROL_PART_ACTION_BUTTON) && NSPointInRect( currentLocation, actionButtonRect ) ){
-							// trigger an action
-							if( target && action && [target respondsToSelector:action]){
-								[target performSelector: action withObject: self];
-							}
-						}					
-						stillMouseDown = NO;
-						
-						break;
-						
-					default:
-						break;
-				}
-			}
-		}
-	} else {
-		[super mouseDown:anEvent];
-	}
-}
-
-- (void)drawRect:(NSRect)rect {
-#pragma unused( rect )
-	
-	if(isShelfVisible) {
-		CGFloat leftShelfX = shelfOnRight ? NSWidth(self.bounds) - currentShelfWidth : 0;
-		
-		[self drawControlBackgroundInRect:NSMakeRect(leftShelfX, 0, controlRect.size.width, controlRect.size.height)
-								   active:NO];
-
-		// action button
-		if(shouldDrawActionButton) {
-			[self drawControlBackgroundInRect:actionButtonRect
-									   active:(activeControlPart == CONTROL_PART_ACTION_BUTTON) && shouldHilite];
-			
-			[[NSColor windowFrameColor] set];
-
-			if(actionButtonImage) {				
-				NSRect			targetRect = NSMakeRect(actionButtonRect.origin.x,
-														actionButtonRect.origin.y,
-														[actionButtonImage size].width, 
-														[actionButtonImage size].height);
-				
-				if( targetRect.size.width > actionButtonRect.size.width ){
-					targetRect.size.width = actionButtonRect.size.width;
-				}
-				
-				if( targetRect.size.width < actionButtonRect.size.width ){
-					targetRect.origin.x += (actionButtonRect.size.width - targetRect.size.width) / 2.0f;
-				}
-				
-				if( targetRect.size.height > actionButtonRect.size.height ){
-					targetRect.size.height = actionButtonRect.size.height;
-				}
-				
-				if( targetRect.size.height < actionButtonRect.size.height ){
-					targetRect.origin.y += (actionButtonRect.size.height - targetRect.size.height) / 2.0f;
-				}
-				
-				[actionButtonImage compositeToPoint:NSMakePoint(actionButtonRect.origin.x,
-																actionButtonRect.origin.y) operation:NSCompositeDestinationAtop];
-			}
-		}
-		
-		// context button
-		if (shouldDrawContextButton) {
-			[self drawControlBackgroundInRect:contextButtonRect
-									   active:(activeControlPart == CONTROL_PART_CONTEXT_BUTTON ) && shouldHilite];
-			
-			[[NSColor windowFrameColor] set];
-			NSRectFill( NSMakeRect( (contextButtonRect.origin.x + contextButtonRect.size.width) - 1, 0, 1, controlRect.size.height ) );
-			
-			if(contextButtonImage) {		
-				NSRect			targetRect = NSMakeRect(contextButtonRect.origin.x,
-														contextButtonRect.origin.y,
-														[contextButtonImage size].width, 
-														[contextButtonImage size].height);
-				
-				if( targetRect.size.width > contextButtonRect.size.width ){
-					targetRect.size.width = contextButtonRect.size.width;
-				}
-				
-				if( targetRect.size.width < contextButtonRect.size.width ){
-					targetRect.origin.x += (contextButtonRect.size.width - targetRect.size.width) / 2.0f;
-				}
-				
-				if( targetRect.size.height > contextButtonRect.size.height ){
-					targetRect.size.height = contextButtonRect.size.height;
-				}
-				
-				if( targetRect.size.height < contextButtonRect.size.height ){
-					targetRect.origin.y += (contextButtonRect.size.height - targetRect.size.height) / 2.0f;
-				}
-				
-				[contextButtonImage drawInRect:targetRect
-									  fromRect:NSMakeRect( 0, 0, [contextButtonImage size].width, [contextButtonImage size].height )
-									 operation:NSCompositeSourceOver
-									  fraction:1.0f];
-			}
-		}
-
-		[[NSColor windowFrameColor] set];
-		NSRectFill( NSMakeRect( leftShelfX, CONTROL_HEIGHT, currentShelfWidth, 1 ) );
-		
-		if (!drawLine) {
-			NSRectFill( NSMakeRect( leftShelfX, 0, currentShelfWidth, 1 ) );
-		}
-		
-		// Draw our split line
-		if (self.drawShelfLine) {
-			[[NSColor windowFrameColor] set];
-			if (shelfOnRight) {
-				NSRectFill( NSMakeRect( leftShelfX - 1, 0, 1, [self frame].size.height ) );
-			} else {
-				NSRectFill( NSMakeRect( leftShelfX + currentShelfWidth, 0, 1, [self frame].size.height ) );
-			}
-		}
-		
-		// Draw our thumb lines
-		[[NSColor disabledControlTextColor] set];
-		NSRect			thumbLineRect = NSMakeRect( 
-											resizeThumbRect.origin.x + THUMB_LINE_SPACING*2, 
-											resizeThumbRect.size.height / 4.0f, 
-											1.0f, 
-											resizeThumbRect.size.height / 2.0f
-										);
-		NSInteger i;
-		for( i=0; i<THUMB_LINE_COUNT; i++ ){
-			NSRectFill( thumbLineRect );
-			thumbLineRect.origin.x += (1+THUMB_LINE_SPACING);
-		}
-		
-		if( shelfBackgroundColor ){
-			[shelfBackgroundColor set];
-			NSRectFill( NSMakeRect( leftShelfX, CONTROL_HEIGHT+1, currentShelfWidth, [self frame].size.height ) );
-		}
-		
-		if (shelfOnRight) {
-			[[NSColor windowFrameColor] set];
-			NSRectFill( NSMakeRect( resizeThumbRect.origin.x + resizeThumbRect.size.width + 1, 0, 1, resizeThumbRect.size.height ) );
-		}
-		
-		//Draw the string
-		if (attributedStringValue) {
-			NSPoint textPoint;
-			
-			CGFloat leftShiftX = leftShelfX;
-			
-			if (shouldDrawActionButton) {
-				leftShiftX += NSWidth(actionButtonRect) + 2;
-			}
-			
-			if (shouldDrawContextButton) {
-				leftShiftX += NSWidth(contextButtonRect) + 2;
-			}
-			
-			if (shelfOnRight) {
-				textPoint = NSMakePoint(leftShiftX + resizeThumbRect.size.width + 4, (NSHeight(controlRect) - stringHeight)/2);
-			} else {
-				textPoint = NSMakePoint(leftShiftX + 4, (NSHeight(controlRect) - stringHeight)/2 + 1);
-			}
-			
-			[attributedStringValue drawAtPoint:textPoint];
-		} 
-	}
-}
-
--(void)drawControlBackgroundInRect:(NSRect)aRect active:(BOOL)isActive{	
-	//Draw the background, tiling across
-    NSRect sourceRect = NSMakeRect(0, 0, backgroundSize.width, backgroundSize.height);
-    NSRect destRect = NSMakeRect(aRect.origin.x, aRect.origin.y, sourceRect.size.width, aRect.size.height);
-	
-    while ((destRect.origin.x < NSMaxX(aRect)) && destRect.size.width > 0) {
-        //Crop
-        if (NSMaxX(destRect) > NSMaxX(aRect)) {
-			destRect.size.width = NSMaxX(aRect) - NSMinX(destRect);
-            sourceRect.size.width = NSWidth(destRect);
-        }
-		
-        [background drawInRect:destRect
-					  fromRect:sourceRect
-					 operation:(isActive ? NSCompositeSourceIn : NSCompositeSourceOver)
-					  fraction:(isActive ? 0.75f : 1.0f)];
-		
-        destRect.origin.x += destRect.size.width;
-    }
-}
-
--(void)setFrame:(NSRect)aRect{
-	[super setFrame: aRect];
-	[self recalculateSizes];
-}
-
-#pragma mark Status string
-- (void)setResizeThumbStringValue:(NSString *)inString
-{
-	if (!(attributedStringValue && [inString isEqualToString:[attributedStringValue string]])) {		
-		if(attributedStringValue) [attributedStringValue release];
-		if (inString) {
-			NSDictionary *attributes = [NSDictionary dictionaryWithObjectsAndKeys:
-				[NSParagraphStyle styleWithAlignment:NSLeftTextAlignment
-									   lineBreakMode:NSLineBreakByTruncatingTail], NSParagraphStyleAttributeName,
-				[NSFont systemFontOfSize:[NSFont smallSystemFontSize]], NSFontAttributeName, 
-				nil];
-			
-			stringHeight = [NSAttributedString stringHeightForAttributes:attributes];
-			attributedStringValue = [[NSAttributedString alloc] initWithString:inString
-																	attributes:attributes];
-		} else {
-			attributedStringValue = nil;
-		}
-		[self setNeedsDisplay:YES];
-	}
-}
-
-@end