adium 5792:0e2a9e3a14ac: Fix a crash when an OTR request comes in.
commits at adium.im
commits at adium.im
Fri Dec 6 12:02:08 UTC 2013
details: http://hg.adium.im/adium/rev/0e2a9e3a14ac
revision: 5792:0e2a9e3a14ac
branch: adium-1.6
author: Thijs Alkemade <me at thijsalkema.de>
date: Fri Dec 06 12:59:00 2013 +0100
Fix a crash when an OTR request comes in.
Subject: adium 5793:331f6ec87599: Fix the verify window cutting off text. Fixes #16472
details: http://hg.adium.im/adium/rev/331f6ec87599
revision: 5793:331f6ec87599
branch: adium-1.6
author: Thijs Alkemade <me at thijsalkema.de>
date: Fri Dec 06 13:00:30 2013 +0100
Fix the verify window cutting off text. Fixes #16472
Subject: adium 5794:82c2ae2ba0c2: Fix the top bar showing up multiple times when chatting with an unverified contact. Mention the UID of the contact in the "Continue logging?" dialogue.
details: http://hg.adium.im/adium/rev/82c2ae2ba0c2
revision: 5794:82c2ae2ba0c2
branch: adium-1.6
author: Thijs Alkemade <me at thijsalkema.de>
date: Fri Dec 06 13:01:44 2013 +0100
Fix the top bar showing up multiple times when chatting with an unverified contact. Mention the UID of the contact in the "Continue logging?" dialogue.
diffs (582 lines):
diff -r 99ee0919c86b -r 82c2ae2ba0c2 Plugins/Secure Messaging/ESSecureMessagingPlugin.m
--- a/Plugins/Secure Messaging/ESSecureMessagingPlugin.m Fri Dec 06 00:15:27 2013 +0100
+++ b/Plugins/Secure Messaging/ESSecureMessagingPlugin.m Fri Dec 06 13:01:44 2013 +0100
@@ -269,8 +269,9 @@
/* Add a status message to the chat */
BOOL chatIsSecure = [inChat isSecure];
if (chatIsSecure != [inChat boolValueForProperty:@"secureMessagingLastEncryptedState"]) {
- NSString *message;
- NSString *type;
+ NSString *message;
+ NSString *type;
+ AIListObject *listObject = [inChat listObject];
[inChat setValue:[NSNumber numberWithBool:chatIsSecure]
forProperty:@"secureMessagingLastEncryptedState"
@@ -278,7 +279,6 @@
if (chatIsSecure) {
if ([inChat encryptionStatus] == EncryptionStatus_Unverified) {
- AIListObject *listObject = [inChat listObject];
NSString *displayName = (listObject ?
listObject.formattedUID :
inChat.displayName);
@@ -306,7 +306,7 @@
if (confirmLoggedOTR) {
NSString *question = AILocalizedString(@"Would you like to turn off logging for the rest of this conversation?", nil);
- [adium.interfaceController displayQuestion:AILocalizedString(@"Your conversation is now encrypted.", nil)
+ [adium.interfaceController displayQuestion:[NSString stringWithFormat:AILocalizedString(@"Your conversation with %@ is now encrypted.", nil), listObject.formattedUID]
withDescription:question
withWindowTitle:AILocalizedString(@"Confirm logging", nil)
defaultButton:AILocalizedString(@"Turn Off", nil)
diff -r 99ee0919c86b -r 82c2ae2ba0c2 Resources/AIOTRTopBarUnverifiedContactController.xib
--- a/Resources/AIOTRTopBarUnverifiedContactController.xib Fri Dec 06 00:15:27 2013 +0100
+++ b/Resources/AIOTRTopBarUnverifiedContactController.xib Fri Dec 06 13:01:44 2013 +0100
@@ -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">12E55</string>
- <string key="IBDocument.InterfaceBuilderVersion">3084</string>
- <string key="IBDocument.AppKitVersion">1187.39</string>
- <string key="IBDocument.HIToolboxVersion">626.00</string>
+ <string key="IBDocument.SystemVersion">13A603</string>
+ <string key="IBDocument.InterfaceBuilderVersion">4514</string>
+ <string key="IBDocument.AppKitVersion">1265</string>
+ <string key="IBDocument.HIToolboxVersion">695.00</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>
@@ -59,9 +59,9 @@
<int key="NSCellFlags2">134217728</int>
<string key="NSContents">Verify...</string>
<object class="NSFont" key="NSSupport">
- <string key="NSName">LucidaGrande</string>
+ <string key="NSName">.LucidaGrandeUI</string>
<double key="NSSize">12</double>
- <int key="NSfFlags">16</int>
+ <int key="NSfFlags">4883</int>
</object>
<string key="NSCellIdentifier">_NS:9</string>
<reference key="NSControlView" ref="382479864"/>
@@ -88,7 +88,7 @@
<int key="NSCellFlags2">4195328</int>
<string key="NSContents">Your conversation is encrypted, but the contact is unverified.</string>
<object class="NSFont" key="NSSupport" id="992535413">
- <string key="NSName">LucidaGrande</string>
+ <string key="NSName">.LucidaGrandeUI</string>
<double key="NSSize">13</double>
<int key="NSfFlags">1044</int>
</object>
@@ -114,6 +114,7 @@
</object>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+ <int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
</object>
</array>
<string key="NSFrameSize">{641, 30}</string>
@@ -145,7 +146,7 @@
<array class="NSMutableArray" key="NSSubviews">
<object class="NSTextField" id="281619715">
<reference key="NSNextResponder" ref="793506965"/>
- <int key="NSvFlags">268</int>
+ <int key="NSvFlags">258</int>
<string key="NSFrame">{{17, 182}, {446, 68}}</string>
<reference key="NSSuperview" ref="793506965"/>
<reference key="NSWindow"/>
@@ -159,11 +160,7 @@
<string type="base64-UTF8" key="NSContents">WW91ciBjb252ZXJzYXRpb24gd2l0aCAlQCBpcyBlbmNyeXB0ZWQuIEhvd2V2ZXIsIHlvdSBzaG91bGQg
bWFrZSBzdXJlIHlvdSByZWFsbHkgYXJlIHRhbGtpbmcgdG8gJUAuCgpZb3UgY2FuIGF1dGhlbnRpY2F0
ZSAlQCBpbiB0aGUgZm9sbG93aW5nIHdheXM6A</string>
- <object class="NSFont" key="NSSupport">
- <string key="NSName">LucidaGrande</string>
- <double key="NSSize">13</double>
- <int key="NSfFlags">16</int>
- </object>
+ <reference key="NSSupport" ref="992535413"/>
<string key="NSCellIdentifier">_NS:9</string>
<reference key="NSControlView" ref="281619715"/>
<reference key="NSBackgroundColor" ref="159824319"/>
@@ -171,10 +168,12 @@
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<bool key="NSControlAutosetMaxLayoutWidth">YES</bool>
+ <double key="NSPreferredMaxLayoutWidth">442</double>
+ <int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
</object>
<object class="NSMatrix" id="810703845">
<reference key="NSNextResponder" ref="793506965"/>
- <int key="NSvFlags">268</int>
+ <int key="NSvFlags">274</int>
<string key="NSFrame">{{20, 86}, {440, 88}}</string>
<reference key="NSSuperview" ref="793506965"/>
<reference key="NSWindow"/>
@@ -240,10 +239,63 @@
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAFwAAAEMAAAB3AAAAnwAAALMAAACzAAAAnwAAAHcAAABD
AAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAu
AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQEAAAMAAAABABIAAAEB
-AAMAAAABABIAAAECAAMAAAAEAAAFugEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES
+AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgEAAAMAAAABABIAAAEB
+AAMAAAABABIAAAECAAMAAAAEAAAFxgEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES
AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS
-AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
+AAMAAAABAAEAAAFTAAMAAAAEAAAFzodzAAcAAAxIAAAF1gAAAAAACAAIAAgACAABAAEAAQABAAAMSExp
+bm8CEAAAbW50clJHQiBYWVogB84AAgAJAAYAMQAAYWNzcE1TRlQAAAAASUVDIHNSR0IAAAAAAAAAAAAA
+AAAAAPbWAAEAAAAA0y1IUCAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAARY3BydAAAAVAAAAAzZGVzYwAAAYQAAABsd3RwdAAAAfAAAAAUYmtwdAAAAgQAAAAUclhZWgAA
+AhgAAAAUZ1hZWgAAAiwAAAAUYlhZWgAAAkAAAAAUZG1uZAAAAlQAAABwZG1kZAAAAsQAAACIdnVlZAAA
+A0wAAACGdmlldwAAA9QAAAAkbHVtaQAAA/gAAAAUbWVhcwAABAwAAAAkdGVjaAAABDAAAAAMclRSQwAA
+BDwAAAgMZ1RSQwAABDwAAAgMYlRSQwAABDwAAAgMdGV4dAAAAABDb3B5cmlnaHQgKGMpIDE5OTggSGV3
+bGV0dC1QYWNrYXJkIENvbXBhbnkAAGRlc2MAAAAAAAAAEnNSR0IgSUVDNjE5NjYtMi4xAAAAAAAAAAAA
+AAASc1JHQiBJRUM2MTk2Ni0yLjEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAFhZWiAAAAAAAADzUQABAAAAARbMWFlaIAAAAAAAAAAAAAAAAAAAAABYWVogAAAAAAAA
+b6IAADj1AAADkFhZWiAAAAAAAABimQAAt4UAABjaWFlaIAAAAAAAACSgAAAPhAAAts9kZXNjAAAAAAAA
+ABZJRUMgaHR0cDovL3d3dy5pZWMuY2gAAAAAAAAAAAAAABZJRUMgaHR0cDovL3d3dy5pZWMuY2gAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZGVzYwAAAAAAAAAuSUVDIDYx
+OTY2LTIuMSBEZWZhdWx0IFJHQiBjb2xvdXIgc3BhY2UgLSBzUkdCAAAAAAAAAAAAAAAuSUVDIDYxOTY2
+LTIuMSBEZWZhdWx0IFJHQiBjb2xvdXIgc3BhY2UgLSBzUkdCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGRl
+c2MAAAAAAAAALFJlZmVyZW5jZSBWaWV3aW5nIENvbmRpdGlvbiBpbiBJRUM2MTk2Ni0yLjEAAAAAAAAA
+AAAAACxSZWZlcmVuY2UgVmlld2luZyBDb25kaXRpb24gaW4gSUVDNjE5NjYtMi4xAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAB2aWV3AAAAAAATpP4AFF8uABDPFAAD7cwABBMLAANcngAAAAFYWVogAAAAAABM
+CVYAUAAAAFcf521lYXMAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAKPAAAAAnNpZyAAAAAAQ1JUIGN1
+cnYAAAAAAAAEAAAAAAUACgAPABQAGQAeACMAKAAtADIANwA7AEAARQBKAE8AVABZAF4AYwBoAG0AcgB3
+AHwAgQCGAIsAkACVAJoAnwCkAKkArgCyALcAvADBAMYAywDQANUA2wDgAOUA6wDwAPYA+wEBAQcBDQET
+ARkBHwElASsBMgE4AT4BRQFMAVIBWQFgAWcBbgF1AXwBgwGLAZIBmgGhAakBsQG5AcEByQHRAdkB4QHp
+AfIB+gIDAgwCFAIdAiYCLwI4AkECSwJUAl0CZwJxAnoChAKOApgCogKsArYCwQLLAtUC4ALrAvUDAAML
+AxYDIQMtAzgDQwNPA1oDZgNyA34DigOWA6IDrgO6A8cD0wPgA+wD+QQGBBMEIAQtBDsESARVBGMEcQR+
+BIwEmgSoBLYExATTBOEE8AT+BQ0FHAUrBToFSQVYBWcFdwWGBZYFpgW1BcUF1QXlBfYGBgYWBicGNwZI
+BlkGagZ7BowGnQavBsAG0QbjBvUHBwcZBysHPQdPB2EHdAeGB5kHrAe/B9IH5Qf4CAsIHwgyCEYIWghu
+CIIIlgiqCL4I0gjnCPsJEAklCToJTwlkCXkJjwmkCboJzwnlCfsKEQonCj0KVApqCoEKmAquCsUK3Arz
+CwsLIgs5C1ELaQuAC5gLsAvIC+EL+QwSDCoMQwxcDHUMjgynDMAM2QzzDQ0NJg1ADVoNdA2ODakNww3e
+DfgOEw4uDkkOZA5/DpsOtg7SDu4PCQ8lD0EPXg96D5YPsw/PD+wQCRAmEEMQYRB+EJsQuRDXEPURExEx
+EU8RbRGMEaoRyRHoEgcSJhJFEmQShBKjEsMS4xMDEyMTQxNjE4MTpBPFE+UUBhQnFEkUahSLFK0UzhTw
+FRIVNBVWFXgVmxW9FeAWAxYmFkkWbBaPFrIW1hb6Fx0XQRdlF4kXrhfSF/cYGxhAGGUYihivGNUY+hkg
+GUUZaxmRGbcZ3RoEGioaURp3Gp4axRrsGxQbOxtjG4obshvaHAIcKhxSHHscoxzMHPUdHh1HHXAdmR3D
+HeweFh5AHmoelB6+HukfEx8+H2kflB+/H+ogFSBBIGwgmCDEIPAhHCFIIXUhoSHOIfsiJyJVIoIiryLd
+IwojOCNmI5QjwiPwJB8kTSR8JKsk2iUJJTglaCWXJccl9yYnJlcmhya3JugnGCdJJ3onqyfcKA0oPyhx
+KKIo1CkGKTgpaymdKdAqAio1KmgqmyrPKwIrNitpK50r0SwFLDksbiyiLNctDC1BLXYtqy3hLhYuTC6C
+Lrcu7i8kL1ovkS/HL/4wNTBsMKQw2zESMUoxgjG6MfIyKjJjMpsy1DMNM0YzfzO4M/E0KzRlNJ402DUT
+NU01hzXCNf02NzZyNq426TckN2A3nDfXOBQ4UDiMOMg5BTlCOX85vDn5OjY6dDqyOu87LTtrO6o76Dwn
+PGU8pDzjPSI9YT2hPeA+ID5gPqA+4D8hP2E/oj/iQCNAZECmQOdBKUFqQaxB7kIwQnJCtUL3QzpDfUPA
+RANER0SKRM5FEkVVRZpF3kYiRmdGq0bwRzVHe0fASAVIS0iRSNdJHUljSalJ8Eo3Sn1KxEsMS1NLmkvi
+TCpMcky6TQJNSk2TTdxOJU5uTrdPAE9JT5NP3VAnUHFQu1EGUVBRm1HmUjFSfFLHUxNTX1OqU/ZUQlSP
+VNtVKFV1VcJWD1ZcVqlW91dEV5JX4FgvWH1Yy1kaWWlZuFoHWlZaplr1W0VblVvlXDVchlzWXSddeF3J
+XhpebF69Xw9fYV+zYAVgV2CqYPxhT2GiYfViSWKcYvBjQ2OXY+tkQGSUZOllPWWSZedmPWaSZuhnPWeT
+Z+loP2iWaOxpQ2maafFqSGqfavdrT2una/9sV2yvbQhtYG25bhJua27Ebx5veG/RcCtwhnDgcTpxlXHw
+cktypnMBc11zuHQUdHB0zHUodYV14XY+dpt2+HdWd7N4EXhueMx5KnmJeed6RnqlewR7Y3vCfCF8gXzh
+fUF9oX4BfmJ+wn8jf4R/5YBHgKiBCoFrgc2CMIKSgvSDV4O6hB2EgITjhUeFq4YOhnKG14c7h5+IBIhp
+iM6JM4mZif6KZIrKizCLlov8jGOMyo0xjZiN/45mjs6PNo+ekAaQbpDWkT+RqJIRknqS45NNk7aUIJSK
+lPSVX5XJljSWn5cKl3WX4JhMmLiZJJmQmfyaaJrVm0Kbr5wcnImc951kndKeQJ6unx2fi5/6oGmg2KFH
+obaiJqKWowajdqPmpFakx6U4pammGqaLpv2nbqfgqFKoxKk3qamqHKqPqwKrdavprFys0K1ErbiuLa6h
+rxavi7AAsHWw6rFgsdayS7LCszizrrQltJy1E7WKtgG2ebbwt2i34LhZuNG5SrnCuju6tbsuu6e8Ibyb
+vRW9j74KvoS+/796v/XAcMDswWfB48JfwtvDWMPUxFHEzsVLxcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2
+y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
+2vvbgNwF3IrdEN2W3hzeot8p36/gNuC94UThzOJT4tvjY+Pr5HPk/OWE5g3mlucf56noMui86Ubp0Opb
+6uXrcOv77IbtEe2c7ijutO9A78zwWPDl8XLx//KM8xnzp/Q09ML1UPXe9m32+/eK+Bn4qPk4+cf6V/rn
++3f8B/yY/Sn9uv5L/tz/bf//A</bytes>
</object>
</object>
</array>
@@ -271,7 +323,7 @@
<int key="NSPeriodicInterval">75</int>
</object>
</array>
- <string key="NSCellSize">{440, 28}</string>
+ <string key="NSCellSize">{364, 18}</string>
<string key="NSIntercellSpacing">{4, 2}</string>
<int key="NSMatrixFlags">1151868928</int>
<string key="NSCellClass">NSActionCell</string>
@@ -311,10 +363,63 @@
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAFwAAAEMAAAB3AAAAnwAAALMAAACzAAAAnwAAAHcAAABD
AAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAu
AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQEAAAMAAAABABIAAAEB
-AAMAAAABABIAAAECAAMAAAAEAAAFugEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES
+AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgEAAAMAAAABABIAAAEB
+AAMAAAABABIAAAECAAMAAAAEAAAFxgEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES
AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS
-AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
+AAMAAAABAAEAAAFTAAMAAAAEAAAFzodzAAcAAAxIAAAF1gAAAAAACAAIAAgACAABAAEAAQABAAAMSExp
+bm8CEAAAbW50clJHQiBYWVogB84AAgAJAAYAMQAAYWNzcE1TRlQAAAAASUVDIHNSR0IAAAAAAAAAAAAA
+AAAAAPbWAAEAAAAA0y1IUCAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAARY3BydAAAAVAAAAAzZGVzYwAAAYQAAABsd3RwdAAAAfAAAAAUYmtwdAAAAgQAAAAUclhZWgAA
+AhgAAAAUZ1hZWgAAAiwAAAAUYlhZWgAAAkAAAAAUZG1uZAAAAlQAAABwZG1kZAAAAsQAAACIdnVlZAAA
+A0wAAACGdmlldwAAA9QAAAAkbHVtaQAAA/gAAAAUbWVhcwAABAwAAAAkdGVjaAAABDAAAAAMclRSQwAA
+BDwAAAgMZ1RSQwAABDwAAAgMYlRSQwAABDwAAAgMdGV4dAAAAABDb3B5cmlnaHQgKGMpIDE5OTggSGV3
+bGV0dC1QYWNrYXJkIENvbXBhbnkAAGRlc2MAAAAAAAAAEnNSR0IgSUVDNjE5NjYtMi4xAAAAAAAAAAAA
+AAASc1JHQiBJRUM2MTk2Ni0yLjEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAFhZWiAAAAAAAADzUQABAAAAARbMWFlaIAAAAAAAAAAAAAAAAAAAAABYWVogAAAAAAAA
+b6IAADj1AAADkFhZWiAAAAAAAABimQAAt4UAABjaWFlaIAAAAAAAACSgAAAPhAAAts9kZXNjAAAAAAAA
+ABZJRUMgaHR0cDovL3d3dy5pZWMuY2gAAAAAAAAAAAAAABZJRUMgaHR0cDovL3d3dy5pZWMuY2gAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZGVzYwAAAAAAAAAuSUVDIDYx
+OTY2LTIuMSBEZWZhdWx0IFJHQiBjb2xvdXIgc3BhY2UgLSBzUkdCAAAAAAAAAAAAAAAuSUVDIDYxOTY2
+LTIuMSBEZWZhdWx0IFJHQiBjb2xvdXIgc3BhY2UgLSBzUkdCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGRl
+c2MAAAAAAAAALFJlZmVyZW5jZSBWaWV3aW5nIENvbmRpdGlvbiBpbiBJRUM2MTk2Ni0yLjEAAAAAAAAA
+AAAAACxSZWZlcmVuY2UgVmlld2luZyBDb25kaXRpb24gaW4gSUVDNjE5NjYtMi4xAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAB2aWV3AAAAAAATpP4AFF8uABDPFAAD7cwABBMLAANcngAAAAFYWVogAAAAAABM
+CVYAUAAAAFcf521lYXMAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAKPAAAAAnNpZyAAAAAAQ1JUIGN1
+cnYAAAAAAAAEAAAAAAUACgAPABQAGQAeACMAKAAtADIANwA7AEAARQBKAE8AVABZAF4AYwBoAG0AcgB3
+AHwAgQCGAIsAkACVAJoAnwCkAKkArgCyALcAvADBAMYAywDQANUA2wDgAOUA6wDwAPYA+wEBAQcBDQET
+ARkBHwElASsBMgE4AT4BRQFMAVIBWQFgAWcBbgF1AXwBgwGLAZIBmgGhAakBsQG5AcEByQHRAdkB4QHp
+AfIB+gIDAgwCFAIdAiYCLwI4AkECSwJUAl0CZwJxAnoChAKOApgCogKsArYCwQLLAtUC4ALrAvUDAAML
+AxYDIQMtAzgDQwNPA1oDZgNyA34DigOWA6IDrgO6A8cD0wPgA+wD+QQGBBMEIAQtBDsESARVBGMEcQR+
+BIwEmgSoBLYExATTBOEE8AT+BQ0FHAUrBToFSQVYBWcFdwWGBZYFpgW1BcUF1QXlBfYGBgYWBicGNwZI
+BlkGagZ7BowGnQavBsAG0QbjBvUHBwcZBysHPQdPB2EHdAeGB5kHrAe/B9IH5Qf4CAsIHwgyCEYIWghu
+CIIIlgiqCL4I0gjnCPsJEAklCToJTwlkCXkJjwmkCboJzwnlCfsKEQonCj0KVApqCoEKmAquCsUK3Arz
+CwsLIgs5C1ELaQuAC5gLsAvIC+EL+QwSDCoMQwxcDHUMjgynDMAM2QzzDQ0NJg1ADVoNdA2ODakNww3e
+DfgOEw4uDkkOZA5/DpsOtg7SDu4PCQ8lD0EPXg96D5YPsw/PD+wQCRAmEEMQYRB+EJsQuRDXEPURExEx
+EU8RbRGMEaoRyRHoEgcSJhJFEmQShBKjEsMS4xMDEyMTQxNjE4MTpBPFE+UUBhQnFEkUahSLFK0UzhTw
+FRIVNBVWFXgVmxW9FeAWAxYmFkkWbBaPFrIW1hb6Fx0XQRdlF4kXrhfSF/cYGxhAGGUYihivGNUY+hkg
+GUUZaxmRGbcZ3RoEGioaURp3Gp4axRrsGxQbOxtjG4obshvaHAIcKhxSHHscoxzMHPUdHh1HHXAdmR3D
+HeweFh5AHmoelB6+HukfEx8+H2kflB+/H+ogFSBBIGwgmCDEIPAhHCFIIXUhoSHOIfsiJyJVIoIiryLd
+IwojOCNmI5QjwiPwJB8kTSR8JKsk2iUJJTglaCWXJccl9yYnJlcmhya3JugnGCdJJ3onqyfcKA0oPyhx
+KKIo1CkGKTgpaymdKdAqAio1KmgqmyrPKwIrNitpK50r0SwFLDksbiyiLNctDC1BLXYtqy3hLhYuTC6C
+Lrcu7i8kL1ovkS/HL/4wNTBsMKQw2zESMUoxgjG6MfIyKjJjMpsy1DMNM0YzfzO4M/E0KzRlNJ402DUT
+NU01hzXCNf02NzZyNq426TckN2A3nDfXOBQ4UDiMOMg5BTlCOX85vDn5OjY6dDqyOu87LTtrO6o76Dwn
+PGU8pDzjPSI9YT2hPeA+ID5gPqA+4D8hP2E/oj/iQCNAZECmQOdBKUFqQaxB7kIwQnJCtUL3QzpDfUPA
+RANER0SKRM5FEkVVRZpF3kYiRmdGq0bwRzVHe0fASAVIS0iRSNdJHUljSalJ8Eo3Sn1KxEsMS1NLmkvi
+TCpMcky6TQJNSk2TTdxOJU5uTrdPAE9JT5NP3VAnUHFQu1EGUVBRm1HmUjFSfFLHUxNTX1OqU/ZUQlSP
+VNtVKFV1VcJWD1ZcVqlW91dEV5JX4FgvWH1Yy1kaWWlZuFoHWlZaplr1W0VblVvlXDVchlzWXSddeF3J
+XhpebF69Xw9fYV+zYAVgV2CqYPxhT2GiYfViSWKcYvBjQ2OXY+tkQGSUZOllPWWSZedmPWaSZuhnPWeT
+Z+loP2iWaOxpQ2maafFqSGqfavdrT2una/9sV2yvbQhtYG25bhJua27Ebx5veG/RcCtwhnDgcTpxlXHw
+cktypnMBc11zuHQUdHB0zHUodYV14XY+dpt2+HdWd7N4EXhueMx5KnmJeed6RnqlewR7Y3vCfCF8gXzh
+fUF9oX4BfmJ+wn8jf4R/5YBHgKiBCoFrgc2CMIKSgvSDV4O6hB2EgITjhUeFq4YOhnKG14c7h5+IBIhp
+iM6JM4mZif6KZIrKizCLlov8jGOMyo0xjZiN/45mjs6PNo+ekAaQbpDWkT+RqJIRknqS45NNk7aUIJSK
+lPSVX5XJljSWn5cKl3WX4JhMmLiZJJmQmfyaaJrVm0Kbr5wcnImc951kndKeQJ6unx2fi5/6oGmg2KFH
+obaiJqKWowajdqPmpFakx6U4pammGqaLpv2nbqfgqFKoxKk3qamqHKqPqwKrdavprFys0K1ErbiuLa6h
+rxavi7AAsHWw6rFgsdayS7LCszizrrQltJy1E7WKtgG2ebbwt2i34LhZuNG5SrnCuju6tbsuu6e8Ibyb
+vRW9j74KvoS+/796v/XAcMDswWfB48JfwtvDWMPUxFHEzsVLxcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2
+y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
+2vvbgNwF3IrdEN2W3hzeot8p36/gNuC94UThzOJT4tvjY+Pr5HPk/OWE5g3mlucf56noMui86Ubp0Opb
+6uXrcOv77IbtEe2c7ijutO9A78zwWPDl8XLx//KM8xnzp/Q09ML1UPXe9m32+/eK+Bn4qPk4+cf6V/rn
++3f8B/yY/Sn9uv5L/tz/bf//A</bytes>
</object>
</object>
</array>
@@ -396,6 +501,7 @@
</object>
</array>
<object class="IBObjectContainer" key="IBDocument.Objects">
+ <bool key="usesAutoincrementingIDs">NO</bool>
<array class="NSMutableArray" key="connectionRecords">
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
@@ -403,7 +509,7 @@
<reference key="source" ref="1001"/>
<reference key="destination" ref="209947746"/>
</object>
- <int key="connectionID">18</int>
+ <string key="id">18</string>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
@@ -411,7 +517,7 @@
<reference key="source" ref="1001"/>
<reference key="destination" ref="709009510"/>
</object>
- <int key="connectionID">19</int>
+ <string key="id">19</string>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
@@ -419,7 +525,7 @@
<reference key="source" ref="1001"/>
<reference key="destination" ref="453567343"/>
</object>
- <int key="connectionID">21</int>
+ <string key="id">21</string>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
@@ -427,7 +533,7 @@
<reference key="source" ref="1001"/>
<reference key="destination" ref="382479864"/>
</object>
- <int key="connectionID">22</int>
+ <string key="id">22</string>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
@@ -435,7 +541,7 @@
<reference key="source" ref="1001"/>
<reference key="destination" ref="382479864"/>
</object>
- <int key="connectionID">23</int>
+ <string key="id">23</string>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
@@ -443,7 +549,7 @@
<reference key="source" ref="1001"/>
<reference key="destination" ref="121513570"/>
</object>
- <int key="connectionID">37</int>
+ <string key="id">37</string>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
@@ -451,7 +557,7 @@
<reference key="source" ref="1001"/>
<reference key="destination" ref="281619715"/>
</object>
- <int key="connectionID">39</int>
+ <string key="id">39</string>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
@@ -459,7 +565,7 @@
<reference key="source" ref="1001"/>
<reference key="destination" ref="810703845"/>
</object>
- <int key="connectionID">40</int>
+ <string key="id">40</string>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
@@ -467,7 +573,7 @@
<reference key="source" ref="1001"/>
<reference key="destination" ref="142825019"/>
</object>
- <int key="connectionID">41</int>
+ <string key="id">41</string>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
@@ -475,37 +581,37 @@
<reference key="source" ref="1001"/>
<reference key="destination" ref="716389044"/>
</object>
- <int key="connectionID">42</int>
+ <string key="id">42</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="1000"/>
<nil key="parent"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">-2</int>
+ <string key="id">-2</string>
<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>
+ <string key="id">-1</string>
<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>
+ <string key="id">-3</string>
<reference key="object" ref="1004"/>
<reference key="parent" ref="0"/>
<string key="objectName">Application</string>
</object>
<object class="IBObjectRecord">
- <int key="objectID">3</int>
+ <string key="id">3</string>
<reference key="object" ref="209947746"/>
<array class="NSMutableArray" key="children">
<reference ref="709009510"/>
@@ -513,7 +619,7 @@
<reference key="parent" ref="0"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">4</int>
+ <string key="id">4</string>
<reference key="object" ref="709009510"/>
<array class="NSMutableArray" key="children">
<reference ref="382479864"/>
@@ -522,7 +628,7 @@
<reference key="parent" ref="209947746"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">5</int>
+ <string key="id">5</string>
<reference key="object" ref="382479864"/>
<array class="NSMutableArray" key="children">
<reference ref="271828053"/>
@@ -530,12 +636,12 @@
<reference key="parent" ref="709009510"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">8</int>
+ <string key="id">8</string>
<reference key="object" ref="271828053"/>
<reference key="parent" ref="382479864"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">6</int>
+ <string key="id">6</string>
<reference key="object" ref="453567343"/>
<array class="NSMutableArray" key="children">
<reference ref="667515101"/>
@@ -543,12 +649,12 @@
<reference key="parent" ref="709009510"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">7</int>
+ <string key="id">7</string>
<reference key="object" ref="667515101"/>
<reference key="parent" ref="453567343"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">24</int>
+ <string key="id">24</string>
<reference key="object" ref="121513570"/>
<array class="NSMutableArray" key="children">
<reference ref="793506965"/>
@@ -556,7 +662,7 @@
<reference key="parent" ref="0"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">25</int>
+ <string key="id">25</string>
<reference key="object" ref="793506965"/>
<array class="NSMutableArray" key="children">
<reference ref="281619715"/>
@@ -567,7 +673,7 @@
<reference key="parent" ref="121513570"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">26</int>
+ <string key="id">26</string>
<reference key="object" ref="281619715"/>
<array class="NSMutableArray" key="children">
<reference ref="731970894"/>
@@ -575,12 +681,12 @@
<reference key="parent" ref="793506965"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">27</int>
+ <string key="id">27</string>
<reference key="object" ref="731970894"/>
<reference key="parent" ref="281619715"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">28</int>
+ <string key="id">28</string>
<reference key="object" ref="810703845"/>
<array class="NSMutableArray" key="children">
<reference ref="256775107"/>
@@ -591,27 +697,27 @@
<reference key="parent" ref="793506965"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">29</int>
+ <string key="id">29</string>
<reference key="object" ref="256775107"/>
<reference key="parent" ref="810703845"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">30</int>
+ <string key="id">30</string>
<reference key="object" ref="822288046"/>
<reference key="parent" ref="810703845"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">31</int>
+ <string key="id">31</string>
<reference key="object" ref="88203082"/>
<reference key="parent" ref="810703845"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">32</int>
+ <string key="id">32</string>
<reference key="object" ref="584378176"/>
<reference key="parent" ref="810703845"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">33</int>
+ <string key="id">33</string>
<reference key="object" ref="142825019"/>
<array class="NSMutableArray" key="children">
<reference ref="784593831"/>
@@ -619,12 +725,12 @@
<reference key="parent" ref="793506965"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">34</int>
+ <string key="id">34</string>
<reference key="object" ref="784593831"/>
<reference key="parent" ref="142825019"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">35</int>
+ <string key="id">35</string>
<reference key="object" ref="716389044"/>
<array class="NSMutableArray" key="children">
<reference ref="524015224"/>
@@ -632,7 +738,7 @@
<reference key="parent" ref="793506965"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">36</int>
+ <string key="id">36</string>
<reference key="object" ref="524015224"/>
<reference key="parent" ref="716389044"/>
</object>
@@ -673,7 +779,6 @@
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
- <int key="maxID">42</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -851,10 +956,19 @@
</object>
<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"/>
+ </object>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
+ <integer value="4600" key="NS.object.0"/>
+ </object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
</data>
diff -r 99ee0919c86b -r 82c2ae2ba0c2 Source/AdiumOTREncryption.m
--- a/Source/AdiumOTREncryption.m Fri Dec 06 00:15:27 2013 +0100
+++ b/Source/AdiumOTREncryption.m Fri Dec 06 13:01:44 2013 +0100
@@ -675,6 +675,8 @@
}
if (interval > 0) {
+ timer = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, dispatch_get_main_queue());
+
dispatch_source_set_timer(timer, dispatch_time(DISPATCH_TIME_NOW, interval * NSEC_PER_SEC), interval * NSEC_PER_SEC, NSEC_PER_SEC);
dispatch_source_set_event_handler(timer, ^{
@@ -1080,7 +1082,7 @@
NSInteger newEncryptionStatus = [[securityDetailsDict objectForKey:@"EncryptionStatus"] integerValue];
- if (newEncryptionStatus == EncryptionStatus_Unverified) {
+ if (newEncryptionStatus == EncryptionStatus_Unverified && oldEncryptionStatus != EncryptionStatus_Unverified) {
AIOTRTopBarUnverifiedContactController *warningController = [[AIOTRTopBarUnverifiedContactController alloc] init];
AIMessageViewController *mvc = [[inChat chatContainer] messageViewController];
[mvc addTopBarController:warningController];
More information about the commits
mailing list