adium/adium

Merged with rob.
adium-1.5.7
2013-06-26, Thijs Alkemade
f2a250f6801f
Merged with rob.
--- a/ChangeLogs/Changes.txt Tue Jun 25 22:55:21 2013 +0200
+++ b/ChangeLogs/Changes.txt Wed Jun 26 12:10:09 2013 +0200
@@ -1,7 +1,7 @@
Adium Version History
-----------------------
Version 1.5.7 (XX/06/2013)
- * Updated Twitter support.
+ * Updated Twitter support. (#16118)
* Retweets (RTs) now properly display the original author.
* t.co links are now expanded.
* Fixed parsing to conform to the standard. (#13947)
--- a/Plugins/Purple Service/Resources/de.lproj/DCPurpleOscarJoinChatView.nib/designable.nib Tue Jun 25 22:55:21 2013 +0200
+++ b/Plugins/Purple Service/Resources/de.lproj/DCPurpleOscarJoinChatView.nib/designable.nib Wed Jun 26 12:10:09 2013 +0200
@@ -2,19 +2,27 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1060</int>
- <string key="IBDocument.SystemVersion">10C540</string>
- <string key="IBDocument.InterfaceBuilderVersion">732</string>
- <string key="IBDocument.AppKitVersion">1038.25</string>
- <string key="IBDocument.HIToolboxVersion">458.00</string>
+ <string key="IBDocument.SystemVersion">12E55</string>
+ <string key="IBDocument.InterfaceBuilderVersion">3084</string>
+ <string key="IBDocument.AppKitVersion">1187.39</string>
+ <string key="IBDocument.HIToolboxVersion">626.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">732</string>
+ <string key="NS.object.0">3084</string>
</object>
- <array class="NSMutableArray" key="IBDocument.EditedObjectIDs"/>
+ <array key="IBDocument.IntegratedClassDependencies">
+ <string>NSCustomObject</string>
+ <string>NSCustomView</string>
+ <string>NSTextField</string>
+ <string>NSTextFieldCell</string>
+ </array>
<array key="IBDocument.PluginDependencies">
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</array>
- <dictionary class="NSMutableDictionary" key="IBDocument.Metadata"/>
+ <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="569056028">
<object class="NSCustomObject" id="287410117">
<string key="NSClassName">DCGaimOscarJoinChatViewController</string>
@@ -26,7 +34,7 @@
<string key="NSClassName">NSApplication</string>
</object>
<object class="NSCustomView" id="182268720">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="NSTextField" id="620775494">
@@ -34,9 +42,11 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{3, 159}, {120, 17}}</string>
<reference key="NSSuperview" ref="182268720"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="940384985"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="805550331">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">71303168</int>
<string key="NSContents">Raumname:</string>
<object class="NSFont" key="NSSupport" id="126615713">
@@ -51,7 +61,7 @@
<string key="NSColorName">controlColor</string>
<object class="NSColor" key="NSColor">
<int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC42NjY2NjY2ODY1AA</bytes>
+ <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
</object>
</object>
<object class="NSColor" key="NSTextColor" id="832652762">
@@ -64,15 +74,18 @@
</object>
</object>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSTextField" id="940384985">
<reference key="NSNextResponder" ref="182268720"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{128, 157}, {260, 22}}</string>
<reference key="NSSuperview" ref="182268720"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="292454633"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="276124686">
- <int key="NSCellFlags">-1804468671</int>
+ <int key="NSCellFlags">-1804599231</int>
<int key="NSCellFlags2">4195328</int>
<string key="NSContents"/>
<reference key="NSSupport" ref="126615713"/>
@@ -94,15 +107,18 @@
<reference key="NSColor" ref="81738168"/>
</object>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSTextField" id="315379224">
<reference key="NSNextResponder" ref="182268720"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{128, 7}, {266, 60}}</string>
+ <string key="NSFrame">{{128, 7}, {260, 60}}</string>
<reference key="NSSuperview" ref="182268720"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="779724215">
- <int key="NSCellFlags">-1805517311</int>
+ <int key="NSCellFlags">-1805647871</int>
<int key="NSCellFlags2">4194304</int>
<string key="NSContents"/>
<reference key="NSSupport" ref="126615713"/>
@@ -111,15 +127,18 @@
<reference key="NSBackgroundColor" ref="1026871779"/>
<reference key="NSTextColor" ref="1034272336"/>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSTextField" id="174160911">
<reference key="NSNextResponder" ref="182268720"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{3, 52}, {120, 17}}</string>
<reference key="NSSuperview" ref="182268720"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="315379224"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="967939657">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">71303168</int>
<string key="NSContents">Einladungstext:</string>
<reference key="NSSupport" ref="126615713"/>
@@ -127,15 +146,18 @@
<reference key="NSBackgroundColor" ref="814817248"/>
<reference key="NSTextColor" ref="832652762"/>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSTextField" id="292454633">
<reference key="NSNextResponder" ref="182268720"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{-3, 132}, {126, 17}}</string>
<reference key="NSSuperview" ref="182268720"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="772198094"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="1057754600">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">71303168</int>
<string key="NSContents">Kontakte einladen:</string>
<reference key="NSSupport" ref="126615713"/>
@@ -143,15 +165,18 @@
<reference key="NSBackgroundColor" ref="814817248"/>
<reference key="NSTextColor" ref="832652762"/>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSTextField" id="772198094">
<reference key="NSNextResponder" ref="182268720"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{128, 89}, {260, 60}}</string>
<reference key="NSSuperview" ref="182268720"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="1010169207"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="507227297">
- <int key="NSCellFlags">-1805517311</int>
+ <int key="NSCellFlags">-1805647871</int>
<int key="NSCellFlags2">4194304</int>
<string key="NSContents"/>
<reference key="NSSupport" ref="126615713"/>
@@ -160,15 +185,18 @@
<reference key="NSBackgroundColor" ref="1026871779"/>
<reference key="NSTextColor" ref="1034272336"/>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSTextField" id="1010169207">
<reference key="NSNextResponder" ref="182268720"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{125, 75}, {224, 14}}</string>
<reference key="NSSuperview" ref="182268720"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="174160911"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="216031121">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">4194304</int>
<string key="NSContents">Kontaktnamen durch Kommas trennen.</string>
<object class="NSFont" key="NSSupport">
@@ -180,9 +208,13 @@
<reference key="NSBackgroundColor" ref="814817248"/>
<reference key="NSTextColor" ref="832652762"/>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
</array>
<string key="NSFrameSize">{395, 180}</string>
+ <reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="620775494"/>
<object class="NSMutableString" key="NSClassName">
<characters key="NS.bytes">NSView</characters>
</object>
@@ -209,14 +241,6 @@
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">nextKeyView</string>
- <reference key="source" ref="182268720"/>
- <reference key="destination" ref="940384985"/>
- </object>
- <int key="connectionID">34</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
<string key="label">textField_inviteMessage</string>
<reference key="source" ref="287410117"/>
<reference key="destination" ref="315379224"/>
@@ -234,6 +258,14 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">nextKeyView</string>
+ <reference key="source" ref="182268720"/>
+ <reference key="destination" ref="940384985"/>
+ </object>
+ <int key="connectionID">34</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">nextKeyView</string>
<reference key="source" ref="940384985"/>
<reference key="destination" ref="772198094"/>
</object>
@@ -241,11 +273,11 @@
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">nextKeyView</string>
- <reference key="source" ref="772198094"/>
- <reference key="destination" ref="315379224"/>
+ <string key="label">delegate</string>
+ <reference key="source" ref="940384985"/>
+ <reference key="destination" ref="287410117"/>
</object>
- <int key="connectionID">55</int>
+ <int key="connectionID">57</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
@@ -257,11 +289,11 @@
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">delegate</string>
- <reference key="source" ref="940384985"/>
- <reference key="destination" ref="287410117"/>
+ <string key="label">nextKeyView</string>
+ <reference key="source" ref="772198094"/>
+ <reference key="destination" ref="315379224"/>
</object>
- <int key="connectionID">57</int>
+ <int key="connectionID">55</int>
</object>
</array>
<object class="IBMutableOrderedSet" key="objectRecords">
@@ -399,24 +431,18 @@
</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="27.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES" key="27.ImportedFromIB2"/>
<string key="28.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES" key="28.ImportedFromIB2"/>
<string key="29.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES" key="29.ImportedFromIB2"/>
<string key="35.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES" key="35.ImportedFromIB2"/>
<string key="36.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES" key="36.ImportedFromIB2"/>
<string key="41.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES" key="41.ImportedFromIB2"/>
<string key="48.CustomClassName">AICompletingTextField</string>
<string key="48.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES" key="48.ImportedFromIB2"/>
<string key="49.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES" key="49.ImportedFromIB2"/>
<string key="59.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="60.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="61.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -437,8 +463,8 @@
<string key="className">AICompletingTextField</string>
<string key="superclassName">AITextFieldWithDraggingDelegate</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBUserSource</string>
- <string key="minorKey"/>
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/AICompletingTextField.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
@@ -448,9 +474,16 @@
<string key="NS.key.0">dragDelegate</string>
<string key="NS.object.0">id</string>
</object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <string key="NS.key.0">dragDelegate</string>
+ <object class="IBToOneOutletInfo" key="NS.object.0">
+ <string key="name">dragDelegate</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBUserSource</string>
- <string key="minorKey"/>
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/AITextFieldWithDraggingDelegate.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
@@ -463,9 +496,31 @@
<string key="textField_inviteUsers">NSTextField</string>
<string key="textField_roomName">NSTextField</string>
</dictionary>
+ <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <object class="IBToOneOutletInfo" key="scrollView_inviteUsers">
+ <string key="name">scrollView_inviteUsers</string>
+ <string key="candidateClassName">NSScrollView</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="tableView_inviteUsers">
+ <string key="name">tableView_inviteUsers</string>
+ <string key="candidateClassName">NSTableView</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="textField_inviteMessage">
+ <string key="name">textField_inviteMessage</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="textField_inviteUsers">
+ <string key="name">textField_inviteUsers</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="textField_roomName">
+ <string key="name">textField_roomName</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ </dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBUserSource</string>
- <string key="minorKey"/>
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/DCGaimOscarJoinChatViewController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
@@ -475,33 +530,49 @@
<string key="closeWindow:">id</string>
<string key="joinChat:">id</string>
</dictionary>
+ <dictionary class="NSMutableDictionary" key="actionInfosByName">
+ <object class="IBActionInfo" key="closeWindow:">
+ <string key="name">closeWindow:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo" key="joinChat:">
+ <string key="name">joinChat:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </dictionary>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="popUp_service">NSPopUpButton</string>
<string key="view">NSView</string>
<string key="view_customView">NSView</string>
</dictionary>
+ <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <object class="IBToOneOutletInfo" key="popUp_service">
+ <string key="name">popUp_service</string>
+ <string key="candidateClassName">NSPopUpButton</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="view">
+ <string key="name">view</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="view_customView">
+ <string key="name">view_customView</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ </dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBUserSource</string>
- <string key="minorKey"/>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">FirstResponder</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBUserSource</string>
- <string key="minorKey"/>
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/DCJoinChatViewController.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>
<integer value="1060" key="NS.object.0"/>
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
- <nil key="IBDocument.LastKnownRelativeProjectPath"/>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
</data>
</archive>
Binary file Plugins/Purple Service/Resources/de.lproj/DCPurpleOscarJoinChatView.nib/keyedobjects.nib has changed