adium 5835:7fd22c49f1f7: Load account settings nibs from their b...
commits at adium.im
commits at adium.im
Tue Feb 4 01:45:18 UTC 2014
details: http://hg.adium.im/adium/rev/7fd22c49f1f7
revision: 5835:7fd22c49f1f7
branch: (none)
author: Frank Dowsett <wixardy at adium.im>
date: Mon Feb 03 20:42:03 2014 -0500
Load account settings nibs from their bundle. Fixes #16591
Subject: adium 5836:ad9cabebd5c2: Fix #16590: an over release with the server console.
details: http://hg.adium.im/adium/rev/ad9cabebd5c2
revision: 5836:ad9cabebd5c2
branch: (none)
author: Frank Dowsett <wixardy at adium.im>
date: Mon Feb 03 20:45:12 2014 -0500
Fix #16590: an over release with the server console.
diffs (446 lines):
diff -r 9dae21c7e554 -r ad9cabebd5c2 Frameworks/Adium Framework/Resources/AIConsole.xib
--- a/Frameworks/Adium Framework/Resources/AIConsole.xib Sat Feb 01 12:15:32 2014 -0500
+++ b/Frameworks/Adium Framework/Resources/AIConsole.xib Mon Feb 03 20:45:12 2014 -0500
@@ -2,13 +2,13 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1060</int>
- <string key="IBDocument.SystemVersion">12C60</string>
- <string key="IBDocument.InterfaceBuilderVersion">3084</string>
- <string key="IBDocument.AppKitVersion">1187.34</string>
- <string key="IBDocument.HIToolboxVersion">625.00</string>
+ <string key="IBDocument.SystemVersion">13C44</string>
+ <string key="IBDocument.InterfaceBuilderVersion">4514</string>
+ <string key="IBDocument.AppKitVersion">1265.16</string>
+ <string key="IBDocument.HIToolboxVersion">697.40</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">3084</string>
+ <string key="NS.object.0">4514</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
<string>NSButton</string>
@@ -42,7 +42,7 @@
<int key="NSWindowStyleMask">15</int>
<int key="NSWindowBacking">2</int>
<string key="NSWindowRect">{{410, 362}, {480, 493}}</string>
- <int key="NSWTFlags">813170688</int>
+ <int key="NSWTFlags">1886912512</int>
<string key="NSWindowTitle">Console</string>
<object class="NSMutableString" key="NSWindowClass">
<characters key="NS.bytes">NSWindow</characters>
@@ -66,7 +66,7 @@
<array class="NSMutableArray" key="NSSubviews">
<object class="NSClipView" id="881950399">
<reference key="NSNextResponder" ref="853672382"/>
- <int key="NSvFlags">2304</int>
+ <int key="NSvFlags">2322</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="NSTextView" id="908079478">
<reference key="NSNextResponder" ref="881950399"/>
@@ -93,7 +93,7 @@
<int key="NSTCFlags">1</int>
</object>
<object class="NSTextViewSharedData" key="NSSharedData">
- <int key="NSFlags">100674405</int>
+ <int key="NSFlags">67119973</int>
<int key="NSTextCheckingTypes">0</int>
<nil key="NSMarkedAttributes"/>
<object class="NSColor" key="NSBackgroundColor" id="69092154">
@@ -196,6 +196,7 @@
<string key="NSFrameSize">{480, 272}</string>
<reference key="NSSuperview" ref="612597043"/>
<reference key="NSNextKeyView" ref="881950399"/>
+ <bool key="NSDoNotTranslateAutoresizingMask">YES</bool>
<int key="NSsFlags">133650</int>
<reference key="NSVScroller" ref="902638766"/>
<reference key="NSHScroller" ref="356569521"/>
@@ -210,30 +211,11 @@
<array class="NSMutableArray" key="NSSubviews">
<object class="NSClipView" id="782526794">
<reference key="NSNextResponder" ref="916643931"/>
- <int key="NSvFlags">2304</int>
+ <int key="NSvFlags">2322</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="NSTextView" id="434298692">
<reference key="NSNextResponder" ref="782526794"/>
<int key="NSvFlags">2322</int>
- <set class="NSMutableSet" key="NSDragTypes">
- <string>Apple HTML pasteboard type</string>
- <string>Apple PDF pasteboard type</string>
- <string>Apple PICT pasteboard type</string>
- <string>Apple PNG pasteboard type</string>
- <string>Apple URL pasteboard type</string>
- <string>CorePasteboardFlavorType 0x6D6F6F76</string>
- <string>NSColor pasteboard type</string>
- <string>NSFilenamesPboardType</string>
- <string>NSStringPboardType</string>
- <string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
- <string>NeXT RTFD pasteboard type</string>
- <string>NeXT Rich Text Format v1.0 pasteboard type</string>
- <string>NeXT TIFF v4.0 pasteboard type</string>
- <string>NeXT font pasteboard type</string>
- <string>NeXT ruler pasteboard type</string>
- <string>WebURLsWithTitlesPboardType</string>
- <string>public.url</string>
- </set>
<string key="NSFrameSize">{478, 151}</string>
<reference key="NSSuperview" ref="782526794"/>
<reference key="NSNextKeyView" ref="36889973"/>
@@ -256,7 +238,7 @@
<int key="NSTCFlags">1</int>
</object>
<object class="NSTextViewSharedData" key="NSSharedData">
- <int key="NSFlags">100674403</int>
+ <int key="NSFlags">67119971</int>
<int key="NSTextCheckingTypes">0</int>
<nil key="NSMarkedAttributes"/>
<reference key="NSBackgroundColor" ref="69092154"/>
@@ -314,6 +296,7 @@
<string key="NSFrame">{{0, 281}, {480, 153}}</string>
<reference key="NSSuperview" ref="612597043"/>
<reference key="NSNextKeyView" ref="782526794"/>
+ <bool key="NSDoNotTranslateAutoresizingMask">YES</bool>
<int key="NSsFlags">133650</int>
<reference key="NSVScroller" ref="551701729"/>
<reference key="NSHScroller" ref="36889973"/>
@@ -338,7 +321,7 @@
<int key="NSCellFlags2">134217728</int>
<string key="NSContents">Send</string>
<object class="NSFont" key="NSSupport" id="666231752">
- <string key="NSName">LucidaGrande</string>
+ <string key="NSName">.LucidaGrandeUI</string>
<double key="NSSize">13</double>
<int key="NSfFlags">1044</int>
</object>
@@ -382,7 +365,7 @@
<string key="NSFrameSize">{480, 493}</string>
<reference key="NSNextKeyView" ref="612597043"/>
</object>
- <string key="NSScreenRect">{{0, 0}, {1920, 1080}}</string>
+ <string key="NSScreenRect">{{0, 0}, {1920, 1058}}</string>
<string key="NSMinSize">{213, 129}</string>
<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
<string key="NSFrameAutosaveName">consolewindow</string>
@@ -390,6 +373,7 @@
</object>
</array>
<object class="IBObjectContainer" key="IBDocument.Objects">
+ <bool key="usesAutoincrementingIDs">NO</bool>
<array class="NSMutableArray" key="connectionRecords">
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
@@ -397,7 +381,7 @@
<reference key="source" ref="17063629"/>
<reference key="destination" ref="113854476"/>
</object>
- <int key="connectionID">30</int>
+ <string key="id">30</string>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
@@ -405,7 +389,7 @@
<reference key="source" ref="17063629"/>
<reference key="destination" ref="809565161"/>
</object>
- <int key="connectionID">31</int>
+ <string key="id">31</string>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
@@ -413,7 +397,15 @@
<reference key="source" ref="17063629"/>
<reference key="destination" ref="453859001"/>
</object>
- <int key="connectionID">32</int>
+ <string key="id">32</string>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">logView</string>
+ <reference key="source" ref="17063629"/>
+ <reference key="destination" ref="908079478"/>
+ </object>
+ <string key="id">34</string>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
@@ -421,15 +413,7 @@
<reference key="source" ref="17063629"/>
<reference key="destination" ref="434298692"/>
</object>
- <int key="connectionID">33</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">logView</string>
- <reference key="source" ref="17063629"/>
- <reference key="destination" ref="908079478"/>
- </object>
- <int key="connectionID">34</int>
+ <string key="id">33</string>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
@@ -437,31 +421,31 @@
<reference key="source" ref="453859001"/>
<reference key="destination" ref="17063629"/>
</object>
- <int key="connectionID">14</int>
+ <string key="id">14</string>
</object>
</array>
<object class="IBMutableOrderedSet" key="objectRecords">
<array key="orderedObjects">
<object class="IBObjectRecord">
- <int key="objectID">0</int>
+ <string key="id">0</string>
<array key="object" id="0"/>
<reference key="children" ref="52542789"/>
<nil key="parent"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">-2</int>
+ <string key="id">-2</string>
<reference key="object" ref="17063629"/>
<reference key="parent" ref="0"/>
<string key="objectName">File's Owner</string>
</object>
<object class="IBObjectRecord">
- <int key="objectID">-1</int>
+ <string key="id">-1</string>
<reference key="object" ref="1058410493"/>
<reference key="parent" ref="0"/>
<string key="objectName">First Responder</string>
</object>
<object class="IBObjectRecord">
- <int key="objectID">5</int>
+ <string key="id">5</string>
<reference key="object" ref="453859001"/>
<array class="NSMutableArray" key="children">
<reference ref="567992763"/>
@@ -470,7 +454,7 @@
<string key="objectName">Window</string>
</object>
<object class="IBObjectRecord">
- <int key="objectID">6</int>
+ <string key="id">6</string>
<reference key="object" ref="567992763"/>
<array class="NSMutableArray" key="children">
<reference ref="612597043"/>
@@ -480,7 +464,7 @@
<reference key="parent" ref="453859001"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">11</int>
+ <string key="id">11</string>
<reference key="object" ref="612597043"/>
<array class="NSMutableArray" key="children">
<reference ref="853672382"/>
@@ -489,37 +473,27 @@
<reference key="parent" ref="567992763"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">7</int>
+ <string key="id">7</string>
<reference key="object" ref="853672382"/>
<array class="NSMutableArray" key="children">
- <reference ref="908079478"/>
<reference ref="356569521"/>
<reference ref="902638766"/>
+ <reference ref="908079478"/>
</array>
<reference key="parent" ref="612597043"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">8</int>
- <reference key="object" ref="908079478"/>
- <reference key="parent" ref="853672382"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">9</int>
+ <string key="id">9</string>
<reference key="object" ref="916643931"/>
<array class="NSMutableArray" key="children">
- <reference ref="434298692"/>
<reference ref="36889973"/>
<reference ref="551701729"/>
+ <reference ref="434298692"/>
</array>
<reference key="parent" ref="612597043"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">10</int>
- <reference key="object" ref="434298692"/>
- <reference key="parent" ref="916643931"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">12</int>
+ <string key="id">12</string>
<reference key="object" ref="113854476"/>
<array class="NSMutableArray" key="children">
<reference ref="397699485"/>
@@ -527,7 +501,7 @@
<reference key="parent" ref="567992763"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">13</int>
+ <string key="id">13</string>
<reference key="object" ref="809565161"/>
<array class="NSMutableArray" key="children">
<reference ref="216395690"/>
@@ -535,41 +509,51 @@
<reference key="parent" ref="567992763"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">24</int>
+ <string key="id">24</string>
<reference key="object" ref="397699485"/>
<reference key="parent" ref="113854476"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">25</int>
+ <string key="id">25</string>
<reference key="object" ref="216395690"/>
<reference key="parent" ref="809565161"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">26</int>
+ <string key="id">26</string>
<reference key="object" ref="356569521"/>
<reference key="parent" ref="853672382"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">27</int>
+ <string key="id">27</string>
<reference key="object" ref="902638766"/>
<reference key="parent" ref="853672382"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">28</int>
+ <string key="id">28</string>
<reference key="object" ref="36889973"/>
<reference key="parent" ref="916643931"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">29</int>
+ <string key="id">29</string>
<reference key="object" ref="551701729"/>
<reference key="parent" ref="916643931"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">-3</int>
+ <string key="id">-3</string>
<reference key="object" ref="112054183"/>
<reference key="parent" ref="0"/>
<string key="objectName">Application</string>
</object>
+ <object class="IBObjectRecord">
+ <string key="id">8</string>
+ <reference key="object" ref="908079478"/>
+ <reference key="parent" ref="853672382"/>
+ </object>
+ <object class="IBObjectRecord">
+ <string key="id">10</string>
+ <reference key="object" ref="434298692"/>
+ <reference key="parent" ref="916643931"/>
+ </object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -597,79 +581,22 @@
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
- <int key="maxID">34</int>
</object>
- <object class="IBClassDescriber" key="IBDocument.Classes">
- <array class="NSMutableArray" key="referencedPartialClassDescriptions">
- <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">AIConsoleController</string>
- <string key="superclassName">NSObject</string>
- <dictionary class="NSMutableDictionary" key="actions">
- <string key="clearLog:">id</string>
- <string key="send:">id</string>
- <string key="showWindow:">id</string>
- </dictionary>
- <dictionary class="NSMutableDictionary" key="actionInfosByName">
- <object class="IBActionInfo" key="clearLog:">
- <string key="name">clearLog:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo" key="send:">
- <string key="name">send:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo" key="showWindow:">
- <string key="name">showWindow:</string>
- <string key="candidateClassName">id</string>
- </object>
- </dictionary>
- <dictionary class="NSMutableDictionary" key="outlets">
- <string key="consoleWindow">NSWindow</string>
- <string key="injectView">NSTextView</string>
- <string key="logView">NSTextView</string>
- </dictionary>
- <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
- <object class="IBToOneOutletInfo" key="consoleWindow">
- <string key="name">consoleWindow</string>
- <string key="candidateClassName">NSWindow</string>
- </object>
- <object class="IBToOneOutletInfo" key="injectView">
- <string key="name">injectView</string>
- <string key="candidateClassName">NSTextView</string>
- </object>
- <object class="IBToOneOutletInfo" key="logView">
- <string key="name">logView</string>
- <string key="candidateClassName">NSTextView</string>
- </object>
- </dictionary>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/AIConsoleController.h</string>
- </object>
- </object>
- </array>
- </object>
+ <object class="IBClassDescriber" key="IBDocument.Classes"/>
<int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+ <bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">YES</bool>
<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"/>
+ <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"/>
+ <integer value="4600" key="NS.object.0"/>
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
diff -r 9dae21c7e554 -r ad9cabebd5c2 Frameworks/Adium Framework/Source/AIAccountViewController.m
--- a/Frameworks/Adium Framework/Source/AIAccountViewController.m Sat Feb 01 12:15:32 2014 -0500
+++ b/Frameworks/Adium Framework/Source/AIAccountViewController.m Mon Feb 03 20:45:12 2014 -0500
@@ -68,7 +68,7 @@
//Load custom views for our subclass (If our subclass specifies a nib name)
if ([self nibName]) {
- [[NSBundle mainBundle] loadNibNamed:[self nibName] owner:self topLevelObjects:nil];
+ [[NSBundle bundleForClass:[self class]] loadNibNamed:[self nibName] owner:self topLevelObjects:nil];
}
//Load our default views if necessary
More information about the commits
mailing list