adium 5580:59de9d0009e1: * Fix SMP not starting after previous c...
commits at adium.im
commits at adium.im
Wed Jun 19 17:04:10 UTC 2013
details: http://hg.adium.im/adium/rev/59de9d0009e1
revision: 5580:59de9d0009e1
branch: libotr4.0.0
author: Thijs Alkemade <me at thijsalkema.de>
date: Wed Jun 19 19:03:11 2013 +0200
* Fix SMP not starting after previous changes.
* Added the option to select a file for the SMP secret question answer. I don't know if many other clients allow this, but it's a nice feature, I think (the file doesn't need to be "uploaded", the OTR-messages are always more or less the same size).
diffs (truncated from 1043 to 1000 lines):
diff -r eaec4182935a -r 59de9d0009e1 Resources/AIOTRSMPSecretAnswerWindowController.xib
--- a/Resources/AIOTRSMPSecretAnswerWindowController.xib Wed Jun 05 20:28:42 2013 +0200
+++ b/Resources/AIOTRSMPSecretAnswerWindowController.xib Wed Jun 19 19:03:11 2013 +0200
@@ -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">2843</string>
- <string key="IBDocument.AppKitVersion">1187.34</string>
- <string key="IBDocument.HIToolboxVersion">625.00</string>
+ <string key="IBDocument.SystemVersion">12D78</string>
+ <string key="IBDocument.InterfaceBuilderVersion">3084</string>
+ <string key="IBDocument.AppKitVersion">1187.37</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">2843</string>
+ <string key="NS.object.0">3084</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
<string>NSButton</string>
@@ -18,6 +18,8 @@
<string>NSImageView</string>
<string>NSScrollView</string>
<string>NSScroller</string>
+ <string>NSTabView</string>
+ <string>NSTabViewItem</string>
<string>NSTextField</string>
<string>NSTextFieldCell</string>
<string>NSTextView</string>
@@ -44,7 +46,7 @@
<object class="NSWindowTemplate" id="1005">
<int key="NSWindowStyleMask">7</int>
<int key="NSWindowBacking">2</int>
- <string key="NSWindowRect">{{745, 414}, {514, 415}}</string>
+ <string key="NSWindowRect">{{745, 414}, {514, 512}}</string>
<int key="NSWTFlags">544735232</int>
<string key="NSWindowTitle">Identity verification</string>
<string key="NSWindowClass">NSWindow</string>
@@ -57,7 +59,7 @@
<object class="NSTextField" id="924271898">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{57, 361}, {440, 34}}</string>
+ <string key="NSFrame">{{57, 458}, {440, 34}}</string>
<reference key="NSSuperview" ref="1006"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="205520375"/>
@@ -100,10 +102,10 @@
<object class="NSTextField" id="129577520">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">300</int>
- <string key="NSFrame">{{17, 267}, {480, 14}}</string>
+ <string key="NSFrame">{{17, 364}, {480, 14}}</string>
<reference key="NSSuperview" ref="1006"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="294266754"/>
+ <reference key="NSNextKeyView" ref="88114479"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<string key="NSAntiCompressionPriority">{250, 750}</string>
<bool key="NSEnabled">YES</bool>
@@ -123,7 +125,7 @@
<object class="NSTextField" id="20732819">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">300</int>
- <string key="NSFrame">{{17, 61}, {480, 127}}</string>
+ <string key="NSFrame">{{17, 66}, {480, 127}}</string>
<reference key="NSSuperview" ref="1006"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="508200382"/>
@@ -153,7 +155,7 @@
<object class="NSButton" id="179006788">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">289</int>
- <string key="NSFrame">{{409, 13}, {91, 32}}</string>
+ <string key="NSFrame">{{409, 18}, {91, 32}}</string>
<reference key="NSSuperview" ref="1006"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
@@ -183,7 +185,7 @@
<object class="NSButton" id="508200382">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">289</int>
- <string key="NSFrame">{{318, 13}, {91, 32}}</string>
+ <string key="NSFrame">{{318, 18}, {91, 32}}</string>
<reference key="NSSuperview" ref="1006"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="179006788"/>
@@ -260,7 +262,7 @@
<int key="NSTCFlags">1</int>
</object>
<object class="NSTextViewSharedData" key="NSSharedData">
- <int key="NSFlags">11523</int>
+ <int key="NSFlags">67120387</int>
<int key="NSTextCheckingTypes">0</int>
<nil key="NSMarkedAttributes"/>
<object class="NSColor" key="NSBackgroundColor" id="87608082">
@@ -494,7 +496,7 @@
<double key="NSPercent">0.94565218687057495</double>
</object>
</array>
- <string key="NSFrame">{{20, 289}, {474, 64}}</string>
+ <string key="NSFrame">{{20, 386}, {474, 64}}</string>
<reference key="NSSuperview" ref="1006"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="143456741"/>
@@ -507,100 +509,142 @@
<double key="NSMaxMagnification">4</double>
<double key="NSMagnification">1</double>
</object>
- <object class="NSScrollView" id="294266754">
+ <object class="NSImageView" id="711843853">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">256</int>
- <array class="NSMutableArray" key="NSSubviews">
- <object class="NSClipView" id="884512010">
- <reference key="NSNextResponder" ref="294266754"/>
- <int key="NSvFlags">2304</int>
- <array class="NSMutableArray" key="NSSubviews">
- <object class="NSTextView" id="345743255">
- <reference key="NSNextResponder" ref="884512010"/>
- <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">{457, 61}</string>
- <reference key="NSSuperview" ref="884512010"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="735482434"/>
- <string key="NSReuseIdentifierKey">_NS:13</string>
- <object class="NSTextContainer" key="NSTextContainer" id="23309550">
- <object class="NSLayoutManager" key="NSLayoutManager">
- <object class="NSTextStorage" key="NSTextStorage">
- <object class="NSMutableString" key="NSString">
- <characters key="NS.bytes"/>
- </object>
- <nil key="NSDelegate"/>
- </object>
- <array class="NSMutableArray" key="NSTextContainers">
- <reference ref="23309550"/>
- </array>
- <int key="NSLMFlags">166</int>
- <nil key="NSDelegate"/>
- </object>
- <reference key="NSTextView" ref="345743255"/>
- <double key="NSWidth">457</double>
- <int key="NSTCFlags">1</int>
- </object>
- <object class="NSTextViewSharedData" key="NSSharedData">
- <int key="NSFlags">67120387</int>
- <int key="NSTextCheckingTypes">0</int>
- <nil key="NSMarkedAttributes"/>
- <reference key="NSBackgroundColor" ref="87608082"/>
- <dictionary key="NSSelectedAttributes">
- <reference key="NSBackgroundColor" ref="188273939"/>
- <reference key="NSColor" ref="393613669"/>
- </dictionary>
- <reference key="NSInsertionColor" ref="613318316"/>
- <dictionary key="NSLinkAttributes">
- <reference key="NSColor" ref="23262091"/>
- <reference key="NSCursor" ref="515113842"/>
- <integer value="1" key="NSUnderline"/>
- </dictionary>
- <nil key="NSDefaultParagraphStyle"/>
- <nil key="NSTextFinder"/>
- <int key="NSPreferredTextFinderStyle">1</int>
- </object>
- <int key="NSTVFlags">6</int>
- <string key="NSMaxSize">{468, 10000000}</string>
- <nil key="NSDelegate"/>
- </object>
- </array>
- <string key="NSFrame">{{1, 1}, {457, 61}}</string>
- <reference key="NSSuperview" ref="294266754"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="345743255"/>
- <string key="NSReuseIdentifierKey">_NS:11</string>
- <reference key="NSDocView" ref="345743255"/>
- <reference key="NSBGColor" ref="87608082"/>
- <object class="NSCursor" key="NSCursor">
- <string key="NSHotSpot">{4, 5}</string>
- <object class="NSImage" key="NSImage">
- <int key="NSImageFlags">12582912</int>
- <array class="NSMutableArray" key="NSReps">
- <array>
- <integer value="0"/>
- <object class="NSBitmapImageRep">
- <object class="NSData" key="NSTIFFRepresentation">
- <bytes key="NS.bytes">TU0AKgAAEAj///8A////qwAAAP8AAAD/AwMD/BYWFtIFBQVuAAAABv///wD///8E6+vrTGhoaLYtLS3p
+ <set class="NSMutableSet" key="NSDragTypes">
+ <string>Apple PDF pasteboard type</string>
+ <string>Apple PICT pasteboard type</string>
+ <string>Apple PNG pasteboard type</string>
+ <string>NSFilenamesPboardType</string>
+ <string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
+ <string>NeXT TIFF v4.0 pasteboard type</string>
+ </set>
+ <string key="NSFrame">{{20, 460}, {32, 32}}</string>
+ <reference key="NSSuperview" ref="1006"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="924271898"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSImageCell" key="NSCell" id="585043902">
+ <int key="NSCellFlags">134217728</int>
+ <int key="NSCellFlags2">33554432</int>
+ <int key="NSAlign">0</int>
+ <int key="NSScale">0</int>
+ <int key="NSStyle">0</int>
+ <bool key="NSAnimates">NO</bool>
+ </object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+ <bool key="NSEditable">YES</bool>
+ </object>
+ <object class="NSTabView" id="88114479">
+ <reference key="NSNextResponder" ref="1006"/>
+ <int key="NSvFlags">12</int>
+ <string key="NSFrame">{{13, 191}, {488, 171}}</string>
+ <reference key="NSSuperview" ref="1006"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="379122707"/>
+ <string key="NSReuseIdentifierKey">_NS:9</string>
+ <array class="NSMutableArray" key="NSTabViewItems">
+ <object class="NSTabViewItem" id="199853298">
+ <string key="NSIdentifier">1</string>
+ <object class="NSView" key="NSView" id="379122707">
+ <reference key="NSNextResponder" ref="88114479"/>
+ <int key="NSvFlags">256</int>
+ <array class="NSMutableArray" key="NSSubviews">
+ <object class="NSScrollView" id="294266754">
+ <reference key="NSNextResponder" ref="379122707"/>
+ <int key="NSvFlags">256</int>
+ <array class="NSMutableArray" key="NSSubviews">
+ <object class="NSClipView" id="884512010">
+ <reference key="NSNextResponder" ref="294266754"/>
+ <int key="NSvFlags">2304</int>
+ <array class="NSMutableArray" key="NSSubviews">
+ <object class="NSTextView" id="345743255">
+ <reference key="NSNextResponder" ref="884512010"/>
+ <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">{417, 103}</string>
+ <reference key="NSSuperview" ref="884512010"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="735482434"/>
+ <string key="NSReuseIdentifierKey">_NS:13</string>
+ <object class="NSTextContainer" key="NSTextContainer" id="23309550">
+ <object class="NSLayoutManager" key="NSLayoutManager">
+ <object class="NSTextStorage" key="NSTextStorage">
+ <object class="NSMutableString" key="NSString">
+ <characters key="NS.bytes"/>
+ </object>
+ <nil key="NSDelegate"/>
+ </object>
+ <array class="NSMutableArray" key="NSTextContainers">
+ <reference ref="23309550"/>
+ </array>
+ <int key="NSLMFlags">166</int>
+ <nil key="NSDelegate"/>
+ </object>
+ <reference key="NSTextView" ref="345743255"/>
+ <double key="NSWidth">417</double>
+ <int key="NSTCFlags">1</int>
+ </object>
+ <object class="NSTextViewSharedData" key="NSSharedData">
+ <int key="NSFlags">67120387</int>
+ <int key="NSTextCheckingTypes">0</int>
+ <nil key="NSMarkedAttributes"/>
+ <reference key="NSBackgroundColor" ref="87608082"/>
+ <dictionary key="NSSelectedAttributes">
+ <reference key="NSBackgroundColor" ref="188273939"/>
+ <reference key="NSColor" ref="393613669"/>
+ </dictionary>
+ <reference key="NSInsertionColor" ref="613318316"/>
+ <dictionary key="NSLinkAttributes">
+ <reference key="NSColor" ref="23262091"/>
+ <reference key="NSCursor" ref="515113842"/>
+ <integer value="1" key="NSUnderline"/>
+ </dictionary>
+ <nil key="NSDefaultParagraphStyle"/>
+ <nil key="NSTextFinder"/>
+ <int key="NSPreferredTextFinderStyle">1</int>
+ </object>
+ <int key="NSTVFlags">6</int>
+ <string key="NSMaxSize">{468, 10000000}</string>
+ <nil key="NSDelegate"/>
+ </object>
+ </array>
+ <string key="NSFrame">{{1, 1}, {417, 103}}</string>
+ <reference key="NSSuperview" ref="294266754"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="345743255"/>
+ <string key="NSReuseIdentifierKey">_NS:11</string>
+ <reference key="NSDocView" ref="345743255"/>
+ <reference key="NSBGColor" ref="87608082"/>
+ <object class="NSCursor" key="NSCursor">
+ <string key="NSHotSpot">{4, 5}</string>
+ <object class="NSImage" key="NSImage">
+ <int key="NSImageFlags">12582912</int>
+ <array class="NSMutableArray" key="NSReps">
+ <array>
+ <integer value="0"/>
+ <object class="NSBitmapImageRep">
+ <object class="NSData" key="NSTIFFRepresentation">
+ <bytes key="NS.bytes">TU0AKgAAEAj///8A////qwAAAP8AAAD/AwMD/BYWFtIFBQVuAAAABv///wD///8E6+vrTGhoaLYtLS3p
BAQE/QAAAP8AAAD/////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A
////AP///wD///8A////AP///wD///+rAAAA/wAAAP8AAAD/AAAA/wAAAP8EBATSX19fK9HR0ZciIiLv
AAAA/wAAAP8AAAD/AAAA/wAAAP////8A////AP///wD///8A////AP///wD///8A////AP///wD///8A
@@ -673,14 +717,14 @@
AAABFgADAAAAAQAgAAABFwAEAAAAAQAAEAABGgAFAAAAAQAAENYBGwAFAAAAAQAAEN4BHAADAAAAAQAB
AAABKAADAAAAAQACAAABUgADAAAAAQACAAABUwADAAAABAAAEOYAAAAAAAgACAAIAAgSAAAAACAAABIA
AAAAIAAAAAEAAQABAAE</bytes>
- </object>
- </object>
- </array>
- <array>
- <integer value="0"/>
- <object class="NSBitmapImageRep">
- <object class="NSData" key="NSTIFFRepresentation">
- <bytes key="NS.bytes">TU0AKgAABAj///9VQ0ND/wAAAP////8A////AP///6pDQ0P/AAAA/////wD///8A////AP///wD///8A
+ </object>
+ </object>
+ </array>
+ <array>
+ <integer value="0"/>
+ <object class="NSBitmapImageRep">
+ <object class="NSData" key="NSTIFFRepresentation">
+ <bytes key="NS.bytes">TU0AKgAABAj///9VQ0ND/wAAAP////8A////AP///6pDQ0P/AAAA/////wD///8A////AP///wD///8A
////AP///wD///8A////AP///wD///+qAAAA/////6oAAAD/////AP///wD///8A////AP///wD///8A
////AP///wD///8A////AP///wD///8A////AP///6oAAAD/////AP///wD///8A////AP///wD///8A
////AP///wD///8A////AP///wD///8A////AP///wD///+qAAAA/////wD///8A////AP///wD///8A
@@ -734,87 +778,144 @@
Fs9YWVogAAAAAAAAdE0AAD3uAAAD0FhZWiAAAAAAAABadQAArHMAABc0WFlaIAAAAAAAACgaAAAVnwAA
uDZjdXJ2AAAAAAAAAAEBzQAAc2YzMgAAAAAAAQxCAAAF3v//8yYAAAeSAAD9kf//+6L///2jAAAD3AAA
wGw</bytes>
+ </object>
+ </object>
+ </array>
+ </array>
+ <reference key="NSColor" ref="117597116"/>
+ </object>
</object>
+ <int key="NScvFlags">4</int>
+ </object>
+ <object class="NSScroller" id="735482434">
+ <reference key="NSNextResponder" ref="294266754"/>
+ <int key="NSvFlags">256</int>
+ <string key="NSFrame">{{418, 1}, {15, 103}}</string>
+ <reference key="NSSuperview" ref="294266754"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="20732819"/>
+ <string key="NSReuseIdentifierKey">_NS:83</string>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+ <reference key="NSTarget" ref="294266754"/>
+ <string key="NSAction">_doScroller:</string>
+ <double key="NSCurValue">1</double>
+ <double key="NSPercent">0.85256409645080566</double>
+ </object>
+ <object class="NSScroller" id="249950005">
+ <reference key="NSNextResponder" ref="294266754"/>
+ <int key="NSvFlags">-2147483392</int>
+ <string key="NSFrame">{{-100, -100}, {87, 18}}</string>
+ <reference key="NSSuperview" ref="294266754"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="884512010"/>
+ <string key="NSReuseIdentifierKey">_NS:33</string>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+ <int key="NSsFlags">1</int>
+ <reference key="NSTarget" ref="294266754"/>
+ <string key="NSAction">_doScroller:</string>
+ <double key="NSCurValue">1</double>
+ <double key="NSPercent">0.94565218687057495</double>
</object>
</array>
- </array>
- <reference key="NSColor" ref="117597116"/>
- </object>
+ <string key="NSFrame">{{17, 17}, {434, 105}}</string>
+ <reference key="NSSuperview" ref="379122707"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="249950005"/>
+ <string key="NSReuseIdentifierKey">_NS:9</string>
+ <int key="NSsFlags">133138</int>
+ <reference key="NSVScroller" ref="735482434"/>
+ <reference key="NSHScroller" ref="249950005"/>
+ <reference key="NSContentView" ref="884512010"/>
+ <double key="NSMinMagnification">0.25</double>
+ <double key="NSMaxMagnification">4</double>
+ <double key="NSMagnification">1</double>
+ </object>
+ </array>
+ <string key="NSFrame">{{10, 33}, {468, 125}}</string>
+ <reference key="NSSuperview" ref="88114479"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="294266754"/>
+ <string key="NSReuseIdentifierKey">_NS:11</string>
</object>
- <int key="NScvFlags">4</int>
+ <string key="NSLabel">Text</string>
+ <reference key="NSColor" ref="38660599"/>
+ <reference key="NSTabView" ref="88114479"/>
</object>
- <object class="NSScroller" id="735482434">
- <reference key="NSNextResponder" ref="294266754"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{458, 1}, {15, 61}}</string>
- <reference key="NSSuperview" ref="294266754"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="20732819"/>
- <string key="NSReuseIdentifierKey">_NS:83</string>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- <reference key="NSTarget" ref="294266754"/>
- <string key="NSAction">_doScroller:</string>
- <double key="NSCurValue">1</double>
- <double key="NSPercent">0.85256409645080566</double>
- </object>
- <object class="NSScroller" id="249950005">
- <reference key="NSNextResponder" ref="294266754"/>
- <int key="NSvFlags">-2147483392</int>
- <string key="NSFrame">{{-100, -100}, {87, 18}}</string>
- <reference key="NSSuperview" ref="294266754"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="884512010"/>
- <string key="NSReuseIdentifierKey">_NS:33</string>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- <int key="NSsFlags">1</int>
- <reference key="NSTarget" ref="294266754"/>
- <string key="NSAction">_doScroller:</string>
- <double key="NSCurValue">1</double>
- <double key="NSPercent">0.94565218687057495</double>
+ <object class="NSTabViewItem" id="116104966">
+ <string key="NSIdentifier">2</string>
+ <object class="NSView" key="NSView" id="865951720">
+ <nil key="NSNextResponder"/>
+ <int key="NSvFlags">256</int>
+ <array class="NSMutableArray" key="NSSubviews">
+ <object class="NSButton" id="501581535">
+ <reference key="NSNextResponder" ref="865951720"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{11, 94}, {103, 32}}</string>
+ <reference key="NSSuperview" ref="865951720"/>
+ <reference key="NSNextKeyView" ref="701206078"/>
+ <string key="NSReuseIdentifierKey">_NS:9</string>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSButtonCell" key="NSCell" id="134945105">
+ <int key="NSCellFlags">67108864</int>
+ <int key="NSCellFlags2">134217728</int>
+ <string key="NSContents">Select File</string>
+ <object class="NSFont" key="NSSupport" id="160923183">
+ <string key="NSName">LucidaGrande</string>
+ <double key="NSSize">13</double>
+ <int key="NSfFlags">1044</int>
+ </object>
+ <string key="NSCellIdentifier">_NS:9</string>
+ <reference key="NSControlView" ref="501581535"/>
+ <int key="NSButtonFlags">-2038284288</int>
+ <int key="NSButtonFlags2">129</int>
+ <string key="NSAlternateContents"/>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">200</int>
+ <int key="NSPeriodicInterval">25</int>
+ </object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+ </object>
+ <object class="NSTextField" id="701206078">
+ <reference key="NSNextResponder" ref="865951720"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{113, 103}, {341, 17}}</string>
+ <reference key="NSSuperview" ref="865951720"/>
+ <reference key="NSNextKeyView" ref="20732819"/>
+ <string key="NSReuseIdentifierKey">_NS:1535</string>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSTextFieldCell" key="NSCell" id="341410860">
+ <int key="NSCellFlags">68157504</int>
+ <int key="NSCellFlags2">272630784</int>
+ <string key="NSContents">(Nothing selected)</string>
+ <reference key="NSSupport" ref="160923183"/>
+ <string key="NSCellIdentifier">_NS:1535</string>
+ <reference key="NSControlView" ref="701206078"/>
+ <reference key="NSBackgroundColor" ref="38660599"/>
+ <reference key="NSTextColor" ref="297656176"/>
+ </object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+ </object>
+ </array>
+ <string key="NSFrame">{{10, 33}, {468, 125}}</string>
+ <reference key="NSNextKeyView" ref="501581535"/>
+ <string key="NSReuseIdentifierKey">_NS:28</string>
+ </object>
+ <string key="NSLabel">File</string>
+ <reference key="NSColor" ref="38660599"/>
+ <reference key="NSTabView" ref="88114479"/>
</object>
</array>
- <string key="NSFrame">{{20, 196}, {474, 63}}</string>
- <reference key="NSSuperview" ref="1006"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="249950005"/>
- <string key="NSReuseIdentifierKey">_NS:9</string>
- <int key="NSsFlags">133138</int>
- <reference key="NSVScroller" ref="735482434"/>
- <reference key="NSHScroller" ref="249950005"/>
- <reference key="NSContentView" ref="884512010"/>
- <double key="NSMinMagnification">0.25</double>
- <double key="NSMaxMagnification">4</double>
- <double key="NSMagnification">1</double>
- </object>
- <object class="NSImageView" id="711843853">
- <reference key="NSNextResponder" ref="1006"/>
- <int key="NSvFlags">256</int>
- <set class="NSMutableSet" key="NSDragTypes">
- <string>Apple PDF pasteboard type</string>
- <string>Apple PICT pasteboard type</string>
- <string>Apple PNG pasteboard type</string>
- <string>NSFilenamesPboardType</string>
- <string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
- <string>NeXT TIFF v4.0 pasteboard type</string>
- </set>
- <string key="NSFrame">{{20, 363}, {32, 32}}</string>
- <reference key="NSSuperview" ref="1006"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="924271898"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSImageCell" key="NSCell" id="585043902">
- <int key="NSCellFlags">134217728</int>
- <int key="NSCellFlags2">33554432</int>
- <int key="NSAlign">0</int>
- <int key="NSScale">0</int>
- <int key="NSStyle">0</int>
- <bool key="NSAnimates">NO</bool>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- <bool key="NSEditable">YES</bool>
+ <reference key="NSSelectedTabViewItem" ref="199853298"/>
+ <reference key="NSFont" ref="160923183"/>
+ <int key="NSTvFlags">0</int>
+ <bool key="NSAllowTruncatedLabels">YES</bool>
+ <bool key="NSDrawsBackground">YES</bool>
+ <array class="NSMutableArray" key="NSSubviews">
+ <reference ref="379122707"/>
+ </array>
</object>
</array>
- <string key="NSFrameSize">{514, 415}</string>
+ <string key="NSFrameSize">{514, 512}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="711843853"/>
@@ -860,14 +961,6 @@
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">field_answer</string>
- <reference key="source" ref="1001"/>
- <reference key="destination" ref="345743255"/>
- </object>
- <int key="connectionID">41</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
<string key="label">label_answer</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="129577520"/>
@@ -890,6 +983,46 @@
</object>
<int key="connectionID">48</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">field_answer</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="345743255"/>
+ </object>
+ <int key="connectionID">41</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">selectFile:</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="501581535"/>
+ </object>
+ <int key="connectionID">64</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">tab_answer</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="88114479"/>
+ </object>
+ <int key="connectionID">66</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">label_filename</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="701206078"/>
+ </object>
+ <int key="connectionID">67</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">view_anchorToRightSide</string>
+ <reference key="source" ref="501581535"/>
+ <reference key="destination" ref="701206078"/>
+ </object>
+ <int key="connectionID">65</int>
+ </object>
</array>
<object class="IBMutableOrderedSet" key="objectRecords">
<array key="orderedObjects">
@@ -931,12 +1064,12 @@
<array class="NSMutableArray" key="children">
<reference ref="924271898"/>
<reference ref="205520375"/>
- <reference ref="294266754"/>
<reference ref="129577520"/>
<reference ref="711843853"/>
<reference ref="20732819"/>
<reference ref="179006788"/>
<reference ref="508200382"/>
+ <reference ref="88114479"/>
</array>
<reference key="parent" ref="1005"/>
</object>
@@ -1018,31 +1151,6 @@
<reference key="parent" ref="205520375"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">36</int>
- <reference key="object" ref="294266754"/>
- <array class="NSMutableArray" key="children">
- <reference ref="735482434"/>
- <reference ref="249950005"/>
- <reference ref="345743255"/>
- </array>
- <reference key="parent" ref="1006"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">37</int>
- <reference key="object" ref="735482434"/>
- <reference key="parent" ref="294266754"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">38</int>
- <reference key="object" ref="249950005"/>
- <reference key="parent" ref="294266754"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">39</int>
- <reference key="object" ref="345743255"/>
- <reference key="parent" ref="294266754"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">43</int>
<reference key="object" ref="711843853"/>
<array class="NSMutableArray" key="children">
@@ -1068,6 +1176,99 @@
<reference key="object" ref="601029529"/>
<reference key="parent" ref="20732819"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">53</int>
+ <reference key="object" ref="88114479"/>
+ <array class="NSMutableArray" key="children">
+ <reference ref="199853298"/>
+ <reference ref="116104966"/>
+ </array>
+ <reference key="parent" ref="1006"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">54</int>
+ <reference key="object" ref="199853298"/>
+ <array class="NSMutableArray" key="children">
+ <reference ref="379122707"/>
+ </array>
+ <reference key="parent" ref="88114479"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">55</int>
+ <reference key="object" ref="116104966"/>
+ <array class="NSMutableArray" key="children">
+ <reference ref="865951720"/>
+ </array>
+ <reference key="parent" ref="88114479"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">56</int>
+ <reference key="object" ref="865951720"/>
+ <array class="NSMutableArray" key="children">
+ <reference ref="501581535"/>
+ <reference ref="701206078"/>
+ </array>
+ <reference key="parent" ref="116104966"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">57</int>
+ <reference key="object" ref="379122707"/>
+ <array class="NSMutableArray" key="children">
+ <reference ref="294266754"/>
+ </array>
+ <reference key="parent" ref="199853298"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">36</int>
+ <reference key="object" ref="294266754"/>
+ <array class="NSMutableArray" key="children">
+ <reference ref="345743255"/>
+ <reference ref="249950005"/>
+ <reference ref="735482434"/>
+ </array>
+ <reference key="parent" ref="379122707"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">39</int>
+ <reference key="object" ref="345743255"/>
+ <reference key="parent" ref="294266754"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">38</int>
+ <reference key="object" ref="249950005"/>
+ <reference key="parent" ref="294266754"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">37</int>
+ <reference key="object" ref="735482434"/>
+ <reference key="parent" ref="294266754"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">60</int>
+ <reference key="object" ref="501581535"/>
+ <array class="NSMutableArray" key="children">
+ <reference ref="134945105"/>
+ </array>
+ <reference key="parent" ref="865951720"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">61</int>
+ <reference key="object" ref="134945105"/>
+ <reference key="parent" ref="501581535"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">62</int>
+ <reference key="object" ref="701206078"/>
+ <array class="NSMutableArray" key="children">
+ <reference ref="341410860"/>
+ </array>
+ <reference key="parent" ref="865951720"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">63</int>
+ <reference key="object" ref="341410860"/>
+ <reference key="parent" ref="701206078"/>
+ </object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -1100,14 +1301,24 @@
<string key="46.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="47.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="53.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="54.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="55.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="56.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="57.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="60.CustomClassName">AILocalizationButton</string>
+ <string key="60.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="61.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="62.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="63.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="9.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
- <int key="maxID">48</int>
+ <int key="maxID">67</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1149,6 +1360,7 @@
<dictionary class="NSMutableDictionary" key="actions">
<string key="cancel:">id</string>
<string key="okay:">id</string>
+ <string key="selectFile:">id</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="actionInfosByName">
<object class="IBActionInfo" key="cancel:">
@@ -1159,14 +1371,20 @@
<string key="name">okay:</string>
<string key="candidateClassName">id</string>
</object>
+ <object class="IBActionInfo" key="selectFile:">
+ <string key="name">selectFile:</string>
+ <string key="candidateClassName">id</string>
+ </object>
</dictionary>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="field_answer">NSTextView</string>
<string key="field_question">NSTextView</string>
<string key="imageView_lock">NSImageView</string>
<string key="label_answer">NSTextField</string>
+ <string key="label_filename">NSTextField</string>
<string key="label_intro">NSTextField</string>
<string key="label_tips">NSTextField</string>
+ <string key="tab_answer">NSTabView</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="field_answer">
@@ -1185,6 +1403,10 @@
<string key="name">label_answer</string>
<string key="candidateClassName">NSTextField</string>
</object>
+ <object class="IBToOneOutletInfo" key="label_filename">
+ <string key="name">label_filename</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
<object class="IBToOneOutletInfo" key="label_intro">
<string key="name">label_intro</string>
<string key="candidateClassName">NSTextField</string>
@@ -1193,6 +1415,10 @@
<string key="name">label_tips</string>
<string key="candidateClassName">NSTextField</string>
</object>
+ <object class="IBToOneOutletInfo" key="tab_answer">
+ <string key="name">tab_answer</string>
+ <string key="candidateClassName">NSTabView</string>
+ </object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
diff -r eaec4182935a -r 59de9d0009e1 Source/AIOTRSMPSecretAnswerWindowController.h
--- a/Source/AIOTRSMPSecretAnswerWindowController.h Wed Jun 05 20:28:42 2013 +0200
+++ b/Source/AIOTRSMPSecretAnswerWindowController.h Wed Jun 19 19:03:11 2013 +0200
@@ -14,18 +14,22 @@
IBOutlet NSTextField *label_intro;
IBOutlet NSTextField *label_answer;
IBOutlet NSTextField *label_tips;
+ IBOutlet NSTextField *label_filename;
IBOutlet NSTextView *field_question;
IBOutlet NSTextView *field_answer;
+ IBOutlet NSTabView *tab_answer;
IBOutlet NSImageView *imageView_lock;
BOOL isInitiator;
NSString *secretQuestion;
AIListContact *contact;
- void(^handler)(NSString *answer, NSString *question);
+ void(^handler)(NSData *answer, NSString *question);
+ NSURL *file;
}
- (IBAction)okay:(id)sender;
- (IBAction)cancel:(id)sender;
-- (id)initWithQuestion:(NSString *)inQuestion from:(AIListContact *)inContact completionHandler:(void(^)(NSString *answer, NSString *question))inHandler isInitiator:(BOOL)inInitiator;
+- (IBAction)selectFile:(id)sender;
+- (id)initWithQuestion:(NSString *)inQuestion from:(AIListContact *)inContact completionHandler:(void(^)(NSData *answer, NSString *question))inHandler isInitiator:(BOOL)inInitiator;
@end
diff -r eaec4182935a -r 59de9d0009e1 Source/AIOTRSMPSecretAnswerWindowController.m
--- a/Source/AIOTRSMPSecretAnswerWindowController.m Wed Jun 05 20:28:42 2013 +0200
+++ b/Source/AIOTRSMPSecretAnswerWindowController.m Wed Jun 19 19:03:11 2013 +0200
@@ -8,10 +8,12 @@
#import "AIOTRSMPSecretAnswerWindowController.h"
#import <AIUtilities/AIImageAdditions.h>
+#import <AIUtilities/AIAttributedStringAdditions.h>
+#import <AIUtilities/AITextAttachmentAdditions.h>
@implementation AIOTRSMPSecretAnswerWindowController
-- (id)initWithQuestion:(NSString *)inQuestion from:(AIListContact *)inContact completionHandler:(void(^)(NSString *answer, NSString *question))inHandler isInitiator:(BOOL)inInitiator
+- (id)initWithQuestion:(NSString *)inQuestion from:(AIListContact *)inContact completionHandler:(void(^)(NSData *answer, NSString *question))inHandler isInitiator:(BOOL)inInitiator
{
if (self = [super initWithWindowNibName:@"AIOTRSMPSecretAnswerWindowController"]) {
secretQuestion = [inQuestion retain];
@@ -27,6 +29,7 @@
{
[secretQuestion release];
[contact release];
+ [file release];
Block_release(handler);
[super dealloc];
@@ -37,6 +40,8 @@
[super windowDidLoad];
[imageView_lock setImage:[NSImage imageNamed:@"lock-locked" forClass:[adium class]]];
+
+ [label_filename setStringValue:AILocalizedString(@"(Nothing selected)", "No file selected on the OTR secret question window")];
if (isInitiator) {
[label_intro setStringValue:[NSString stringWithFormat:AILocalizedString(@"Enter a question only %@ can answer correctly:", nil), contact.UID]];
@@ -62,7 +67,15 @@
- (IBAction)okay:(id)sender
{
- handler([[field_answer textStorage] string], [[field_question textStorage] string]);
+ NSData *answer = nil;
+
+ if ([tab_answer indexOfTabViewItem:[tab_answer selectedTabViewItem]] == 0) {
+ answer = [[[field_answer textStorage] string] dataUsingEncoding:NSUTF8StringEncoding];
+ } else {
+ answer = [NSData dataWithContentsOfURL:file];
+ }
+
+ handler(answer, [[field_question textStorage] string]);
[self close];
[self release];
@@ -76,4 +89,39 @@
[self release];
}
+
+- (IBAction)selectFile:(id)sender
+{
+ NSOpenPanel *openPanel = [NSOpenPanel openPanel];
+
+ [openPanel setCanChooseFiles:YES];
+ [openPanel setCanChooseDirectories:NO];
+ [openPanel setAllowsMultipleSelection:NO];
+
+ NSInteger result = [openPanel runModal];
+
+ if (result == NSOKButton && [openPanel URLs].count > 0) {
+ [file release];
+ file = [[[openPanel URLs] objectAtIndex:0] retain];
+
+ NSMutableAttributedString *fileName = [[[NSMutableAttributedString alloc] init] autorelease];
+
+ NSImage *icon = [[NSWorkspace sharedWorkspace] iconForFile:[file path]];
+
+ [icon setSize:NSMakeSize(16, 16)];
+
+ NSTextAttachmentCell *cell = [[[NSTextAttachmentCell alloc] initImageCell:icon] autorelease];
+
+ NSTextAttachment *attachment = [[[NSTextAttachment alloc] init] autorelease];
+
+ [attachment setAttachmentCell:cell];
+
+ [fileName appendAttributedString:[NSAttributedString attributedStringWithAttachment:attachment]];
+
+ [fileName appendString:[file lastPathComponent] withAttributes:@{}];
+
+ [label_filename setAttributedStringValue:fileName];
+ }
+}
+
@end
diff -r eaec4182935a -r 59de9d0009e1 Source/AdiumOTREncryption.m
--- a/Source/AdiumOTREncryption.m Wed Jun 05 20:28:42 2013 +0200
+++ b/Source/AdiumOTREncryption.m Wed Jun 19 19:03:11 2013 +0200
@@ -730,11 +730,11 @@
AIOTRSMPSecretAnswerWindowController *questionController = [[AIOTRSMPSecretAnswerWindowController alloc]
initWithQuestion:[NSString stringWithUTF8String:question]
from:listContact
- completionHandler:^(NSString *answer,NSString *_question){
+ completionHandler:^(NSData *answer,NSString *_question){
if(!answer) {
otrl_message_abort_smp(otrg_get_userstate(), &ui_ops, opdata, context);
} else
- otrl_message_respond_smp(otrg_get_userstate(), &ui_ops, opdata, context, (const unsigned char*)[answer UTF8String], answer.length);
+ otrl_message_respond_smp(otrg_get_userstate(), &ui_ops, opdata, context, [answer bytes], [answer length]);
More information about the commits
mailing list