Merge. adium-1.5.8 1.5.8
authorThijs Alkemade <me@thijsalkema.de>
Sun, 13 Oct 2013 12:11:49 +0200
branchadium-1.5.8
changeset 5706e0467f507718
parent 5705 609fb8ff4d6b
parent 5702 1d5d4f8fe66c
child 5707 7b00f56cad2c
Merge.
Plists/Info.plist
Release/Makefile
     1.1 --- a/AdiumHelp/pgs/AdvancedFeatures-OTREncryption.html	Sun Oct 13 12:05:07 2013 +0200
     1.2 +++ b/AdiumHelp/pgs/AdvancedFeatures-OTREncryption.html	Sun Oct 13 12:11:49 2013 +0200
     1.3 @@ -17,7 +17,7 @@
     1.4  	<div id="pagetitle">
     1.5  		<h1>OTR encryption</h1>
     1.6  	</div>
     1.7 -	<p><a href="http://www.cypherpunks.ca/otr/">Off-the-Record (OTR) Messaging</a> enables you to have private conversations over instant messaging. According to the OTR Development Team, it aims to provide the following:</p>
     1.8 +	<p><a href="https://otr.cypherpunks.ca/">Off-the-Record (OTR) Messaging</a> enables you to have private conversations over instant messaging. According to the OTR Development Team, it aims to provide the following:</p>
     1.9  	<ul>
    1.10  		<li>"Encryption: No one else can read your instant messages."</li>
    1.11  		<li>"Authentication: You are assured the correspondent is who you think it is."</li>
     2.1 --- a/AdiumHelp/pgs/Miscellaneous-AVSkypeSupport.html	Sun Oct 13 12:05:07 2013 +0200
     2.2 +++ b/AdiumHelp/pgs/Miscellaneous-AVSkypeSupport.html	Sun Oct 13 12:11:49 2013 +0200
     2.3 @@ -31,9 +31,10 @@
     2.4  			<h3>Skype support</h3>
     2.5  		</div>
     2.6  		<div class="taskboxtext">
     2.7 -			<p>Yes and no.</p>
     2.8 -			<p>Yes: The third-party <a href="http://xtras.adium.im/index.php?a=xtras&amp;xtra_id=5011">Skype Plugin</a> allows Adium to use the <a class="ext_link" href="https://developer.skype.com/Docs/ApiDoc">Skype API</a> to display your Skype contacts within Adium and let you chat with them via text-based instant messaging. By the nature of the Skype API, it requires that the Skype program be installed and running.</p>
     2.9 -			<p>No: It's not supported natively within Adium (i.e., without a plugin). The library that we use to support most protocols, <a href="https://trac.adium.im/wiki/LibPurple">libpurple</a>, doesn't support Skype at all right now, not even for chat. Until it does Adium most likely won't, either.</p>
    2.10 +			<p>Adium does not natively (i.e., without a plugin) support Skype.</p>
    2.11 +			<p>However, there is an unofficial third-party <a href="http://xtras.adium.im/index.php?a=xtras&amp;xtra_id=5011">Skype Plugin</a> which allows Adium to use the <a class="ext_link" href="https://developer.skype.com/Docs/ApiDoc">Skype API</a> to display your Skype contacts within Adium and let you chat with them via text-based instant messaging. By the nature of the Skype API, it requires that the Skype program be installed and running.</p>
    2.12 +			<p><strong>Why does Adium not officially support Skype?</strong></p>
    2.13 +			<p>The library that we use to support most protocols, <a href="https://trac.adium.im/wiki/LibPurple">libpurple</a>, doesn't support Skype at all right now, not even for chat. Until it does Adium most likely won't, either.</p>
    2.14  			<p>Keep in mind that Skype is a proprietary, closed protocol, so it must be reverse-engineered before third-party clients like Pidgin and Adium can use it. Protocols like OSCAR (which AIM and ICQ are based on) and MSN have already been reverse-engineered, but they're much older than Skype, and reverse-engineering is hard. It will take a long time and won't happen at all unless someone chooses to take interest in it and dedicate significant time to the effort.</p>
    2.15  			<p><strong>What about the Skype API?</strong></p>
    2.16  			<p>Using the Skype API, as the Skype Plugin does, means that Skype must be running. We don't accept piggybacking on the official client as a substitute.</p>
     3.1 --- a/ChangeLogs/Changes.txt	Sun Oct 13 12:05:07 2013 +0200
     3.2 +++ b/ChangeLogs/Changes.txt	Sun Oct 13 12:11:49 2013 +0200
     3.3 @@ -4,6 +4,10 @@
     3.4   * Changed the default tab switching shortcuts for new users to Control-Tab/Control-Shift-Tab, to match Safari. This was meant to be done for 1.5.4 but it did not work that time. (#16102)
     3.5   * XMPP: refer to XMPP as "XMPP (Jabber)". Unfortunately, just "XMPP" still has some potential for confusion. (#16435)
     3.6   * Fixed SIP accountnames to be case-sensitive. (Pete Woods) (#16237)
     3.7 + * Enabled a large number of TLS cipher suites, including ECC suites and suites new in TLS 1.2.
     3.8 + * Fix a problem causing Sametime login to fail. (Jonathan Rice) (#16345)
     3.9 + * Try to avoid Twitter's rate limiting causing Adium to go in a reconnection loop. (#16418)
    3.10 +
    3.11  
    3.12  Version 1.5.7 (7/2/2013)
    3.13   * Updated Twitter support. (#16118)
    3.14 @@ -18,11 +22,13 @@
    3.15     * Removed SSL_RSA_WITH_NULL_MD5 from the list of ciphers, as it doesn't use encryption.
    3.16     * Removed the caching of untrusted certificates, as the implementation would make it easy to replace it with a different certificate when reconnecting.
    3.17  
    3.18 +
    3.19  Version 1.5.6 (3/18/2013)
    3.20   * Fixed a crash on startup on 10.6.8.
    3.21   * Fixed a crash when accepting or canceling the certificate verification dialog. (#16280)
    3.22   * Fixed a crash or hang when trying to use OTR on 32-bits Macs. (#16203)
    3.23  
    3.24 +
    3.25  Version 1.5.5 (2/24/2013)
    3.26   * Updated libpurple to 2.10.7 fixing two security vulnerabilities.
    3.27   * Fixed "Add Link..." when the cursor is at the end of the line. (#16200)
     4.1 Binary file Frameworks/Adium Framework/Resources/ca.lproj/Localizable.strings has changed
     5.1 Binary file Frameworks/Adium Framework/Resources/cs.lproj/Localizable.strings has changed
     6.1 Binary file Frameworks/Adium Framework/Resources/da.lproj/Localizable.strings has changed
     7.1 Binary file Frameworks/Adium Framework/Resources/de.lproj/Localizable.strings has changed
     8.1 Binary file Frameworks/Adium Framework/Resources/el_GR.lproj/Localizable.strings has changed
     9.1 Binary file Frameworks/Adium Framework/Resources/en.lproj/Localizable.strings has changed
    10.1 --- a/Frameworks/Adium Framework/Resources/en_AU.lproj/Localizable.strings	Sun Oct 13 12:05:07 2013 +0200
    10.2 +++ b/Frameworks/Adium Framework/Resources/en_AU.lproj/Localizable.strings	Sun Oct 13 12:11:49 2013 +0200
    10.3 @@ -80,7 +80,7 @@
    10.4  "Add To Address Book" = "Add To Address Book";
    10.5  
    10.6  /* No comment provided by engineer. */
    10.7 -"Adium provides encryption, authentication, deniability, and perfect forward secrecy over %@ via Off-the-Record Messaging (OTR). If your contact is not using an OTR-compatible messaging system, your contact will be sent a link to the OTR web site when you attempt to connect. For more information on OTR, visit http://www.cypherpunks.ca/otr/." = "Adium provides encryption, authentication, deniability, and perfect forward secrecy over %@ via Off-the-Record Messaging (OTR). If your contact is not using an OTR-compatible messaging system, your contact will be sent a link to the OTR web site when you attempt to connect. For more information on OTR, visit http://www.cypherpunks.ca/otr/.";
    10.8 +"Adium provides encryption, authentication, deniability, and perfect forward secrecy over %@ via Off-the-Record Messaging (OTR). If your contact is not using an OTR-compatible messaging system, your contact will be sent a link to the OTR web site when you attempt to connect. For more information on OTR, visit https://otr.cypherpunks.ca/." = "Adium provides encryption, authentication, deniability, and perfect forward secrecy over %@ via Off-the-Record Messaging (OTR). If your contact is not using an OTR-compatible messaging system, your contact will be sent a link to the OTR web site when you attempt to connect. For more information on OTR, visit https://otr.cypherpunks.ca/.";
    10.9  
   10.10  /* No comment provided by engineer. */
   10.11  "Alias:" = "Alias:";
    11.1 Binary file Frameworks/Adium Framework/Resources/en_GB.lproj/Localizable.strings has changed
    12.1 Binary file Frameworks/Adium Framework/Resources/es.lproj/Localizable.strings has changed
    13.1 Binary file Frameworks/Adium Framework/Resources/fi.lproj/Localizable.strings has changed
    14.1 Binary file Frameworks/Adium Framework/Resources/fr.lproj/Localizable.strings has changed
    15.1 Binary file Frameworks/Adium Framework/Resources/fr_CA.lproj/Localizable.strings has changed
    16.1 Binary file Frameworks/Adium Framework/Resources/hu.lproj/Localizable.strings has changed
    17.1 Binary file Frameworks/Adium Framework/Resources/is.lproj/Localizable.strings has changed
    18.1 Binary file Frameworks/Adium Framework/Resources/it.lproj/Localizable.strings has changed
    19.1 Binary file Frameworks/Adium Framework/Resources/ja.lproj/Localizable.strings has changed
    20.1 Binary file Frameworks/Adium Framework/Resources/nb.lproj/Localizable.strings has changed
    21.1 Binary file Frameworks/Adium Framework/Resources/nl.lproj/Localizable.strings has changed
    22.1 Binary file Frameworks/Adium Framework/Resources/pl.lproj/Localizable.strings has changed
    23.1 Binary file Frameworks/Adium Framework/Resources/pt.lproj/Localizable.strings has changed
    24.1 Binary file Frameworks/Adium Framework/Resources/pt_PT.lproj/Localizable.strings has changed
    25.1 Binary file Frameworks/Adium Framework/Resources/ru.lproj/Localizable.strings has changed
    26.1 Binary file Frameworks/Adium Framework/Resources/sk_SK.lproj/Localizable.strings has changed
    27.1 Binary file Frameworks/Adium Framework/Resources/sl.lproj/Localizable.strings has changed
    28.1 Binary file Frameworks/Adium Framework/Resources/sv.lproj/Localizable.strings has changed
    29.1 Binary file Frameworks/Adium Framework/Resources/tr.lproj/Localizable.strings has changed
    30.1 Binary file Frameworks/Adium Framework/Resources/uk.lproj/Localizable.strings has changed
    31.1 Binary file Frameworks/Adium Framework/Resources/zh_CN.lproj/Localizable.strings has changed
    32.1 Binary file Frameworks/Adium Framework/Resources/zh_TW.lproj/Localizable.strings has changed
    33.1 --- a/Frameworks/Adium Framework/Source/AIAbstractAccount.h	Sun Oct 13 12:05:07 2013 +0200
    33.2 +++ b/Frameworks/Adium Framework/Source/AIAbstractAccount.h	Sun Oct 13 12:11:49 2013 +0200
    33.3 @@ -100,6 +100,7 @@
    33.4  
    33.5  //FUS Disconnecting
    33.6  - (void)autoReconnectAfterDelay:(NSTimeInterval)delay;
    33.7 +- (double)minimumReconnectTime;
    33.8  - (void)cancelAutoReconnect;
    33.9  - (void)initFUSDisconnecting;
   33.10  
    34.1 --- a/Frameworks/Adium Framework/Source/AIAbstractAccount.m	Sun Oct 13 12:05:07 2013 +0200
    34.2 +++ b/Frameworks/Adium Framework/Source/AIAbstractAccount.m	Sun Oct 13 12:11:49 2013 +0200
    34.3 @@ -1332,6 +1332,11 @@
    34.4  	return _contactProperties;
    34.5  }
    34.6  
    34.7 +- (double)minimumReconnectTime
    34.8 +{
    34.9 +	return RECONNECT_MIN_TIME;
   34.10 +}
   34.11 +
   34.12  /*!
   34.13   * @brief Did disconnect
   34.14   */
   34.15 @@ -1388,8 +1393,8 @@
   34.16  			double reconnectDelay = pow(RECONNECT_BASE_TIME, (double)reconnectAttemptsPerformed);
   34.17  			
   34.18  			// Make sure we're not going too fast
   34.19 -			if (reconnectDelay < RECONNECT_MIN_TIME)
   34.20 -				reconnectDelay = RECONNECT_MIN_TIME;
   34.21 +			if (reconnectDelay < [self minimumReconnectTime])
   34.22 +				reconnectDelay = [self minimumReconnectTime];
   34.23  			// Or too slow
   34.24  			else if (reconnectDelay > RECONNECT_MAX_TIME)
   34.25  				reconnectDelay = RECONNECT_MAX_TIME;
    35.1 --- a/Frameworks/Adium Framework/Source/AIAccount.m	Sun Oct 13 12:05:07 2013 +0200
    35.2 +++ b/Frameworks/Adium Framework/Source/AIAccount.m	Sun Oct 13 12:11:49 2013 +0200
    35.3 @@ -911,7 +911,7 @@
    35.4  - (NSString *)aboutEncryption
    35.5  {
    35.6  	return [NSString stringWithFormat:
    35.7 -		AILocalizedStringFromTableInBundle(@"Adium provides encryption, authentication, deniability, and perfect forward secrecy over %@ via Off-the-Record Messaging (OTR). If your contact is not using an OTR-compatible messaging system, your contact will be sent a link to the OTR web site when you attempt to connect. For more information on OTR, visit http://www.cypherpunks.ca/otr/.", nil, [NSBundle bundleForClass:[AIAccount class]], nil),
    35.8 +		AILocalizedStringFromTableInBundle(@"Adium provides encryption, authentication, deniability, and perfect forward secrecy over %@ via Off-the-Record Messaging (OTR). If your contact is not using an OTR-compatible messaging system, your contact will be sent a link to the OTR web site when you attempt to connect. For more information on OTR, visit https://otr.cypherpunks.ca/.", nil, [NSBundle bundleForClass:[AIAccount class]], nil),
    35.9  		[self.service shortDescription]];
   35.10  }
   35.11  
    36.1 --- a/Plugins/Purple Service/libpurple_extensions/ssl-cdsa.c	Sun Oct 13 12:05:07 2013 +0200
    36.2 +++ b/Plugins/Purple Service/libpurple_extensions/ssl-cdsa.c	Sun Oct 13 12:11:49 2013 +0200
    36.3 @@ -347,6 +347,32 @@
    36.4  		case TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA:
    36.5  		case TLS_ECDH_RSA_WITH_AES_256_CBC_SHA:
    36.6  		case TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA:
    36.7 +		case TLS_RSA_WITH_AES_128_GCM_SHA256:
    36.8 +		case TLS_RSA_WITH_AES_256_GCM_SHA384:
    36.9 +		case TLS_DHE_RSA_WITH_AES_128_GCM_SHA256:
   36.10 +		case TLS_DHE_RSA_WITH_AES_256_GCM_SHA384:
   36.11 +		case TLS_DH_RSA_WITH_AES_128_GCM_SHA256:
   36.12 +		case TLS_DH_RSA_WITH_AES_256_GCM_SHA384:
   36.13 +		case TLS_DHE_DSS_WITH_AES_128_GCM_SHA256:
   36.14 +		case TLS_DHE_DSS_WITH_AES_256_GCM_SHA384:
   36.15 +		case TLS_DH_DSS_WITH_AES_128_GCM_SHA256:
   36.16 +		case TLS_DH_DSS_WITH_AES_256_GCM_SHA384:
   36.17 +		case TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256:
   36.18 +		case TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384:
   36.19 +		case TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256:
   36.20 +		case TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384:
   36.21 +		case TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256:
   36.22 +		case TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384:
   36.23 +		case TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256:
   36.24 +		case TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384:
   36.25 +		case TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256:
   36.26 +		case TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384:
   36.27 +		case TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256:
   36.28 +		case TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384:
   36.29 +		case TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256:
   36.30 +		case TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384:
   36.31 +		case TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256:
   36.32 +		case TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384:
   36.33  			return TRUE;
   36.34  			
   36.35  		default:
   36.36 @@ -414,7 +440,7 @@
   36.37  	
   36.38  	size_t numCiphers = 0;
   36.39  	
   36.40 -	err = SSLGetNumberSupportedCiphers(cdsa_data->ssl_ctx, &numCiphers);
   36.41 +	err = SSLGetNumberEnabledCiphers(cdsa_data->ssl_ctx, &numCiphers);
   36.42  	
   36.43  	if (err != noErr) {
   36.44  		purple_debug_error("cdsa", "SSLGetNumberEnabledCiphers failed: %d\n", err);
   36.45 @@ -428,7 +454,7 @@
   36.46  	
   36.47  	SSLCipherSuite ciphers[numCiphers];
   36.48      
   36.49 -    err = SSLGetSupportedCiphers(cdsa_data->ssl_ctx, ciphers, &numCiphers);
   36.50 +    err = SSLGetEnabledCiphers(cdsa_data->ssl_ctx, ciphers, &numCiphers);
   36.51  	if (err != noErr) {
   36.52  		purple_debug_error("cdsa", "SSLGetSupportedCiphers failed: %d\n", err);
   36.53          if (gsc->error_cb != NULL)
   36.54 @@ -474,7 +500,6 @@
   36.55              return;
   36.56          }
   36.57          
   36.58 -        protoErr = SSLSetProtocolVersionEnabled(cdsa_data->ssl_ctx, kSSLProtocol2, true);
   36.59          protoErr = SSLSetProtocolVersionEnabled(cdsa_data->ssl_ctx, kSSLProtocol3, true);
   36.60          protoErr = SSLSetProtocolVersionEnabled(cdsa_data->ssl_ctx, kTLSProtocol1, true);
   36.61      }
    37.1 --- a/Plugins/Twitter Plugin/AITwitterAccount.m	Sun Oct 13 12:05:07 2013 +0200
    37.2 +++ b/Plugins/Twitter Plugin/AITwitterAccount.m	Sun Oct 13 12:11:49 2013 +0200
    37.3 @@ -290,6 +290,15 @@
    37.4  }
    37.5  
    37.6  /*!
    37.7 + * @brief A disconnect on Twitter often means we broke some rate-limit, or the server is overloaded.
    37.8 + * Lets be polite and wait for 15 minutes.
    37.9 + */
   37.10 +- (double)minimumReconnectTime
   37.11 +{
   37.12 +	return 15.0 * 60.0;
   37.13 +}
   37.14 +
   37.15 +/*!
   37.16   * @brief Session ended
   37.17   *
   37.18   * Remove all state information.
    38.1 --- a/Resources/AboutBox.xib	Sun Oct 13 12:05:07 2013 +0200
    38.2 +++ b/Resources/AboutBox.xib	Sun Oct 13 12:11:49 2013 +0200
    38.3 @@ -2,27 +2,27 @@
    38.4  <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
    38.5  	<data>
    38.6  		<int key="IBDocument.SystemTarget">1060</int>
    38.7 -		<string key="IBDocument.SystemVersion">11C74</string>
    38.8 -		<string key="IBDocument.InterfaceBuilderVersion">1938</string>
    38.9 -		<string key="IBDocument.AppKitVersion">1138.23</string>
   38.10 -		<string key="IBDocument.HIToolboxVersion">567.00</string>
   38.11 +		<string key="IBDocument.SystemVersion">12E55</string>
   38.12 +		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
   38.13 +		<string key="IBDocument.AppKitVersion">1187.39</string>
   38.14 +		<string key="IBDocument.HIToolboxVersion">626.00</string>
   38.15  		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
   38.16  			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
   38.17 -			<string key="NS.object.0">1938</string>
   38.18 +			<string key="NS.object.0">3084</string>
   38.19  		</object>
   38.20  		<array key="IBDocument.IntegratedClassDependencies">
   38.21 +			<string>NSButton</string>
   38.22 +			<string>NSButtonCell</string>
   38.23 +			<string>NSCustomObject</string>
   38.24 +			<string>NSImageCell</string>
   38.25 +			<string>NSImageView</string>
   38.26 +			<string>NSScrollView</string>
   38.27  			<string>NSScroller</string>
   38.28 -			<string>NSButton</string>
   38.29 -			<string>NSScrollView</string>
   38.30 +			<string>NSTextField</string>
   38.31  			<string>NSTextFieldCell</string>
   38.32 -			<string>NSImageView</string>
   38.33 -			<string>NSButtonCell</string>
   38.34 -			<string>NSImageCell</string>
   38.35 -			<string>NSCustomObject</string>
   38.36  			<string>NSTextView</string>
   38.37  			<string>NSView</string>
   38.38  			<string>NSWindowTemplate</string>
   38.39 -			<string>NSTextField</string>
   38.40  		</array>
   38.41  		<array key="IBDocument.PluginDependencies">
   38.42  			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
   38.43 @@ -72,10 +72,9 @@
   38.44  							<reference key="NSSuperview" ref="756675379"/>
   38.45  							<reference key="NSWindow"/>
   38.46  							<reference key="NSNextKeyView" ref="490328134"/>
   38.47 -							<int key="NSViewLayerContentsRedrawPolicy">2</int>
   38.48  							<bool key="NSEnabled">YES</bool>
   38.49  							<object class="NSImageCell" key="NSCell" id="834129056">
   38.50 -								<int key="NSCellFlags">130560</int>
   38.51 +								<int key="NSCellFlags">134217728</int>
   38.52  								<int key="NSCellFlags2">33587200</int>
   38.53  								<object class="NSCustomResource" key="NSContents">
   38.54  									<string key="NSClassName">NSImage</string>
   38.55 @@ -86,19 +85,20 @@
   38.56  								<int key="NSStyle">0</int>
   38.57  								<bool key="NSAnimates">NO</bool>
   38.58  							</object>
   38.59 +							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
   38.60  							<bool key="NSEditable">YES</bool>
   38.61  						</object>
   38.62  						<object class="NSButton" id="490328134">
   38.63  							<reference key="NSNextResponder" ref="756675379"/>
   38.64  							<int key="NSvFlags">256</int>
   38.65 +							<array class="NSMutableArray" key="NSSubviews"/>
   38.66  							<string key="NSFrame">{{20, 89}, {192, 192}}</string>
   38.67  							<reference key="NSSuperview" ref="756675379"/>
   38.68  							<reference key="NSWindow"/>
   38.69 -							<reference key="NSNextKeyView" ref="801464012"/>
   38.70 -							<int key="NSViewLayerContentsRedrawPolicy">2</int>
   38.71 +							<reference key="NSNextKeyView"/>
   38.72  							<bool key="NSEnabled">YES</bool>
   38.73  							<object class="NSButtonCell" key="NSCell" id="865628747">
   38.74 -								<int key="NSCellFlags">67239424</int>
   38.75 +								<int key="NSCellFlags">67108864</int>
   38.76  								<int key="NSCellFlags2">0</int>
   38.77  								<string key="NSContents"/>
   38.78  								<object class="NSFont" key="NSSupport">
   38.79 @@ -107,7 +107,7 @@
   38.80  									<int key="NSfFlags">2843</int>
   38.81  								</object>
   38.82  								<reference key="NSControlView" ref="490328134"/>
   38.83 -								<int key="NSButtonFlags">141836543</int>
   38.84 +								<int key="NSButtonFlags">141836288</int>
   38.85  								<int key="NSButtonFlags2">6</int>
   38.86  								<object class="NSCustomResource" key="NSNormalImage">
   38.87  									<string key="NSClassName">NSImage</string>
   38.88 @@ -122,6 +122,7 @@
   38.89  								<int key="NSPeriodicDelay">400</int>
   38.90  								<int key="NSPeriodicInterval">75</int>
   38.91  							</object>
   38.92 +							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
   38.93  						</object>
   38.94  						<object class="NSScrollView" id="679278724">
   38.95  							<reference key="NSNextResponder" ref="756675379"/>
   38.96 @@ -147,11 +148,10 @@
   38.97  												<string>NeXT Rich Text Format v1.0 pasteboard type</string>
   38.98  												<string>NeXT TIFF v4.0 pasteboard type</string>
   38.99  											</set>
  38.100 -											<string key="NSFrame">{{0, -7}, {315, 14}}</string>
  38.101 +											<string key="NSFrameSize">{315, 155}</string>
  38.102  											<reference key="NSSuperview" ref="2963749"/>
  38.103  											<reference key="NSWindow"/>
  38.104  											<reference key="NSNextKeyView" ref="108681877"/>
  38.105 -											<int key="NSViewLayerContentsRedrawPolicy">2</int>
  38.106  											<object class="NSTextContainer" key="NSTextContainer" id="63484467">
  38.107  												<object class="NSLayoutManager" key="NSLayoutManager">
  38.108  													<object class="NSTextStorage" key="NSTextStorage">
  38.109 @@ -163,7 +163,7 @@
  38.110  													<array class="NSMutableArray" key="NSTextContainers">
  38.111  														<reference ref="63484467"/>
  38.112  													</array>
  38.113 -													<int key="NSLMFlags">6</int>
  38.114 +													<int key="NSLMFlags">38</int>
  38.115  													<nil key="NSDelegate"/>
  38.116  												</object>
  38.117  												<reference key="NSTextView" ref="212523782"/>
  38.118 @@ -216,7 +216,6 @@
  38.119  											</object>
  38.120  											<int key="NSTVFlags">6</int>
  38.121  											<string key="NSMaxSize">{353, 15000000}</string>
  38.122 -											<string key="NSMinize">{296, 7}</string>
  38.123  											<nil key="NSDelegate"/>
  38.124  										</object>
  38.125  									</array>
  38.126 @@ -224,7 +223,6 @@
  38.127  									<reference key="NSSuperview" ref="679278724"/>
  38.128  									<reference key="NSWindow"/>
  38.129  									<reference key="NSNextKeyView" ref="212523782"/>
  38.130 -									<int key="NSViewLayerContentsRedrawPolicy">2</int>
  38.131  									<reference key="NSDocView" ref="212523782"/>
  38.132  									<reference key="NSBGColor" ref="837372580"/>
  38.133  									<object class="NSCursor" key="NSCursor">
  38.134 @@ -240,6 +238,7 @@
  38.135  									<reference key="NSSuperview" ref="679278724"/>
  38.136  									<reference key="NSWindow"/>
  38.137  									<reference key="NSNextKeyView" ref="281700486"/>
  38.138 +									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
  38.139  									<reference key="NSTarget" ref="679278724"/>
  38.140  									<string key="NSAction">_doScroller:</string>
  38.141  									<double key="NSPercent">0.96803653240203857</double>
  38.142 @@ -251,6 +250,7 @@
  38.143  									<reference key="NSSuperview" ref="679278724"/>
  38.144  									<reference key="NSWindow"/>
  38.145  									<reference key="NSNextKeyView" ref="2963749"/>
  38.146 +									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
  38.147  									<int key="NSsFlags">1</int>
  38.148  									<reference key="NSTarget" ref="679278724"/>
  38.149  									<string key="NSAction">_doScroller:</string>
  38.150 @@ -262,11 +262,13 @@
  38.151  							<reference key="NSSuperview" ref="756675379"/>
  38.152  							<reference key="NSWindow"/>
  38.153  							<reference key="NSNextKeyView" ref="1022085246"/>
  38.154 -							<int key="NSViewLayerContentsRedrawPolicy">2</int>
  38.155  							<int key="NSsFlags">133120</int>
  38.156  							<reference key="NSVScroller" ref="1022085246"/>
  38.157  							<reference key="NSHScroller" ref="281700486"/>
  38.158  							<reference key="NSContentView" ref="2963749"/>
  38.159 +							<double key="NSMinMagnification">0.25</double>
  38.160 +							<double key="NSMaxMagnification">4</double>
  38.161 +							<double key="NSMagnification">1</double>
  38.162  						</object>
  38.163  						<object class="NSImageView" id="108681877">
  38.164  							<reference key="NSNextResponder" ref="756675379"/>
  38.165 @@ -283,10 +285,9 @@
  38.166  							<reference key="NSSuperview" ref="756675379"/>
  38.167  							<reference key="NSWindow"/>
  38.168  							<reference key="NSNextKeyView" ref="965994201"/>
  38.169 -							<int key="NSViewLayerContentsRedrawPolicy">2</int>
  38.170  							<bool key="NSEnabled">YES</bool>
  38.171  							<object class="NSImageCell" key="NSCell" id="18140742">
  38.172 -								<int key="NSCellFlags">130560</int>
  38.173 +								<int key="NSCellFlags">134217728</int>
  38.174  								<int key="NSCellFlags2">33554432</int>
  38.175  								<object class="NSCustomResource" key="NSContents">
  38.176  									<string key="NSClassName">NSImage</string>
  38.177 @@ -297,6 +298,7 @@
  38.178  								<int key="NSStyle">0</int>
  38.179  								<bool key="NSAnimates">NO</bool>
  38.180  							</object>
  38.181 +							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
  38.182  							<bool key="NSEditable">YES</bool>
  38.183  						</object>
  38.184  						<object class="NSImageView" id="965994201">
  38.185 @@ -314,10 +316,9 @@
  38.186  							<reference key="NSSuperview" ref="756675379"/>
  38.187  							<reference key="NSWindow"/>
  38.188  							<reference key="NSNextKeyView" ref="811919972"/>
  38.189 -							<int key="NSViewLayerContentsRedrawPolicy">2</int>
  38.190  							<bool key="NSEnabled">YES</bool>
  38.191  							<object class="NSImageCell" key="NSCell" id="1047543365">
  38.192 -								<int key="NSCellFlags">130560</int>
  38.193 +								<int key="NSCellFlags">134217728</int>
  38.194  								<int key="NSCellFlags2">33554432</int>
  38.195  								<object class="NSCustomResource" key="NSContents">
  38.196  									<string key="NSClassName">NSImage</string>
  38.197 @@ -328,6 +329,7 @@
  38.198  								<int key="NSStyle">0</int>
  38.199  								<bool key="NSAnimates">NO</bool>
  38.200  							</object>
  38.201 +							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
  38.202  							<bool key="NSEditable">YES</bool>
  38.203  						</object>
  38.204  						<object class="NSTextField" id="839178874">
  38.205 @@ -337,10 +339,9 @@
  38.206  							<reference key="NSSuperview" ref="756675379"/>
  38.207  							<reference key="NSWindow"/>
  38.208  							<reference key="NSNextKeyView" ref="666517339"/>
  38.209 -							<int key="NSViewLayerContentsRedrawPolicy">2</int>
  38.210  							<bool key="NSEnabled">YES</bool>
  38.211  							<object class="NSTextFieldCell" key="NSCell" id="503979177">
  38.212 -								<int key="NSCellFlags">-2079195584</int>
  38.213 +								<int key="NSCellFlags">-2079326144</int>
  38.214  								<int key="NSCellFlags2">37749760</int>
  38.215  								<string key="NSContents">Version</string>
  38.216  								<object class="NSFont" key="NSSupport">
  38.217 @@ -361,18 +362,19 @@
  38.218  									<bytes key="NSRGB">MC41MDE5NjA3ODQzIDAuNTAxOTYwNzg0MyAwLjUwMTk2MDc4NDMAA</bytes>
  38.219  								</object>
  38.220  							</object>
  38.221 +							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
  38.222  						</object>
  38.223  						<object class="NSButton" id="666517339">
  38.224  							<reference key="NSNextResponder" ref="756675379"/>
  38.225  							<int key="NSvFlags">256</int>
  38.226 +							<array class="NSMutableArray" key="NSSubviews"/>
  38.227  							<string key="NSFrame">{{232, 253}, {308, 15}}</string>
  38.228  							<reference key="NSSuperview" ref="756675379"/>
  38.229  							<reference key="NSWindow"/>
  38.230 -							<reference key="NSNextKeyView" ref="679278724"/>
  38.231 -							<int key="NSViewLayerContentsRedrawPolicy">2</int>
  38.232 +							<reference key="NSNextKeyView"/>
  38.233  							<bool key="NSEnabled">YES</bool>
  38.234  							<object class="NSButtonCell" key="NSCell" id="361376577">
  38.235 -								<int key="NSCellFlags">67239424</int>
  38.236 +								<int key="NSCellFlags">67108864</int>
  38.237  								<int key="NSCellFlags2">0</int>
  38.238  								<string key="NSContents"/>
  38.239  								<object class="NSFont" key="NSSupport" id="76241347">
  38.240 @@ -381,7 +383,7 @@
  38.241  									<int key="NSfFlags">1044</int>
  38.242  								</object>
  38.243  								<reference key="NSControlView" ref="666517339"/>
  38.244 -								<int key="NSButtonFlags">-2042838785</int>
  38.245 +								<int key="NSButtonFlags">-2042839040</int>
  38.246  								<int key="NSButtonFlags2">6</int>
  38.247  								<string key="NSAlternateContents"/>
  38.248  								<object class="NSMutableString" key="NSKeyEquivalent">
  38.249 @@ -390,23 +392,24 @@
  38.250  								<int key="NSPeriodicDelay">200</int>
  38.251  								<int key="NSPeriodicInterval">25</int>
  38.252  							</object>
  38.253 +							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
  38.254  						</object>
  38.255  						<object class="NSButton" id="329998257">
  38.256  							<reference key="NSNextResponder" ref="756675379"/>
  38.257  							<int key="NSvFlags">256</int>
  38.258 +							<array class="NSMutableArray" key="NSSubviews"/>
  38.259  							<string key="NSFrame">{{229, 8}, {154, 32}}</string>
  38.260  							<reference key="NSSuperview" ref="756675379"/>
  38.261  							<reference key="NSWindow"/>
  38.262 -							<reference key="NSNextKeyView" ref="609197835"/>
  38.263 -							<int key="NSViewLayerContentsRedrawPolicy">2</int>
  38.264 +							<reference key="NSNextKeyView"/>
  38.265  							<bool key="NSEnabled">YES</bool>
  38.266  							<object class="NSButtonCell" key="NSCell" id="929112214">
  38.267 -								<int key="NSCellFlags">67239424</int>
  38.268 +								<int key="NSCellFlags">67108864</int>
  38.269  								<int key="NSCellFlags2">134217728</int>
  38.270  								<string key="NSContents">Adium Homepage</string>
  38.271  								<reference key="NSSupport" ref="76241347"/>
  38.272  								<reference key="NSControlView" ref="329998257"/>
  38.273 -								<int key="NSButtonFlags">-2038284033</int>
  38.274 +								<int key="NSButtonFlags">-2038284288</int>
  38.275  								<int key="NSButtonFlags2">1</int>
  38.276  								<reference key="NSAlternateImage" ref="76241347"/>
  38.277  								<string key="NSAlternateContents"/>
  38.278 @@ -416,23 +419,24 @@
  38.279  								<int key="NSPeriodicDelay">200</int>
  38.280  								<int key="NSPeriodicInterval">25</int>
  38.281  							</object>
  38.282 +							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
  38.283  						</object>
  38.284  						<object class="NSButton" id="609197835">
  38.285  							<reference key="NSNextResponder" ref="756675379"/>
  38.286  							<int key="NSvFlags">256</int>
  38.287 +							<array class="NSMutableArray" key="NSSubviews"/>
  38.288  							<string key="NSFrame">{{392, 8}, {154, 32}}</string>
  38.289  							<reference key="NSSuperview" ref="756675379"/>
  38.290  							<reference key="NSWindow"/>
  38.291  							<reference key="NSNextKeyView"/>
  38.292 -							<int key="NSViewLayerContentsRedrawPolicy">2</int>
  38.293  							<bool key="NSEnabled">YES</bool>
  38.294  							<object class="NSButtonCell" key="NSCell" id="716501959">
  38.295 -								<int key="NSCellFlags">67239424</int>
  38.296 +								<int key="NSCellFlags">67108864</int>
  38.297  								<int key="NSCellFlags2">134217728</int>
  38.298  								<string key="NSContents">License</string>
  38.299  								<reference key="NSSupport" ref="76241347"/>
  38.300  								<reference key="NSControlView" ref="609197835"/>
  38.301 -								<int key="NSButtonFlags">-2038284033</int>
  38.302 +								<int key="NSButtonFlags">-2038284288</int>
  38.303  								<int key="NSButtonFlags2">1</int>
  38.304  								<object class="NSFont" key="NSAlternateImage">
  38.305  									<string key="NSName">LucidaGrande</string>
  38.306 @@ -446,6 +450,7 @@
  38.307  								<int key="NSPeriodicDelay">200</int>
  38.308  								<int key="NSPeriodicInterval">25</int>
  38.309  							</object>
  38.310 +							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
  38.311  						</object>
  38.312  						<object class="NSTextField" id="801464012">
  38.313  							<reference key="NSNextResponder" ref="756675379"/>
  38.314 @@ -454,10 +459,9 @@
  38.315  							<reference key="NSSuperview" ref="756675379"/>
  38.316  							<reference key="NSWindow"/>
  38.317  							<reference key="NSNextKeyView" ref="839178874"/>
  38.318 -							<int key="NSViewLayerContentsRedrawPolicy">2</int>
  38.319  							<bool key="NSEnabled">YES</bool>
  38.320  							<object class="NSTextFieldCell" key="NSCell" id="918644134">
  38.321 -								<int key="NSCellFlags">68288064</int>
  38.322 +								<int key="NSCellFlags">68157504</int>
  38.323  								<int key="NSCellFlags2">272630784</int>
  38.324  								<string key="NSContents">Adium</string>
  38.325  								<object class="NSFont" key="NSSupport">
  38.326 @@ -475,6 +479,7 @@
  38.327  									<reference key="NSColor" ref="1014407744"/>
  38.328  								</object>
  38.329  							</object>
  38.330 +							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
  38.331  						</object>
  38.332  						<object class="NSTextField" id="811919972">
  38.333  							<reference key="NSNextResponder" ref="756675379"/>
  38.334 @@ -483,12 +488,11 @@
  38.335  							<reference key="NSSuperview" ref="756675379"/>
  38.336  							<reference key="NSWindow"/>
  38.337  							<reference key="NSNextKeyView" ref="329998257"/>
  38.338 -							<int key="NSViewLayerContentsRedrawPolicy">2</int>
  38.339  							<bool key="NSEnabled">YES</bool>
  38.340  							<object class="NSTextFieldCell" key="NSCell" id="538272733">
  38.341 -								<int key="NSCellFlags">-2079195584</int>
  38.342 +								<int key="NSCellFlags">-2079326144</int>
  38.343  								<int key="NSCellFlags2">37749760</int>
  38.344 -								<string key="NSContents">© 2001-2012 The Adium Team</string>
  38.345 +								<string key="NSContents">© 2001-2013 The Adium Team</string>
  38.346  								<object class="NSFont" key="NSSupport">
  38.347  									<string key="NSName">LucidaGrande</string>
  38.348  									<double key="NSSize">11</double>
  38.349 @@ -502,6 +506,7 @@
  38.350  									<bytes key="NSRGB">MC41MDE5NjA3ODQzIDAuNTAxOTYwNzg0MyAwLjUwMTk2MDc4NDMAA</bytes>
  38.351  								</object>
  38.352  							</object>
  38.353 +							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
  38.354  						</object>
  38.355  					</array>
  38.356  					<string key="NSFrameSize">{560, 320}</string>
  38.357 @@ -509,7 +514,6 @@
  38.358  					<reference key="NSWindow"/>
  38.359  					<reference key="NSNextKeyView" ref="436292106"/>
  38.360  					<bool key="NSViewIsLayerTreeHost">YES</bool>
  38.361 -					<int key="NSViewLayerContentsRedrawPolicy">2</int>
  38.362  				</object>
  38.363  				<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
  38.364  				<string key="NSMinSize">{560, 342}</string>
  38.365 @@ -567,9 +571,9 @@
  38.366  														</object>
  38.367  														<dictionary key="NSAttributes">
  38.368  															<object class="NSFont" key="NSFont">
  38.369 -																<string key="NSName">Monaco</string>
  38.370 +																<string key="NSName">Menlo-Regular</string>
  38.371  																<double key="NSSize">10</double>
  38.372 -																<int key="NSfFlags">530</int>
  38.373 +																<int key="NSfFlags">16</int>
  38.374  															</object>
  38.375  															<object class="NSMutableParagraphStyle" key="NSParagraphStyle">
  38.376  																<nil key="NSTabStops"/>
  38.377 @@ -580,7 +584,7 @@
  38.378  													<array class="NSMutableArray" key="NSTextContainers">
  38.379  														<reference ref="628379985"/>
  38.380  													</array>
  38.381 -													<int key="NSLMFlags">6</int>
  38.382 +													<int key="NSLMFlags">38</int>
  38.383  													<nil key="NSDelegate"/>
  38.384  												</object>
  38.385  												<reference key="NSTextView" ref="613970551"/>
  38.386 @@ -608,7 +612,6 @@
  38.387  											</object>
  38.388  											<int key="NSTVFlags">6</int>
  38.389  											<string key="NSMaxSize">{512, 10000000}</string>
  38.390 -											<string key="NSMinize">{473, 374}</string>
  38.391  											<nil key="NSDelegate"/>
  38.392  										</object>
  38.393  									</array>
  38.394 @@ -649,6 +652,7 @@
  38.395  									<string key="NSFrame">{{474, 1}, {15, 374}}</string>
  38.396  									<reference key="NSSuperview" ref="384769830"/>
  38.397  									<reference key="NSNextKeyView" ref="83966184"/>
  38.398 +									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
  38.399  									<reference key="NSTarget" ref="384769830"/>
  38.400  									<string key="NSAction">_doScroller:</string>
  38.401  									<double key="NSPercent">0.077224858105182648</double>
  38.402 @@ -659,6 +663,7 @@
  38.403  									<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
  38.404  									<reference key="NSSuperview" ref="384769830"/>
  38.405  									<reference key="NSNextKeyView" ref="511449369"/>
  38.406 +									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
  38.407  									<int key="NSsFlags">1</int>
  38.408  									<reference key="NSTarget" ref="384769830"/>
  38.409  									<string key="NSAction">_doScroller:</string>
  38.410 @@ -673,6 +678,9 @@
  38.411  							<reference key="NSVScroller" ref="957819625"/>
  38.412  							<reference key="NSHScroller" ref="25810865"/>
  38.413  							<reference key="NSContentView" ref="511449369"/>
  38.414 +							<double key="NSMinMagnification">0.25</double>
  38.415 +							<double key="NSMaxMagnification">4</double>
  38.416 +							<double key="NSMagnification">1</double>
  38.417  						</object>
  38.418  						<object class="NSButton" id="83966184">
  38.419  							<reference key="NSNextResponder" ref="346846082"/>
  38.420 @@ -681,12 +689,12 @@
  38.421  							<reference key="NSSuperview" ref="346846082"/>
  38.422  							<bool key="NSEnabled">YES</bool>
  38.423  							<object class="NSButtonCell" key="NSCell" id="302040499">
  38.424 -								<int key="NSCellFlags">67239424</int>
  38.425 +								<int key="NSCellFlags">67108864</int>
  38.426  								<int key="NSCellFlags2">134217728</int>
  38.427  								<string key="NSContents">OK</string>
  38.428  								<reference key="NSSupport" ref="76241347"/>
  38.429  								<reference key="NSControlView" ref="83966184"/>
  38.430 -								<int key="NSButtonFlags">-2038284033</int>
  38.431 +								<int key="NSButtonFlags">-2038284288</int>
  38.432  								<int key="NSButtonFlags2">1</int>
  38.433  								<reference key="NSAlternateImage" ref="76241347"/>
  38.434  								<string key="NSAlternateContents"/>
  38.435 @@ -694,6 +702,7 @@
  38.436  								<int key="NSPeriodicDelay">200</int>
  38.437  								<int key="NSPeriodicInterval">25</int>
  38.438  							</object>
  38.439 +							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
  38.440  						</object>
  38.441  					</array>
  38.442  					<string key="NSFrameSize">{530, 456}</string>
  38.443 @@ -1320,6 +1329,24 @@
  38.444  						<string key="minorKey">./Classes/LNAboutBoxController.h</string>
  38.445  					</object>
  38.446  				</object>
  38.447 +				<object class="IBPartialClassDescription">
  38.448 +					<string key="className">NSObject</string>
  38.449 +					<object class="NSMutableDictionary" key="actions">
  38.450 +						<string key="NS.key.0">selectServiceType:</string>
  38.451 +						<string key="NS.object.0">id</string>
  38.452 +					</object>
  38.453 +					<object class="NSMutableDictionary" key="actionInfosByName">
  38.454 +						<string key="NS.key.0">selectServiceType:</string>
  38.455 +						<object class="IBActionInfo" key="NS.object.0">
  38.456 +							<string key="name">selectServiceType:</string>
  38.457 +							<string key="candidateClassName">id</string>
  38.458 +						</object>
  38.459 +					</object>
  38.460 +					<object class="IBClassDescriptionSource" key="sourceIdentifier">
  38.461 +						<string key="majorKey">IBProjectSource</string>
  38.462 +						<string key="minorKey">./Classes/NSObject.h</string>
  38.463 +					</object>
  38.464 +				</object>
  38.465  			</array>
  38.466  		</object>
  38.467  		<int key="IBDocument.localizationMode">0</int>
  38.468 @@ -1328,10 +1355,6 @@
  38.469  			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
  38.470  			<real value="1060" key="NS.object.0"/>
  38.471  		</object>
  38.472 -		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
  38.473 -			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
  38.474 -			<real value="1060" key="NS.object.0"/>
  38.475 -		</object>
  38.476  		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
  38.477  			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
  38.478  			<real value="3200" key="NS.object.0"/>
    39.1 --- a/Resources/Credits.rtf	Sun Oct 13 12:05:07 2013 +0200
    39.2 +++ b/Resources/Credits.rtf	Sun Oct 13 12:11:49 2013 +0200
    39.3 @@ -1,4 +1,4 @@
    39.4 -{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf340
    39.5 +{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf390
    39.6  {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
    39.7  {\colortbl;\red255\green255\blue255;}
    39.8  \vieww12600\viewh10200\viewkind0
    39.9 @@ -552,7 +552,7 @@
   39.10  	<http://mattgemmell.com/>\CocoaLigature0 \
   39.11  \CocoaLigature1 \
   39.12   \CocoaLigature0 \'95\CocoaLigature1   Off-the-Record messaging, an encryption library\
   39.13 -     <http://www.cypherpunks.ca/otr/>\
   39.14 +     <https://www.cypherpunks.ca/>\
   39.15  \
   39.16   \CocoaLigature0 \'95\CocoaLigature1  \CocoaLigature0  \CocoaLigature1 Shortcut Recorder, a keyboard shortcut recorder\
   39.17       <http://wafflesoftware.net/shortcut/>\CocoaLigature0 \
    40.1 --- a/Source/AdiumOTREncryption.m	Sun Oct 13 12:05:07 2013 +0200
    40.2 +++ b/Source/AdiumOTREncryption.m	Sun Oct 13 12:11:49 2013 +0200
    40.3 @@ -713,7 +713,7 @@
    40.4  	
    40.5  	AIChat *chat = chatForContext(context);
    40.6  	
    40.7 -	/* Values from http://www.cypherpunks.ca/otr/UPGRADING-libotr-3.1.0.txt */
    40.8 +	/* Values from https://otr.cypherpunks.ca/UPGRADING-libotr-3.1.0.txt */
    40.9  	static NSDictionary *maxSizeByServiceClassDict = nil;
   40.10  	if (!maxSizeByServiceClassDict) {
   40.11  		maxSizeByServiceClassDict = [[NSDictionary alloc] initWithObjectsAndKeys: