adium 5731:191753cd13a4: Set a maximum size for the FB auth wind...
commits at adium.im
commits at adium.im
Sun Oct 27 01:27:29 UTC 2013
details: http://hg.adium.im/adium/rev/191753cd13a4
revision: 5731:191753cd13a4
branch: adium-1.5.9
author: Frank Dowsett <wixardy at adium.im>
date: Sat Oct 26 14:51:39 2013 -0400
Set a maximum size for the FB auth window and centre it on screen.
Subject: adium 5732:2273fd749cbd: -compositeToPoint is deprecated, change to -drawAtPoint. There are still some in PSMTabs that are being warned about.
details: http://hg.adium.im/adium/rev/2273fd749cbd
revision: 5732:2273fd749cbd
branch: adium-1.5.9
author: Frank Dowsett <wixardy at adium.im>
date: Sun Aug 19 20:40:30 2012 -0400
-compositeToPoint is deprecated, change to -drawAtPoint. There are still some in PSMTabs that are being warned about.
(transplanted from 787b93a32710483a38e57254b4856fa2f5854921)
Subject: adium 5733:2685998bec22: Update the Twitter library credit.
details: http://hg.adium.im/adium/rev/2685998bec22
revision: 5733:2685998bec22
branch: adium-1.5.9
author: Frank Dowsett <wixardy at adium.im>
date: Sat Oct 26 21:26:31 2013 -0400
Update the Twitter library credit.
diffs (433 lines):
diff -r a92f6e8ab5d9 -r 2685998bec22 Frameworks/AIUtilities Framework/Source/AIImageAdditions.m
--- a/Frameworks/AIUtilities Framework/Source/AIImageAdditions.m Fri Oct 25 19:32:17 2013 +0200
+++ b/Frameworks/AIUtilities Framework/Source/AIImageAdditions.m Sat Oct 26 21:26:31 2013 -0400
@@ -139,7 +139,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];
diff -r a92f6e8ab5d9 -r 2685998bec22 Frameworks/AIUtilities Framework/Source/AIImageDrawingAdditions.m
--- a/Frameworks/AIUtilities Framework/Source/AIImageDrawingAdditions.m Fri Oct 25 19:32:17 2013 +0200
+++ b/Frameworks/AIUtilities Framework/Source/AIImageDrawingAdditions.m Sat Oct 26 21:26:31 2013 -0400
@@ -51,7 +51,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;
}
diff -r a92f6e8ab5d9 -r 2685998bec22 Frameworks/Adium Framework/Source/ESFileTransfer.m
--- a/Frameworks/Adium Framework/Source/ESFileTransfer.m Fri Oct 25 19:32:17 2013 +0200
+++ b/Frameworks/Adium Framework/Source/ESFileTransfer.m Sat Oct 26 21:26:31 2013 -0400
@@ -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),
diff -r a92f6e8ab5d9 -r 2685998bec22 Plugins/Dual Window Interface/AIMessageWindowController.m
--- a/Plugins/Dual Window Interface/AIMessageWindowController.m Fri Oct 25 19:32:17 2013 +0200
+++ b/Plugins/Dual Window Interface/AIMessageWindowController.m Sat Oct 26 21:26:31 2013 -0400
@@ -1015,7 +1015,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
diff -r a92f6e8ab5d9 -r 2685998bec22 Plugins/Purple Service/AIFacebookXMPPOauthWebViewWindow.xib
--- a/Plugins/Purple Service/AIFacebookXMPPOauthWebViewWindow.xib Fri Oct 25 19:32:17 2013 +0200
+++ b/Plugins/Purple Service/AIFacebookXMPPOauthWebViewWindow.xib Sat Oct 26 21:26:31 2013 -0400
@@ -1,310 +1,47 @@
-<?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">11C74</string>
- <string key="IBDocument.InterfaceBuilderVersion">1938</string>
- <string key="IBDocument.AppKitVersion">1138.23</string>
- <string key="IBDocument.HIToolboxVersion">567.00</string>
- <dictionary class="NSMutableDictionary" key="IBDocument.PluginVersions">
- <string key="com.apple.InterfaceBuilder.CocoaPlugin">1938</string>
- <string key="com.apple.WebKitIBPlugin">822</string>
- </dictionary>
- <array key="IBDocument.IntegratedClassDependencies">
- <string>NSWindowTemplate</string>
- <string>NSView</string>
- <string>NSProgressIndicator</string>
- <string>NSCustomObject</string>
- <string>WebView</string>
- </array>
- <array key="IBDocument.PluginDependencies">
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.WebKitIBPlugin</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="1000">
- <object class="NSCustomObject" id="1001">
- <string key="NSClassName">AIFacebookXMPPOAuthWebViewWindowController</string>
- </object>
- <object class="NSCustomObject" id="1003">
- <string key="NSClassName">FirstResponder</string>
- </object>
- <object class="NSCustomObject" id="1004">
- <string key="NSClassName">NSApplication</string>
- </object>
- <object class="NSWindowTemplate" id="1005">
- <int key="NSWindowStyleMask">7</int>
- <int key="NSWindowBacking">2</int>
- <string key="NSWindowRect">{{196, 130}, {640, 380}}</string>
- <int key="NSWTFlags">544735232</int>
- <string key="NSWindowTitle">Facebook Account Setup</string>
- <string key="NSWindowClass">NSWindow</string>
- <nil key="NSViewClass"/>
- <nil key="NSUserInterfaceItemIdentifier"/>
- <object class="NSView" key="NSWindowView" id="1006">
- <reference key="NSNextResponder"/>
- <int key="NSvFlags">256</int>
- <array class="NSMutableArray" key="NSSubviews">
- <object class="WebView" id="950810926">
- <reference key="NSNextResponder" ref="1006"/>
- <int key="NSvFlags">274</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 URL pasteboard type</string>
- <string>Apple Web Archive pasteboard type</string>
- <string>NSColor pasteboard type</string>
- <string>NSFilenamesPboardType</string>
- <string>NSStringPboardType</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>WebURLsWithTitlesPboardType</string>
- <string>public.png</string>
- <string>public.url</string>
- <string>public.url-name</string>
- </set>
- <string key="NSFrameSize">{640, 380}</string>
- <reference key="NSSuperview" ref="1006"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView"/>
- <string key="FrameName"/>
- <string key="GroupName"/>
- <object class="WebPreferences" key="Preferences">
- <string key="Identifier"/>
- <dictionary class="NSMutableDictionary" key="Values">
- <integer value="12" key="WebKitDefaultFixedFontSize"/>
- <integer value="12" key="WebKitDefaultFontSize"/>
- <integer value="1" key="WebKitMinimumFontSize"/>
- <boolean value="NO" key="WebKitPluginsEnabled"/>
- </dictionary>
- </object>
- <bool key="UseBackForwardList">YES</bool>
- <bool key="AllowsUndo">YES</bool>
- </object>
- <object class="NSProgressIndicator" id="873347688">
- <reference key="NSNextResponder" ref="1006"/>
- <int key="NSvFlags">1292</int>
- <object class="NSPSMatrix" key="NSDrawMatrix"/>
- <string key="NSFrame">{{304, 174}, {32, 32}}</string>
- <reference key="NSSuperview" ref="1006"/>
- <reference key="NSWindow"/>
- <int key="NSpiFlags">28682</int>
- <double key="NSMaxValue">100</double>
- </object>
- </array>
- <string key="NSFrameSize">{640, 380}</string>
- <reference key="NSSuperview"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="950810926"/>
- </object>
- <string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
- <string key="NSMaxSize">{10000000000000, 10000000000000}</string>
- <string key="NSFrameAutosaveName">FBXMPPOAUTH</string>
- <bool key="NSWindowIsRestorable">YES</bool>
- </object>
- </array>
- <object class="IBObjectContainer" key="IBDocument.Objects">
- <array class="NSMutableArray" key="connectionRecords">
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">webView</string>
- <reference key="source" ref="1001"/>
- <reference key="destination" ref="950810926"/>
- </object>
- <int key="connectionID">4</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">window</string>
- <reference key="source" ref="1001"/>
- <reference key="destination" ref="1005"/>
- </object>
- <int key="connectionID">6</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">spinner</string>
- <reference key="source" ref="1001"/>
- <reference key="destination" ref="873347688"/>
- </object>
- <int key="connectionID">8</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">delegate</string>
- <reference key="source" ref="1005"/>
- <reference key="destination" ref="1001"/>
- </object>
- <int key="connectionID">10</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">resourceLoadDelegate</string>
- <reference key="source" ref="950810926"/>
- <reference key="destination" ref="1001"/>
- </object>
- <int key="connectionID">5</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">frameLoadDelegate</string>
- <reference key="source" ref="950810926"/>
- <reference key="destination" ref="1001"/>
- </object>
- <int key="connectionID">9</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="1000"/>
- <nil key="parent"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-2</int>
- <reference key="object" ref="1001"/>
- <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="1003"/>
- <reference key="parent" ref="0"/>
- <string key="objectName">First Responder</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-3</int>
- <reference key="object" ref="1004"/>
- <reference key="parent" ref="0"/>
- <string key="objectName">Application</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">1</int>
- <reference key="object" ref="1005"/>
- <array class="NSMutableArray" key="children">
- <reference ref="1006"/>
- </array>
- <reference key="parent" ref="0"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">2</int>
- <reference key="object" ref="1006"/>
- <array class="NSMutableArray" key="children">
- <reference ref="950810926"/>
- <reference ref="873347688"/>
- </array>
- <reference key="parent" ref="1005"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">3</int>
- <reference key="object" ref="950810926"/>
- <reference key="parent" ref="1006"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">7</int>
- <reference key="object" ref="873347688"/>
- <reference key="parent" ref="1006"/>
- </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="1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="1.IBWindowTemplateEditedContentRect">{{305, 397}, {640, 380}}</string>
- <integer value="1" key="1.NSWindowTemplate.visibleAtLaunch"/>
- <string key="2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="3.IBPluginDependency">com.apple.WebKitIBPlugin</string>
- <string key="7.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">10</int>
- </object>
- <object class="IBClassDescriber" key="IBDocument.Classes">
- <array class="NSMutableArray" key="referencedPartialClassDescriptions">
- <object class="IBPartialClassDescription">
- <string key="className">AIFacebookXMPPOAuthWebViewWindowController</string>
- <string key="superclassName">AIWindowController</string>
- <dictionary class="NSMutableDictionary" key="outlets">
- <string key="spinner">NSProgressIndicator</string>
- <string key="webView">WebView</string>
- </dictionary>
- <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
- <object class="IBToOneOutletInfo" key="spinner">
- <string key="name">spinner</string>
- <string key="candidateClassName">NSProgressIndicator</string>
- </object>
- <object class="IBToOneOutletInfo" key="webView">
- <string key="name">webView</string>
- <string key="candidateClassName">WebView</string>
- </object>
- </dictionary>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/AIFacebookXMPPOAuthWebViewWindowController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">AIWindowController</string>
- <string key="superclassName">NSWindowController</string>
- <object class="NSMutableDictionary" key="actions">
- <string key="NS.key.0">closeWindow:</string>
- <string key="NS.object.0">id</string>
- </object>
- <object class="NSMutableDictionary" key="actionInfosByName">
- <string key="NS.key.0">closeWindow:</string>
- <object class="IBActionInfo" key="NS.object.0">
- <string key="name">closeWindow:</string>
- <string key="candidateClassName">id</string>
- </object>
- </object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/AIWindowController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">WebView</string>
- <object class="NSMutableDictionary" key="actions">
- <string key="NS.key.0">reloadFromOrigin:</string>
- <string key="NS.object.0">id</string>
- </object>
- <object class="NSMutableDictionary" key="actionInfosByName">
- <string key="NS.key.0">reloadFromOrigin:</string>
- <object class="IBActionInfo" key="NS.object.0">
- <string key="name">reloadFromOrigin:</string>
- <string key="candidateClassName">id</string>
- </object>
- </object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/WebView.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.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>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4514" systemVersion="13A603" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+ <dependencies>
+ <deployment version="1060" defaultVersion="1060" identifier="macosx"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4514"/>
+ <plugIn identifier="com.apple.WebKitIBPlugin" version="3336"/>
+ </dependencies>
+ <objects>
+ <customObject id="-2" userLabel="File's Owner" customClass="AIFacebookXMPPOAuthWebViewWindowController">
+ <connections>
+ <outlet property="spinner" destination="7" id="8"/>
+ <outlet property="webView" destination="3" id="4"/>
+ <outlet property="window" destination="1" id="6"/>
+ </connections>
+ </customObject>
+ <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+ <customObject id="-3" userLabel="Application"/>
+ <window title="Facebook Account Setup" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" wantsToBeColor="NO" frameAutosaveName="FBXMPPOAUTH" animationBehavior="default" id="1">
+ <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
+ <rect key="contentRect" x="196" y="130" width="640" height="380"/>
+ <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1028"/>
+ <value key="maxSize" type="size" width="640" height="380"/>
+ <view key="contentView" id="2">
+ <rect key="frame" x="0.0" y="0.0" width="640" height="380"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <subviews>
+ <webView id="3">
+ <rect key="frame" x="0.0" y="0.0" width="640" height="380"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <webPreferences key="preferences" defaultFontSize="12" defaultFixedFontSize="12" plugInsEnabled="NO"/>
+ <connections>
+ <outlet property="frameLoadDelegate" destination="-2" id="9"/>
+ <outlet property="resourceLoadDelegate" destination="-2" id="5"/>
+ </connections>
+ </webView>
+ <progressIndicator horizontalHuggingPriority="750" verticalHuggingPriority="750" maxValue="100" displayedWhenStopped="NO" bezeled="NO" indeterminate="YES" style="spinning" id="7">
+ <rect key="frame" x="304" y="174" width="32" height="32"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ </progressIndicator>
+ </subviews>
+ </view>
+ <connections>
+ <outlet property="delegate" destination="-2" id="10"/>
+ </connections>
+ </window>
+ </objects>
+</document>
\ No newline at end of file
diff -r a92f6e8ab5d9 -r 2685998bec22 Resources/Credits.rtf
--- a/Resources/Credits.rtf Fri Oct 25 19:32:17 2013 +0200
+++ b/Resources/Credits.rtf Sat Oct 26 21:26:31 2013 -0400
@@ -1,6 +1,6 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf390
+{\rtf1\ansi\ansicpg1252\cocoartf1265
{\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;}
+{\colortbl;\red255\green255\blue255;\red38\green38\blue38;}
\vieww12600\viewh10200\viewkind0
\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40
@@ -548,8 +548,8 @@
\CocoaLigature0 \'95\CocoaLigature1 Meanwhile, a GPLd Lotus Sametime\'ae library\
<http://meanwhile.sourceforge.net/>\
\
- \CocoaLigature0 \'95\CocoaLigature1 \CocoaLigature0 \CocoaLigature1 MGTwitterEngine, a Twitter library by Matt Gemmell\
- <http://mattgemmell.com/>\CocoaLigature0 \
+ \CocoaLigature0 \'95\CocoaLigature1 \CocoaLigature0 \CocoaLigature1 STTwitter, a Twitter library by \cf2 Nicolas Seriot\cf0 \
+ <https://github.com/nst/STTwitter>\CocoaLigature0 \
\CocoaLigature1 \
\CocoaLigature0 \'95\CocoaLigature1 Off-the-Record messaging, an encryption library\
<https://www.cypherpunks.ca/>\
More information about the commits
mailing list