adium 3400:9ea3ccd9ae6c: Backed out of these changes, should inv...
commits at adium.im
commits at adium.im
Fri Oct 22 21:52:18 UTC 2010
details: http://hg.adium.im/adium/rev/9ea3ccd9ae6c
revision: 3400:9ea3ccd9ae6c
author: Thijs Alkemade <thijsalkemade at gmail.com>
date: Fri Oct 22 23:49:59 2010 +0200
Backed out of these changes, should investigate this a bit more further first.
Subject: adium 3401:5b69a19e671c: Merged.
details: http://hg.adium.im/adium/rev/5b69a19e671c
revision: 3401:5b69a19e671c
author: Thijs Alkemade <thijsalkemade at gmail.com>
date: Fri Oct 22 23:50:54 2010 +0200
Merged.
diffs (truncated from 8502 to 1000 lines):
diff -r a19c59750f20 -r 5b69a19e671c Frameworks/Adium Framework/Resources/sv.lproj/Localizable.strings
Binary file Frameworks/Adium Framework/Resources/sv.lproj/Localizable.strings has changed
diff -r a19c59750f20 -r 5b69a19e671c Frameworks/Adium Framework/Source/AIMetaContact.m
--- a/Frameworks/Adium Framework/Source/AIMetaContact.m Fri Oct 22 23:25:33 2010 +0200
+++ b/Frameworks/Adium Framework/Source/AIMetaContact.m Fri Oct 22 23:50:54 2010 +0200
@@ -687,9 +687,7 @@
if (properties == nil) {
properties = [[NSArray alloc] initWithObjects:@"isOnline", @"isEvent", @"isBlocked",
@"isIdle", @"notAStranger", @"isMobile", @"signedOff", @"signedOn",
- @"alwaysOnline", @"unviewedContent", @"unviewedMention",
- @"idleSince", @"idleReadable", @"serverDispalyName", @"formattedUID",
- @"textProfile", @"listObjectStatusMessage", nil];
+ @"alwaysOnline", @"unviewedContent", @"unviewedMention", nil];
}
return properties;
}
@@ -701,7 +699,7 @@
if ([[[self class] _forwardedProperties] containsObject:key]) {
ret = [self.preferredContact valueForProperty:key];
} else {
- ret = [super valueForProperty:key];
+ ret = [super valueForProperty:key] ?: [self.preferredContact valueForProperty:key];
}
return ret;
@@ -714,7 +712,7 @@
if ([[[self class] _forwardedProperties] containsObject:key]) {
ret = [self.preferredContact integerValueForProperty:key];
} else {
- ret = [super integerValueForProperty:key];
+ ret = [super integerValueForProperty:key] ?: [self.preferredContact integerValueForProperty:key];
}
return ret;
@@ -727,7 +725,7 @@
if ([[[self class] _forwardedProperties] containsObject:key]) {
ret = [self.preferredContact intValueForProperty:key];
} else {
- ret = [super intValueForProperty:key];
+ ret = [super intValueForProperty:key] ?: [self.preferredContact intValueForProperty:key];
}
return ret;
@@ -740,7 +738,7 @@
if ([[[self class] _forwardedProperties] containsObject:key]) {
ret = [self.preferredContact boolValueForProperty:key];
} else {
- ret = [super boolValueForProperty:key];
+ ret = [super boolValueForProperty:key] ?: [self.preferredContact boolValueForProperty:key];
}
return ret;
diff -r a19c59750f20 -r 5b69a19e671c Frameworks/Adium Framework/Source/ESObjectWithProperties.m
--- a/Frameworks/Adium Framework/Source/ESObjectWithProperties.m Fri Oct 22 23:25:33 2010 +0200
+++ b/Frameworks/Adium Framework/Source/ESObjectWithProperties.m Fri Oct 22 23:50:54 2010 +0200
@@ -243,7 +243,7 @@
AILogWithSignature(@" *** This ivar is not an object but an %s! Should not use -valueForProperty: @\"%@\" ***", ivarType, key);
} else {
- ret = value;
+ ret = [[value retain] autorelease];
}
}
diff -r a19c59750f20 -r 5b69a19e671c Plugins/Purple Service/sv.lproj/ESIRCAccountView.nib/designable.nib
--- a/Plugins/Purple Service/sv.lproj/ESIRCAccountView.nib/designable.nib Fri Oct 22 23:25:33 2010 +0200
+++ b/Plugins/Purple Service/sv.lproj/ESIRCAccountView.nib/designable.nib Fri Oct 22 23:50:54 2010 +0200
@@ -2,13 +2,13 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">10C540</string>
- <string key="IBDocument.InterfaceBuilderVersion">740</string>
- <string key="IBDocument.AppKitVersion">1038.25</string>
- <string key="IBDocument.HIToolboxVersion">458.00</string>
+ <string key="IBDocument.SystemVersion">10F569</string>
+ <string key="IBDocument.InterfaceBuilderVersion">788</string>
+ <string key="IBDocument.AppKitVersion">1038.29</string>
+ <string key="IBDocument.HIToolboxVersion">461.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">740</string>
+ <string key="NS.object.0">788</string>
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -38,7 +38,7 @@
<string key="NSClassName">NSApplication</string>
</object>
<object class="NSCustomView" id="573956893">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -47,6 +47,7 @@
<int key="NSvFlags">264</int>
<string key="NSFrame">{{-63, 2}, {140, 17}}</string>
<reference key="NSSuperview" ref="573956893"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="1047612221">
<int key="NSCellFlags">67239424</int>
@@ -83,6 +84,7 @@
<int key="NSvFlags">264</int>
<string key="NSFrame">{{-63, 58}, {140, 17}}</string>
<reference key="NSSuperview" ref="573956893"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="787533879">
<int key="NSCellFlags">67239424</int>
@@ -99,6 +101,7 @@
<int key="NSvFlags">264</int>
<string key="NSFrame">{{82, 56}, {240, 22}}</string>
<reference key="NSSuperview" ref="573956893"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="338171281">
<int key="NSCellFlags">-1804468671</int>
@@ -130,6 +133,7 @@
<int key="NSvFlags">264</int>
<string key="NSFrame">{{82, 0}, {240, 22}}</string>
<reference key="NSSuperview" ref="573956893"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="1002688135">
<int key="NSCellFlags">-1804468671</int>
@@ -148,6 +152,7 @@
<int key="NSvFlags">264</int>
<string key="NSFrame">{{82, 28}, {240, 22}}</string>
<reference key="NSSuperview" ref="573956893"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="396470">
<int key="NSCellFlags">-1804468671</int>
@@ -164,13 +169,14 @@
<object class="NSTextField" id="46540261">
<reference key="NSNextResponder" ref="573956893"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{5, 30}, {72, 17}}</string>
+ <string key="NSFrame">{{2, 13}, {75, 34}}</string>
<reference key="NSSuperview" ref="573956893"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="545511991">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">71303168</int>
- <string key="NSContents">Hostname:</string>
+ <string key="NSContents">Värdnamn:</string>
<reference key="NSSupport" ref="618221824"/>
<reference key="NSControlView" ref="46540261"/>
<reference key="NSBackgroundColor" ref="37842040"/>
@@ -179,13 +185,15 @@
</object>
</object>
<string key="NSFrameSize">{322, 78}</string>
+ <reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
<object class="NSMutableString" key="NSClassName">
<characters key="NS.bytes">NSView</characters>
</object>
<string key="NSExtension">NSResponder</string>
</object>
<object class="NSCustomView" id="1009504981">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -194,6 +202,7 @@
<int key="NSvFlags">264</int>
<string key="NSFrame">{{199, 236}, {207, 18}}</string>
<reference key="NSSuperview" ref="1009504981"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="709539719">
<int key="NSCellFlags">67239424</int>
@@ -221,6 +230,7 @@
<int key="NSvFlags">264</int>
<string key="NSFrame">{{142, 234}, {51, 22}}</string>
<reference key="NSSuperview" ref="1009504981"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="804360187">
<int key="NSCellFlags">-1804468671</int>
@@ -238,6 +248,7 @@
<int key="NSvFlags">264</int>
<string key="NSFrame">{{103, 236}, {34, 17}}</string>
<reference key="NSSuperview" ref="1009504981"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="216280374">
<int key="NSCellFlags">67239424</int>
@@ -264,6 +275,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{15, 155}, {413, 17}}</string>
<reference key="NSSuperview" ref="286604416"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="134581010">
<int key="NSCellFlags">68288064</int>
@@ -317,6 +329,7 @@
</object>
<string key="NSFrameSize">{394, 14}</string>
<reference key="NSSuperview" ref="803964717"/>
+ <reference key="NSWindow"/>
<object class="NSTextContainer" key="NSTextContainer" id="744512206">
<object class="NSLayoutManager" key="NSLayoutManager">
<object class="NSTextStorage" key="NSTextStorage">
@@ -391,6 +404,7 @@
</object>
<string key="NSFrame">{{1, 1}, {394, 131}}</string>
<reference key="NSSuperview" ref="780595407"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="541098350"/>
<reference key="NSDocView" ref="541098350"/>
<reference key="NSBGColor" ref="894616942"/>
@@ -403,8 +417,9 @@
<object class="NSScroller" id="1061286311">
<reference key="NSNextResponder" ref="780595407"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{395, 1}, {15, 131}}</string>
+ <string key="NSFrame">{{395, 1}, {15, 128}}</string>
<reference key="NSSuperview" ref="780595407"/>
+ <reference key="NSWindow"/>
<reference key="NSTarget" ref="780595407"/>
<string key="NSAction">_doScroller:</string>
<double key="NSPercent">0.98639458417892456</double>
@@ -414,6 +429,7 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {410, 15}}</string>
<reference key="NSSuperview" ref="780595407"/>
+ <reference key="NSWindow"/>
<int key="NSsFlags">1</int>
<reference key="NSTarget" ref="780595407"/>
<string key="NSAction">_doScroller:</string>
@@ -423,6 +439,7 @@
</object>
<string key="NSFrame">{{18, 14}, {411, 133}}</string>
<reference key="NSSuperview" ref="286604416"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="803964717"/>
<int key="NSsFlags">18</int>
<reference key="NSVScroller" ref="1061286311"/>
@@ -432,10 +449,12 @@
</object>
<string key="NSFrame">{{1, 1}, {443, 182}}</string>
<reference key="NSSuperview" ref="1028817739"/>
+ <reference key="NSWindow"/>
</object>
</object>
<string key="NSFrame">{{-2, -4}, {445, 198}}</string>
<reference key="NSSuperview" ref="1009504981"/>
+ <reference key="NSWindow"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
<int key="NSCellFlags">67239424</int>
@@ -459,6 +478,7 @@
<int key="NSvFlags">264</int>
<string key="NSFrame">{{-2, 209}, {140, 17}}</string>
<reference key="NSSuperview" ref="1009504981"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="176896244">
<int key="NSCellFlags">67239424</int>
@@ -475,6 +495,7 @@
<int key="NSvFlags">264</int>
<string key="NSFrame">{{139, 202}, {206, 26}}</string>
<reference key="NSSuperview" ref="1009504981"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="1058889114">
<int key="NSCellFlags">-2076049856</int>
@@ -532,11 +553,13 @@
</object>
</object>
<string key="NSFrameSize">{440, 258}</string>
+ <reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
<string key="NSClassName">NSView</string>
<string key="NSExtension">NSResponder</string>
</object>
<object class="NSCustomView" id="811413074">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder"/>
<int key="NSvFlags">268</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -545,6 +568,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{153, 37}, {205, 22}}</string>
<reference key="NSSuperview" ref="811413074"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="625233307">
<int key="NSCellFlags">-1804468671</int>
@@ -562,6 +586,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{56, 40}, {92, 17}}</string>
<reference key="NSSuperview" ref="811413074"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="617855618">
<int key="NSCellFlags">68288064</int>
@@ -578,6 +603,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{153, 5}, {205, 22}}</string>
<reference key="NSSuperview" ref="811413074"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="164438733">
<int key="NSCellFlags">-1804468671</int>
@@ -595,6 +621,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{0, 9}, {148, 17}}</string>
<reference key="NSSuperview" ref="811413074"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="662082936">
<int key="NSCellFlags">68288064</int>
@@ -608,6 +635,8 @@
</object>
</object>
<string key="NSFrameSize">{363, 62}</string>
+ <reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
<string key="NSClassName">NSView</string>
</object>
<object class="NSUserDefaultsController" id="197631831">
@@ -1315,6 +1344,13 @@
<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>
<object class="NSMutableDictionary" key="outlets">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
@@ -1368,6 +1404,125 @@
<string>NSView</string>
</object>
</object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>checkBox_checkMail</string>
+ <string>checkBox_sendTyping</string>
+ <string>label_alias</string>
+ <string>label_encryption</string>
+ <string>label_password</string>
+ <string>label_port</string>
+ <string>label_server</string>
+ <string>label_typing</string>
+ <string>popUp_encryption</string>
+ <string>progressIndicator_registering</string>
+ <string>textField_accountUID</string>
+ <string>textField_accountUIDLabel</string>
+ <string>textField_alias</string>
+ <string>textField_connectHost</string>
+ <string>textField_connectPort</string>
+ <string>textField_password</string>
+ <string>textField_registering</string>
+ <string>view_auxiliaryTabView</string>
+ <string>view_options</string>
+ <string>view_privacy</string>
+ <string>view_profile</string>
+ <string>view_setup</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBToOneOutletInfo">
+ <string key="name">checkBox_checkMail</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">checkBox_sendTyping</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">label_alias</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">label_encryption</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">label_password</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">label_port</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">label_server</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">label_typing</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">popUp_encryption</string>
+ <string key="candidateClassName">NSPopUpButton</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">progressIndicator_registering</string>
+ <string key="candidateClassName">NSProgressIndicator</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">textField_accountUID</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">textField_accountUIDLabel</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">textField_alias</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">textField_connectHost</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">textField_connectPort</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">textField_password</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">textField_registering</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">view_auxiliaryTabView</string>
+ <string key="candidateClassName">NSTabView</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">view_options</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">view_privacy</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">view_profile</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">view_setup</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ </object>
+ </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
<string key="minorKey"/>
@@ -1397,6 +1552,45 @@
<string>NSTextField</string>
</object>
</object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>checkbox_useSSL</string>
+ <string>popUp_encoding</string>
+ <string>textField_realname</string>
+ <string>textField_username</string>
+ <string>textView_commands</string>
+ <string>textfield_Nick</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBToOneOutletInfo">
+ <string key="name">checkbox_useSSL</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">popUp_encoding</string>
+ <string key="candidateClassName">NSPopUpButton</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">textField_realname</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">textField_username</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">textView_commands</string>
+ <string key="candidateClassName">NSTextView</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">textfield_Nick</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ </object>
+ </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
<string key="minorKey"/>
@@ -1455,6 +1649,40 @@
<string>RBSplitView</string>
</object>
</object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>adiumPrint:</string>
+ <string>didAdjustSubviews:</string>
+ <string>prefsWindowWillClose:</string>
+ <string>toggleFindPanel:</string>
+ <string>willAdjustSubviews:</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBActionInfo">
+ <string key="name">adiumPrint:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">didAdjustSubviews:</string>
+ <string key="candidateClassName">RBSplitView</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">prefsWindowWillClose:</string>
+ <string key="candidateClassName">SS_PrefsController</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">toggleFindPanel:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">willAdjustSubviews:</string>
+ <string key="candidateClassName">RBSplitView</string>
+ </object>
+ </object>
+ </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
<string key="minorKey"/>
@@ -1475,6 +1703,13 @@
<string key="NS.key.0">checkBox_broadcastMusic</string>
<string key="NS.object.0">NSButton</string>
</object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <string key="NS.key.0">checkBox_broadcastMusic</string>
+ <object class="IBToOneOutletInfo" key="NS.object.0">
+ <string key="name">checkBox_broadcastMusic</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
+ </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
<string key="minorKey"/>
@@ -1495,6 +1730,13 @@
<string key="NS.key.0">delegate</string>
<string key="NS.object.0">id</string>
</object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <string key="NS.key.0">delegate</string>
+ <object class="IBToOneOutletInfo" key="NS.object.0">
+ <string key="name">delegate</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
<string key="minorKey"/>
@@ -1507,6 +1749,13 @@
<string key="NS.key.0">delegate</string>
<string key="NS.object.0">id</string>
</object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <string key="NS.key.0">delegate</string>
+ <object class="IBToOneOutletInfo" key="NS.object.0">
+ <string key="name">delegate</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
<string key="minorKey"/>
@@ -1515,6 +1764,7 @@
</object>
</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>
<integer value="1050" key="NS.object.0"/>
@@ -1526,5 +1776,20 @@
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<string key="IBDocument.LastKnownRelativeProjectPath">../../Adium.xcodeproj</string>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
+ <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>NSMenuCheckmark</string>
+ <string>NSMenuMixedState</string>
+ <string>NSSwitch</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>{9, 8}</string>
+ <string>{7, 2}</string>
+ <string>{15, 15}</string>
+ </object>
+ </object>
</data>
</archive>
diff -r a19c59750f20 -r 5b69a19e671c Plugins/Purple Service/sv.lproj/ESIRCAccountView.nib/keyedobjects.nib
Binary file Plugins/Purple Service/sv.lproj/ESIRCAccountView.nib/keyedobjects.nib has changed
diff -r a19c59750f20 -r 5b69a19e671c Plugins/Purple Service/sv.lproj/ESPurpleAIMAccountView.nib/designable.nib
--- a/Plugins/Purple Service/sv.lproj/ESPurpleAIMAccountView.nib/designable.nib Fri Oct 22 23:25:33 2010 +0200
+++ b/Plugins/Purple Service/sv.lproj/ESPurpleAIMAccountView.nib/designable.nib Fri Oct 22 23:50:54 2010 +0200
@@ -2,13 +2,13 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">10C540</string>
- <string key="IBDocument.InterfaceBuilderVersion">740</string>
- <string key="IBDocument.AppKitVersion">1038.25</string>
- <string key="IBDocument.HIToolboxVersion">458.00</string>
+ <string key="IBDocument.SystemVersion">10F569</string>
+ <string key="IBDocument.InterfaceBuilderVersion">788</string>
+ <string key="IBDocument.AppKitVersion">1038.29</string>
+ <string key="IBDocument.HIToolboxVersion">461.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">740</string>
+ <string key="NS.object.0">788</string>
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -117,7 +117,7 @@
<object class="NSTextFieldCell" key="NSCell" id="1000030253">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">71303168</int>
- <string key="NSContents">Profile:</string>
+ <string key="NSContents">Profil:</string>
<reference key="NSSupport" ref="173235699"/>
<reference key="NSControlView" ref="131345187"/>
<reference key="NSBackgroundColor" ref="200881509"/>
@@ -158,6 +158,7 @@
<string>NeXT font pasteboard type</string>
<string>NeXT ruler pasteboard type</string>
<string>WebURLsWithTitlesPboardType</string>
+ <string>public.url</string>
</object>
</object>
<string key="NSFrameSize">{284, 14}</string>
@@ -300,7 +301,7 @@
<object class="NSButtonCell" key="NSCell" id="703293083">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int>
- <string key="NSContents">Check for new mail</string>
+ <string key="NSContents">Kolla efter ny mail</string>
<reference key="NSSupport" ref="173235699"/>
<reference key="NSControlView" ref="614128106"/>
<int key="NSButtonFlags">1211912703</int>
@@ -327,7 +328,7 @@
<object class="NSButtonCell" key="NSCell" id="15548423">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int>
- <string key="NSContents">Always use proxy for file transfers and Direct IM</string>
+ <string key="NSContents">Använd alltid proxy för filöverföringar</string>
<reference key="NSSupport" ref="173235699"/>
<reference key="NSControlView" ref="535235915"/>
<int key="NSButtonFlags">1211912703</int>
@@ -349,7 +350,7 @@
<object class="NSButtonCell" key="NSCell" id="712579196">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int>
- <string key="NSContents">Encrypt connection using SSL</string>
+ <string key="NSContents">Kryptera med SSL</string>
<reference key="NSSupport" ref="173235699"/>
<reference key="NSControlView" ref="19936504"/>
<int key="NSButtonFlags">1211912703</int>
@@ -371,7 +372,7 @@
<object class="NSTextFieldCell" key="NSCell" id="726463406">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">71303168</int>
- <string key="NSContents">Login Server:</string>
+ <string key="NSContents">Server:</string>
<reference key="NSSupport" ref="173235699"/>
<reference key="NSControlView" ref="232380611"/>
<reference key="NSBackgroundColor" ref="200881509"/>
@@ -437,7 +438,7 @@
<object class="NSTextFieldCell" key="NSCell" id="702605030">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">71303168</int>
- <string key="NSContents">Email:</string>
+ <string key="NSContents">Mail:</string>
<reference key="NSSupport" ref="173235699"/>
<reference key="NSControlView" ref="302721372"/>
<reference key="NSBackgroundColor" ref="200881509"/>
@@ -469,7 +470,7 @@
<object class="NSTextFieldCell" key="NSCell" id="463562115">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">71303168</int>
- <string key="NSContents">Security:</string>
+ <string key="NSContents">Säkerhet:</string>
<reference key="NSSupport" ref="173235699"/>
<reference key="NSControlView" ref="79217650"/>
<reference key="NSBackgroundColor" ref="200881509"/>
@@ -891,6 +892,7 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<string>-3.IBPluginDependency</string>
<string>-3.ImportedFromIB2</string>
+ <string>121.IBEditorWindowLastContentRect</string>
<string>121.IBPluginDependency</string>
<string>121.ImportedFromIB2</string>
<string>122.IBPluginDependency</string>
@@ -905,6 +907,7 @@
<string>126.CustomClassName</string>
<string>126.IBPluginDependency</string>
<string>126.ImportedFromIB2</string>
+ <string>130.IBEditorWindowLastContentRect</string>
<string>130.IBPluginDependency</string>
<string>130.ImportedFromIB2</string>
<string>154.IBPluginDependency</string>
@@ -949,6 +952,7 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
+ <string>{{525, 292}, {340, 147}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -963,6 +967,7 @@
<string>AIAutoScrollView</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
+ <string>{{546, 362}, {460, 54}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1032,6 +1037,13 @@
<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>
<object class="NSMutableDictionary" key="outlets">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
@@ -1085,6 +1097,125 @@
<string>NSView</string>
</object>
</object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>checkBox_checkMail</string>
+ <string>checkBox_sendTyping</string>
+ <string>label_alias</string>
+ <string>label_encryption</string>
+ <string>label_password</string>
+ <string>label_port</string>
+ <string>label_server</string>
+ <string>label_typing</string>
+ <string>popUp_encryption</string>
+ <string>progressIndicator_registering</string>
+ <string>textField_accountUID</string>
+ <string>textField_accountUIDLabel</string>
+ <string>textField_alias</string>
+ <string>textField_connectHost</string>
+ <string>textField_connectPort</string>
+ <string>textField_password</string>
+ <string>textField_registering</string>
+ <string>view_auxiliaryTabView</string>
+ <string>view_options</string>
+ <string>view_privacy</string>
+ <string>view_profile</string>
+ <string>view_setup</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBToOneOutletInfo">
+ <string key="name">checkBox_checkMail</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">checkBox_sendTyping</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">label_alias</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">label_encryption</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">label_password</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">label_port</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">label_server</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">label_typing</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">popUp_encryption</string>
+ <string key="candidateClassName">NSPopUpButton</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">progressIndicator_registering</string>
+ <string key="candidateClassName">NSProgressIndicator</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">textField_accountUID</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">textField_accountUIDLabel</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">textField_alias</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">textField_connectHost</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">textField_connectPort</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">textField_password</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">textField_registering</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">view_auxiliaryTabView</string>
+ <string key="candidateClassName">NSTabView</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">view_options</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">view_privacy</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">view_profile</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">view_setup</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ </object>
+ </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
<string key="minorKey"/>
@@ -1116,6 +1247,30 @@
<string>id</string>
</object>
</object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>pasteAsRichText:</string>
+ <string>scrollPageDown:</string>
+ <string>scrollPageUp:</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBActionInfo">
+ <string key="name">pasteAsRichText:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">scrollPageDown:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">scrollPageUp:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
+ </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
<string key="minorKey"/>
@@ -1139,6 +1294,30 @@
<string>NSTextView</string>
</object>
</object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>checkBox_SSL</string>
+ <string>checkBox_proxyServer</string>
+ <string>textView_textProfile</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBToOneOutletInfo">
+ <string key="name">checkBox_SSL</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">checkBox_proxyServer</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">textView_textProfile</string>
+ <string key="candidateClassName">NSTextView</string>
+ </object>
+ </object>
+ </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
<string key="minorKey"/>
@@ -1160,6 +1339,25 @@
<string>NSButton</string>
</object>
</object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>checkBox_SSL</string>
+ <string>checkBox_proxyServer</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBToOneOutletInfo">
+ <string key="name">checkBox_SSL</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">checkBox_proxyServer</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
+ </object>
+ </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
<string key="minorKey"/>
@@ -1172,10 +1370,24 @@
<string key="NS.key.0">sendContent:</string>
<string key="NS.object.0">id</string>
</object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <string key="NS.key.0">sendContent:</string>
+ <object class="IBActionInfo" key="NS.object.0">
+ <string key="name">sendContent:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
<object class="NSMutableDictionary" key="outlets">
<string key="NS.key.0">target</string>
<string key="NS.object.0">id</string>
</object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <string key="NS.key.0">target</string>
+ <object class="IBToOneOutletInfo" key="NS.object.0">
More information about the commits
mailing list