adium 5587:590779dec396: Verify and allow inspection of an IRC s...
commits at adium.im
commits at adium.im
Tue Jun 25 11:27:15 UTC 2013
details: http://hg.adium.im/adium/rev/590779dec396
revision: 5587:590779dec396
branch: adium-1.6
author: Thijs Alkemade <me at thijsalkema.de>
date: Tue Jun 25 13:25:27 2013 +0200
Verify and allow inspection of an IRC server's certificate. The option to "Do strict certificate checks" is gone, checks are now always strict. If the cert can't be verified, you should accept it manually once, instead of turning this option off.
diffs (540 lines):
diff -r 8dd676d7398d -r 590779dec396 Plugins/Purple Service/ESIRCAccount.m
--- a/Plugins/Purple Service/ESIRCAccount.m Tue Jun 25 02:24:24 2013 +0200
+++ b/Plugins/Purple Service/ESIRCAccount.m Tue Jun 25 13:25:27 2013 +0200
@@ -375,6 +375,18 @@
return NO;
}
+- (PurpleSslConnection *)secureConnection {
+ // this is really ugly
+ PurpleConnection *gc = purple_account_get_connection(self.purpleAccount);
+
+ return ((gc && gc->proto_data) ? ((struct irc_conn*)purple_account_get_connection(self.purpleAccount)->proto_data)->gsc : NULL);
+}
+
+- (BOOL)encrypted
+{
+ return (self.online && [self secureConnection]);
+}
+
#pragma mark Server contacts (NickServ, ChanServ)
/*!
* @brief Sends a raw command to identify for the nickname
diff -r 8dd676d7398d -r 590779dec396 Plugins/Purple Service/ESPurpleJabberAccount.h
--- a/Plugins/Purple Service/ESPurpleJabberAccount.h Tue Jun 25 02:24:24 2013 +0200
+++ b/Plugins/Purple Service/ESPurpleJabberAccount.h Tue Jun 25 13:25:27 2013 +0200
@@ -47,7 +47,5 @@
- (NSString *)serverSuffix;
- (NSString *)resourceName;
- (AMPurpleJabberAdHocServer*)adhocServer;
-- (void)setShouldVerifyCertificates:(BOOL)yesOrNo;
-- (BOOL)shouldVerifyCertificates;
@end
diff -r 8dd676d7398d -r 590779dec396 Plugins/Purple Service/ESPurpleJabberAccount.m
--- a/Plugins/Purple Service/ESPurpleJabberAccount.m Tue Jun 25 02:24:24 2013 +0200
+++ b/Plugins/Purple Service/ESPurpleJabberAccount.m Tue Jun 25 13:25:27 2013 +0200
@@ -461,8 +461,7 @@
{
AIReconnectDelayType shouldAttemptReconnect = [super shouldAttemptReconnectAfterDisconnectionError:disconnectionError];
- if (([self lastDisconnectionReason] == PURPLE_CONNECTION_ERROR_CERT_OTHER_ERROR) &&
- ([self shouldVerifyCertificates])) {
+ if (([self lastDisconnectionReason] == PURPLE_CONNECTION_ERROR_CERT_OTHER_ERROR)) {
shouldAttemptReconnect = AIReconnectNever;
} else if (!finishedConnectProcess && ![password length] &&
(disconnectionError &&
@@ -867,14 +866,6 @@
return ((gc && gc->proto_data) ? ((JabberStream*)purple_account_get_connection(self.purpleAccount)->proto_data)->gsc : NULL);
}
-- (void)setShouldVerifyCertificates:(BOOL)yesOrNo {
- [self setPreference:[NSNumber numberWithBool:yesOrNo] forKey:KEY_JABBER_VERIFY_CERTS group:GROUP_ACCOUNT_STATUS];
-}
-
-- (BOOL)shouldVerifyCertificates {
- return [[self preferenceForKey:KEY_JABBER_VERIFY_CERTS group:GROUP_ACCOUNT_STATUS] boolValue];
-}
-
- (NSArray *)accountActionMenuItems {
AILog(@"Getting accountActionMenuItems for %@",self);
NSMutableArray *menu = [[NSMutableArray alloc] init];
diff -r 8dd676d7398d -r 590779dec396 Plugins/Purple Service/Resources/en.lproj/ESPurpleJabberAccountView.xib
--- a/Plugins/Purple Service/Resources/en.lproj/ESPurpleJabberAccountView.xib Tue Jun 25 02:24:24 2013 +0200
+++ b/Plugins/Purple Service/Resources/en.lproj/ESPurpleJabberAccountView.xib Tue Jun 25 13:25:27 2013 +0200
@@ -2,10 +2,10 @@
<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.SystemVersion">12D78</string>
<string key="IBDocument.InterfaceBuilderVersion">3084</string>
- <string key="IBDocument.AppKitVersion">1187.34</string>
- <string key="IBDocument.HIToolboxVersion">625.00</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">3084</string>
@@ -229,14 +229,15 @@
<string key="NSExtension">NSResponder</string>
</object>
<object class="NSCustomView" id="881248978">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="NSButton" id="611926856">
<reference key="NSNextResponder" ref="881248978"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{160, 113}, {212, 18}}</string>
+ <string key="NSFrame">{{160, 97}, {212, 18}}</string>
<reference key="NSSuperview" ref="881248978"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="685121442">
<int key="NSCellFlags">67108864</int>
@@ -258,8 +259,9 @@
<object class="NSButton" id="1069823102">
<reference key="NSNextResponder" ref="881248978"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{160, 93}, {143, 18}}</string>
+ <string key="NSFrame">{{160, 77}, {143, 18}}</string>
<reference key="NSSuperview" ref="881248978"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="866512058">
<int key="NSCellFlags">67108864</int>
@@ -281,8 +283,9 @@
<object class="NSButton" id="767871570">
<reference key="NSNextResponder" ref="881248978"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{160, 160}, {211, 18}}</string>
+ <string key="NSFrame">{{160, 144}, {211, 18}}</string>
<reference key="NSSuperview" ref="881248978"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="355466928">
<int key="NSCellFlags">67108864</int>
@@ -304,8 +307,9 @@
<object class="NSTextField" id="23953802">
<reference key="NSNextResponder" ref="881248978"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{162, 283}, {240, 22}}</string>
+ <string key="NSFrame">{{162, 267}, {240, 22}}</string>
<reference key="NSSuperview" ref="881248978"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="557983517">
<int key="NSCellFlags">-1804599231</int>
@@ -322,8 +326,9 @@
<object class="NSTextField" id="795157005">
<reference key="NSNextResponder" ref="881248978"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{17, 285}, {140, 17}}</string>
+ <string key="NSFrame">{{17, 269}, {140, 17}}</string>
<reference key="NSSuperview" ref="881248978"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="1046731873">
<int key="NSCellFlags">67108864</int>
@@ -339,8 +344,9 @@
<object class="NSTextField" id="993950755">
<reference key="NSNextResponder" ref="881248978"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{162, 311}, {240, 22}}</string>
+ <string key="NSFrame">{{162, 295}, {240, 22}}</string>
<reference key="NSSuperview" ref="881248978"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="897297612">
<int key="NSCellFlags">-1804599231</int>
@@ -357,8 +363,9 @@
<object class="NSTextField" id="416544706">
<reference key="NSNextResponder" ref="881248978"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{17, 313}, {140, 17}}</string>
+ <string key="NSFrame">{{17, 297}, {140, 17}}</string>
<reference key="NSSuperview" ref="881248978"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="675922156">
<int key="NSCellFlags">67108864</int>
@@ -374,8 +381,9 @@
<object class="NSTextField" id="223022732">
<reference key="NSNextResponder" ref="881248978"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{162, 253}, {240, 22}}</string>
+ <string key="NSFrame">{{162, 237}, {240, 22}}</string>
<reference key="NSSuperview" ref="881248978"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="483716033">
<int key="NSCellFlags">-1804599231</int>
@@ -392,8 +400,9 @@
<object class="NSTextField" id="1071692987">
<reference key="NSNextResponder" ref="881248978"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{17, 255}, {140, 17}}</string>
+ <string key="NSFrame">{{17, 239}, {140, 17}}</string>
<reference key="NSSuperview" ref="881248978"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="275398507">
<int key="NSCellFlags">67108864</int>
@@ -409,8 +418,9 @@
<object class="NSTextField" id="979941359">
<reference key="NSNextResponder" ref="881248978"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{329, 223}, {73, 22}}</string>
+ <string key="NSFrame">{{329, 207}, {73, 22}}</string>
<reference key="NSSuperview" ref="881248978"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="474262400">
<int key="NSCellFlags">-1804599231</int>
@@ -427,8 +437,9 @@
<object class="NSTextField" id="198507305">
<reference key="NSNextResponder" ref="881248978"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{286, 225}, {38, 17}}</string>
+ <string key="NSFrame">{{286, 209}, {38, 17}}</string>
<reference key="NSSuperview" ref="881248978"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="937801845">
<int key="NSCellFlags">67108864</int>
@@ -444,8 +455,9 @@
<object class="NSTextField" id="56382938">
<reference key="NSNextResponder" ref="881248978"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{162, 223}, {119, 22}}</string>
+ <string key="NSFrame">{{162, 207}, {119, 22}}</string>
<reference key="NSSuperview" ref="881248978"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="27008867">
<int key="NSCellFlags">-1804599231</int>
@@ -462,8 +474,9 @@
<object class="NSTextField" id="164156726">
<reference key="NSNextResponder" ref="881248978"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{17, 225}, {140, 17}}</string>
+ <string key="NSFrame">{{17, 209}, {140, 17}}</string>
<reference key="NSSuperview" ref="881248978"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="820922822">
<int key="NSCellFlags">67108864</int>
@@ -479,8 +492,9 @@
<object class="NSTextField" id="1036357624">
<reference key="NSNextResponder" ref="881248978"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{17, 161}, {140, 17}}</string>
+ <string key="NSFrame">{{17, 145}, {140, 17}}</string>
<reference key="NSSuperview" ref="881248978"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="260175574">
<int key="NSCellFlags">67108864</int>
@@ -496,8 +510,9 @@
<object class="NSTextField" id="835653998">
<reference key="NSNextResponder" ref="881248978"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{17, 114}, {140, 17}}</string>
+ <string key="NSFrame">{{17, 98}, {140, 17}}</string>
<reference key="NSSuperview" ref="881248978"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="230227050">
<int key="NSCellFlags">67108864</int>
@@ -513,8 +528,9 @@
<object class="NSTextField" id="909698960">
<reference key="NSNextResponder" ref="881248978"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{43, 192}, {114, 17}}</string>
+ <string key="NSFrame">{{43, 176}, {114, 17}}</string>
<reference key="NSSuperview" ref="881248978"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="1007024952">
<int key="NSCellFlags">67108864</int>
@@ -530,8 +546,9 @@
<object class="NSTextField" id="348268130">
<reference key="NSNextResponder" ref="881248978"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{162, 189}, {61, 23}}</string>
+ <string key="NSFrame">{{162, 173}, {61, 23}}</string>
<reference key="NSSuperview" ref="881248978"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="1041524998">
<int key="NSCellFlags">-1804599231</int>
@@ -548,8 +565,9 @@
<object class="NSTextField" id="463018609">
<reference key="NSNextResponder" ref="881248978"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{233, 192}, {91, 17}}</string>
+ <string key="NSFrame">{{233, 176}, {91, 17}}</string>
<reference key="NSSuperview" ref="881248978"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="277652672">
<int key="NSCellFlags">67108864</int>
@@ -565,8 +583,9 @@
<object class="NSTextField" id="400793057">
<reference key="NSNextResponder" ref="881248978"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{329, 188}, {73, 24}}</string>
+ <string key="NSFrame">{{329, 172}, {73, 24}}</string>
<reference key="NSSuperview" ref="881248978"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="481365549">
<int key="NSCellFlags">-1804599231</int>
@@ -583,8 +602,9 @@
<object class="NSPopUpButton" id="86797681">
<reference key="NSNextResponder" ref="881248978"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{159, 23}, {198, 26}}</string>
+ <string key="NSFrame">{{159, 27}, {198, 26}}</string>
<reference key="NSSuperview" ref="881248978"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="686819324">
<int key="NSCellFlags">-2080374720</int>
@@ -673,8 +693,9 @@
<object class="NSTextField" id="129057903">
<reference key="NSNextResponder" ref="881248978"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{1, 29}, {156, 17}}</string>
+ <string key="NSFrame">{{1, 33}, {156, 17}}</string>
<reference key="NSSuperview" ref="881248978"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="21353665">
<int key="NSCellFlags">67108864</int>
@@ -690,8 +711,9 @@
<object class="NSTextField" id="520236742">
<reference key="NSNextResponder" ref="881248978"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{68, 2}, {142, 17}}</string>
+ <string key="NSFrame">{{68, 6}, {142, 17}}</string>
<reference key="NSSuperview" ref="881248978"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="414517125">
<int key="NSCellFlags">67108864</int>
@@ -707,8 +729,9 @@
<object class="NSComboBox" id="71054177">
<reference key="NSNextResponder" ref="881248978"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{215, -3}, {190, 26}}</string>
+ <string key="NSFrame">{{215, 1}, {190, 26}}</string>
<reference key="NSSuperview" ref="881248978"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSComboBoxCell" key="NSCell" id="863874436">
<int key="NSCellFlags">342884416</int>
@@ -806,8 +829,9 @@
<object class="NSButton" id="755212957">
<reference key="NSNextResponder" ref="881248978"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{160, 73}, {143, 18}}</string>
+ <string key="NSFrame">{{160, 57}, {143, 18}}</string>
<reference key="NSSuperview" ref="881248978"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="927025696">
<int key="NSCellFlags">67108864</int>
@@ -826,34 +850,12 @@
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
- <object class="NSButton" id="1011876758">
- <reference key="NSNextResponder" ref="881248978"/>
- <int key="NSvFlags">264</int>
- <string key="NSFrame">{{160, 53}, {244, 18}}</string>
- <reference key="NSSuperview" ref="881248978"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="883625994">
- <int key="NSCellFlags">67108864</int>
- <int key="NSCellFlags2">0</int>
- <string key="NSContents">Do strict certificate checks</string>
- <reference key="NSSupport" ref="745543233"/>
- <reference key="NSControlView" ref="1011876758"/>
- <int key="NSButtonFlags">1211912448</int>
- <int key="NSButtonFlags2">2</int>
- <reference key="NSNormalImage" ref="948923301"/>
- <reference key="NSAlternateImage" ref="10299655"/>
- <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="13153345">
<reference key="NSNextResponder" ref="881248978"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{83, 138}, {74, 17}}</string>
+ <string key="NSFrame">{{83, 122}, {74, 17}}</string>
<reference key="NSSuperview" ref="881248978"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="499131302">
<int key="NSCellFlags">68157504</int>
@@ -869,8 +871,9 @@
<object class="NSButton" id="753162121">
<reference key="NSNextResponder" ref="881248978"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{160, 137}, {188, 18}}</string>
+ <string key="NSFrame">{{160, 121}, {188, 18}}</string>
<reference key="NSSuperview" ref="881248978"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="246744812">
<int key="NSCellFlags">67108864</int>
@@ -890,7 +893,9 @@
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
</array>
- <string key="NSFrameSize">{424, 333}</string>
+ <string key="NSFrameSize">{424, 317}</string>
+ <reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
<string key="NSClassName">NSView</string>
<string key="NSExtension">NSResponder</string>
</object>
@@ -1646,14 +1651,6 @@
<int key="connectionID">286</int>
</object>
<object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">checkBox_checkCertificates</string>
- <reference key="source" ref="393462939"/>
- <reference key="destination" ref="1011876758"/>
- </object>
- <int key="connectionID">330</int>
- </object>
- <object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">changedPreference:</string>
<reference key="source" ref="393462939"/>
@@ -2093,7 +2090,6 @@
<reference ref="520236742"/>
<reference ref="71054177"/>
<reference ref="755212957"/>
- <reference ref="1011876758"/>
<reference ref="13153345"/>
<reference ref="753162121"/>
<reference ref="223022732"/>
@@ -2258,14 +2254,6 @@
<reference key="parent" ref="881248978"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">328</int>
- <reference key="object" ref="1011876758"/>
- <array class="NSMutableArray" key="children">
- <reference ref="883625994"/>
- </array>
- <reference key="parent" ref="881248978"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">527</int>
<reference key="object" ref="13153345"/>
<array class="NSMutableArray" key="children">
@@ -2578,11 +2566,6 @@
<reference key="parent" ref="755212957"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">616</int>
- <reference key="object" ref="883625994"/>
- <reference key="parent" ref="1011876758"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">617</int>
<reference key="object" ref="499131302"/>
<reference key="parent" ref="13153345"/>
@@ -2808,7 +2791,6 @@
<string key="279.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="280.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="285.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="328.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="332.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="333.CustomClassName">AILocalizationButton</string>
<string key="333.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -2871,7 +2853,6 @@
<string key="613.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="614.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="615.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="616.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="617.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="618.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="619.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -2939,14 +2920,12 @@
<string key="label_server">NSTextField</string>
<string key="label_typing">NSTextField</string>
<string key="popUp_encryption">NSPopUpButton</string>
- <string key="progressIndicator_registering">NSProgressIndicator</string>
<string key="textField_accountUID">NSTextField</string>
<string key="textField_accountUIDLabel">NSTextField</string>
<string key="textField_alias">NSTextField</string>
<string key="textField_connectHost">NSTextField</string>
<string key="textField_connectPort">NSTextField</string>
<string key="textField_password">NSTextField</string>
- <string key="textField_registering">NSTextField</string>
<string key="view_auxiliaryTabView">NSTabView</string>
<string key="view_options">NSView</string>
<string key="view_privacy">NSView</string>
@@ -2994,10 +2973,6 @@
<string key="name">popUp_encryption</string>
<string key="candidateClassName">NSPopUpButton</string>
</object>
- <object class="IBToOneOutletInfo" key="progressIndicator_registering">
- <string key="name">progressIndicator_registering</string>
- <string key="candidateClassName">NSProgressIndicator</string>
- </object>
<object class="IBToOneOutletInfo" key="textField_accountUID">
<string key="name">textField_accountUID</string>
<string key="candidateClassName">NSTextField</string>
@@ -3022,10 +2997,6 @@
<string key="name">textField_password</string>
<string key="candidateClassName">NSTextField</string>
</object>
- <object class="IBToOneOutletInfo" key="textField_registering">
- <string key="name">textField_registering</string>
- <string key="candidateClassName">NSTextField</string>
- </object>
<object class="IBToOneOutletInfo" key="view_auxiliaryTabView">
<string key="name">view_auxiliaryTabView</string>
<string key="candidateClassName">NSTabView</string>
diff -r 8dd676d7398d -r 590779dec396 Plugins/Purple Service/adiumPurpleCertificateTrustWarning.m
--- a/Plugins/Purple Service/adiumPurpleCertificateTrustWarning.m Tue Jun 25 02:24:24 2013 +0200
+++ b/Plugins/Purple Service/adiumPurpleCertificateTrustWarning.m Tue Jun 25 13:25:27 2013 +0200
@@ -24,19 +24,17 @@
void adium_query_cert_chain(PurpleSslConnection *gsc, const char *hostname, CFArrayRef certs, void (*query_cert_cb)(gboolean trusted, void *userdata), void *userdata) {
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
- // only the jabber service supports this right now
- for (ESPurpleJabberAccount *account in [adium.accountController accountsCompatibleWithService:[adium.accountController firstServiceWithServiceID:@"Jabber"]]) {
- if([account secureConnection] == gsc) {
- if([account shouldVerifyCertificates])
+ for (AIAccount *account in [adium.accountController accounts]) {
+ if([account respondsToSelector:@selector(secureConnection)]) {
+ if ([account secureConnection] == gsc) {
[AIPurpleCertificateTrustWarningAlert displayTrustWarningAlertWithAccount:account
hostname:[NSString stringWithUTF8String:hostname]
certificates:certs
resultCallback:query_cert_cb
userData:userdata];
- else
- query_cert_cb(true, userdata);
- [pool release];
- return;
+ [pool release];
+ return;
+ }
}
}
// default fallback
More information about the commits
mailing list