Merged adium-1.5.10 into adium-1.6.
--- a/AdiumHelp/AdiumHelp.html Sat Apr 05 12:41:19 2014 -0400
+++ b/AdiumHelp/AdiumHelp.html Wed Apr 23 20:48:33 2014 +0200
@@ -28,7 +28,8 @@
<h2 class="space17"> Adium Documentation </h2>
<p> <a href="pgs/AdiumDocumentation.html">Learn how to use Adium.</a> </p>
<h2 class="space17"> Troubleshooting </h2>
- <p> <a href="pgs/Troubleshooting.html">Solve common problems.</a> </p>+ <p> <a href="pgs/Troubleshooting-CommonProblems.html">Common problems and solutions</a> </p> + <p> <a href="pgs/TroubleshootingTips.html">Troubleshooting tips</a> </p> <h4 id="contentbottom"> <a href="https://www.adium.im/">www.adium.im</a> </h4>
--- a/AdiumHelp/pgs/Account-RegisteringXMPPAccount.html Sat Apr 05 12:41:19 2014 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">-<html xmlns="http://www.w3.org/1999/xhtml">-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />-<meta name="keywords" content="account, xmpp, jabber, jabber naming" />-<meta name="description" content="Registering an XMPP Account" />-<title>Registering an XMPP (Jabber) account</title>-<link media="all" rel="stylesheet" href="../css/topicpage.css" type="text/css" />-<div id="banner"> <a name="account" id="account"></a><a name="jabber" id="jabber"></a>- <div id="navleft"><a class="navleftsty" href="../AdiumHelp.html">Adium Help</a> <a class="navleftsty" href="AdiumDocumentation.html">Adium Documentation</a></div>- <div id="caticon"> <img src="../gfx/AdiumIcon.png" alt="Adium Icon" height="32" width="32" border="0" /> </div>- <h1>Registering an XMPP (Jabber) account</h1>- <div class="taskboxline">- <div class="taskboxheader">- <h3>Setting up an account via Adium</h3>- <div class="taskboxtext">- <p>On most XMPP (previously known as "Jabber") servers, Adium can register your account with the server for you. Just set up your account as if you were already registered by following the steps described in <a href="Accounts-CreatingAccounts.html">Creating An Account</a>, including your desired Jabber ID and password. When the account attempts to connect, Adium will notify you that the account is not yet registered and will offer to register it.</p>- <div class="taskboxline">- <div class="taskboxheader">- <h3>Username constraints</h3>- <div class="taskboxtext">- <li>Usernames are case-insensitive (e.g. "StPeter" is the same as "stpeter") and are limited to 1023 Characters.</li>- <li>In addition, certain characters are not allowed in your username:- <li>' (single quote)</li>- <li>" (double quote)</li>- <li>< (open angle bracket)</li>- <li>> (close angle bracket)</li>- <li>& (ampersand)</li>- <li>space, carriage-return, line-feed, horizontal tab, and any other whitespace</li>- <li>ASCII control characters</li>- <div class="taskboxline">- <div class="taskboxheader">- <h3>How to specify an XMPP server</h3>- <div class="taskboxtext">- <p>Jabber IDs are in the form <i>name@server</i>.</p>- <p>The name <i>adiumuser</i> on <i>jabber.org</i> would be <i>adiumuser@jabber.org</i>.</p>- <p><i>adiumuser</i> on <i>jabber-fr.net</i> would be <i>adiumuser@jabber-fr.net</i>.</p>-<script type="text/javascript" src="../js/help.js"></script>--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/AdiumHelp/pgs/Account-XMPP-RegisteringAccount.html Wed Apr 23 20:48:33 2014 +0200
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> +<meta name="keywords" content="account, xmpp, jabber, ID, register, create, set, sign, up" /> +<meta name="description" content="Registering an XMPP ("Jabber") Account" /> +<title>Registering an XMPP ("Jabber") account</title> +<link media="all" rel="stylesheet" href="../css/topicpage.css" type="text/css" /> +<div id="banner"> <a name="account" id="account"></a><a name="XMPP" id="XMPP"></a> + <div id="navleft"><a class="navleftsty" href="../AdiumHelp.html">Adium Help</a> <a class="navleftsty" href="AdiumDocumentation.html">Adium Documentation</a></div> + <div id="caticon"> <img src="../gfx/AdiumIcon.png" alt="Adium Icon" height="32" width="32" border="0" /> </div> + <h1>Registering an XMPP ("Jabber") account</h1> + <div class="taskboxline"> + <div class="taskboxheader"> + <h3>Setting up an account via Adium</h3> + <div class="taskboxtext"> + <p>On most <a href="Accounts-XMPP.html">XMPP</a> servers, Adium can register your account with the server for you. Just set up your account as if you were already registered by following the steps described in <a href="Accounts-CreatingAccounts.html">Creating Accounts</a>, including your desired Jabber ID and password. When the account attempts to connect, Adium will notify you that the account is not yet registered and will offer to register it.</p> + <div class="taskboxline"> + <div class="taskboxheader"> + <h3>Choosing an XMPP server</h3> + <div class="taskboxtext"> + <p>Unlike traditional and proprietary instant messaging services, with XMPP there is no central server. Similar to email, users can choose a server and communicate with users connected to a different XMPP server.</p> + <p>There are many public XMPP servers to choose from, <a class="ext_link" href="http://xmpp.net/directory.php">xmpp.net has a list</a>. We recommend selecting a server which</p> + <li>has an A/A security rating (according to xmpp.net),</li> + <li>has a trusted certificate (according to xmpp.net),</li> + <li>is reliable, has a high uptime percentage,</li> + <li>is in a country near you.</li> + <div class="taskboxline"> + <div class="taskboxheader"> + <h3>Jabber IDs: username and server</h3> + <div class="taskboxtext"> + <p>Jabber IDs are in the form <i>username@server</i>. The name <i>adiumuser</i> on <i>jabber.org</i> would be <i>adiumuser@jabber.org</i>. <i>adiumuser</i> on <i>jabber-fr.net</i> would be <i>adiumuser@jabber-fr.net</i>.</p> + <div class="taskboxline"> + <div class="taskboxheader"> + <h3>Username constraints</h3> + <div class="taskboxtext"> + <li>Usernames are case-insensitive (e.g. "StPeter" is the same as "stpeter") and are limited to 1023 Characters.</li> + <li>In addition, certain characters are not allowed in your username: + <li>' (single quote)</li> + <li>" (double quote)</li> + <li>< (open angle bracket)</li> + <li>> (close angle bracket)</li> + <li>& (ampersand)</li> + <li>space, carriage-return, line-feed, horizontal tab, and any other whitespace</li> + <li>ASCII control characters</li> +<script type="text/javascript" src="../js/help.js"></script> --- a/AdiumHelp/pgs/Accounts-ContactIcons.html Sat Apr 05 12:41:19 2014 -0400
+++ b/AdiumHelp/pgs/Accounts-ContactIcons.html Wed Apr 23 20:48:33 2014 +0200
@@ -71,8 +71,8 @@
<h3>Setting your own animated contact icon</h3>
<div class="taskboxtext">
- <p>When using AIM and Jabber, Adium supports animated contact icons in the form of .gif files. To set an animated contact icon, drag the .gif file from the Finder into the image well in the "Personal" tab of your account's settings. Note that you must drag the file into the image well; you will not be able to use the animation of the icon if you use the Image Picker or press the "Choose Icon" button to select it.</p>- <p>AIM contact icons must be between 48x48 and 50x50 pixels, Jabber icons have a size limit of 96x96. When an image is resized, its animation is lost, so if Adium has to resize your image, you will lose its animation. AIM animated contact icons therefore can not be more than 50x50 pixels, Jabber animated icons no more than 96x96.</p>+ <p>When using AIM and XMPP ("Jabber"), Adium supports animated contact icons in the form of .gif files. To set an animated contact icon, drag the .gif file from the Finder into the image well in the "Personal" tab of your account's settings. Note that you must drag the file into the image well; you will not be able to use the animation of the icon if you use the Image Picker or press the "Choose Icon" button to select it.</p> + <p>AIM contact icons must be between 48x48 and 50x50 pixels, XMPP ("Jabber") icons have a size limit of 96x96. When an image is resized, its animation is lost, so if Adium has to resize your image, you will lose its animation. AIM animated contact icons therefore can not be more than 50x50 pixels, XMPP ("Jabber") animated icons no more than 96x96.</p> <div class="taskboxline">
--- a/AdiumHelp/pgs/Accounts-CreatingAccounts.html Sat Apr 05 12:41:19 2014 -0400
+++ b/AdiumHelp/pgs/Accounts-CreatingAccounts.html Wed Apr 23 20:48:33 2014 +0200
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="keywords" content="account, create, sign, up" />+<meta name="keywords" content="account, register, create, set, sign, up" /> <meta name="description" content="Creating an account" />
<title>Creating an account</title>
<link media="all" rel="stylesheet" href="../css/topicpage.css" type="text/css" />
@@ -17,7 +17,7 @@
<h1>Creating accounts</h1>
- <p>To use Adium, you'll need an account on one or more of the IM services that it supports. Before proceeding, you should either have an existing name and password, or you need to sign up for an account on the service of your choice. Note that Adium will offer to <a href="Account-RegisteringJabberAccount.html">register your account on the Jabber service</a> when setting up a Jabber account.</p>+ <p>To use Adium, you'll need an account on one or more of the IM services that it supports. Before proceeding, you should either have an existing name and password, or you need to sign up for an account on the service of your choice. Note that Adium will offer to <a href="Account-XMPP-RegisteringAccount.html">register your account on the XMPP ("Jabber") service</a> when setting up a XMPP ("Jabber") account.</p> <p>You'll only be able to communicate with contacts (also called 'buddies' or 'users') on a service if you have an account on that service. In other words, you'll need an AIM account to talk to AIM contacts, an MSN account to talk to MSN contacts, etc. You can have as many accounts, on as many services, as you want, and they can all be signed on with Adium simultaneously.</p>
<div class="taskboxline">
<div class="taskboxheader">
@@ -57,9 +57,9 @@
<li><a class="ext_link" href="http://www.apple.com/support/bonjour/">Bonjour</a> No Signup Needed.</li>
<li><a class="ext_link" href="http://talk.google.com/">Google Talk</a></li>
<li><a class="ext_link" href="http://www.icq.com/register/">ICQ</a></li>
- <li><a href="Account-RegisteringJabberAccount.html">Jabber</a></li>+ <li><a href="Account-XMPP-RegisteringAccount.html">XMPP ("Jabber")</a></li> <li><a class="ext_link" href="http://www.livejournal.com/chat/">LiveJournal</a></li>
- <li><a class="ext_link" href="http://www.passport.com/">MSN Messenger</a></li>+ <li><a class="ext_link" href="https://signup.live.com">MSN Messenger</a></li> <li><a class="ext_link" href="http://edit.yahoo.com/">Yahoo!Messenger</a></li>
--- a/AdiumHelp/pgs/Accounts-GoogleTalk.html Sat Apr 05 12:41:19 2014 -0400
+++ b/AdiumHelp/pgs/Accounts-GoogleTalk.html Wed Apr 23 20:48:33 2014 +0200
@@ -37,7 +37,7 @@
<td><strong>Interoperability:</strong></td>
- <td>XMPP, LiveJournal, Gizmo, AIM</td>+ <td>XMPP, LiveJournal, AIM</td> <p>To add someone using AIM to your GTalk account, add <strong><screenname>@aol.com</strong>. If their screen name is an email, add <strong><username>(<domain>)@aol.com</strong>. For example, to add bob@me.com use bob(me.com)@aol.com. Note that if your GTalk address and AIM screen name are the same, messages from your AIM contacts will be received by both.</p>
--- a/AdiumHelp/pgs/Accounts-LJTalk.html Sat Apr 05 12:41:19 2014 -0400
+++ b/AdiumHelp/pgs/Accounts-LJTalk.html Wed Apr 23 20:48:33 2014 +0200
@@ -37,7 +37,7 @@
<td><strong>Interoperability:</strong></td>
- <td>Google Talk, LiveJournal, Gizmo</td>+ <td>Google Talk, LiveJournal</td> <p>LiveJournal is Six Apart's blogging service. Its XMPP-based instant-messaging service is called "LJ Talk".</p>
--- a/AdiumHelp/pgs/Accounts-ListOfServices.html Sat Apr 05 12:41:19 2014 -0400
+++ b/AdiumHelp/pgs/Accounts-ListOfServices.html Wed Apr 23 20:48:33 2014 +0200
@@ -17,7 +17,7 @@
<h1>List of services supported and their interoperability</h1>
- <p>This Adium Wiki page lists all services Adium supports. Clicking on a service will lead you to a dedicated page with more information on the specific service, e.g. history and censorship.</p>+ <p>This page lists all services Adium supports. Clicking on a service will lead you to a dedicated page with more information on the specific service, e.g. history and censorship.</p> <p>Further down, you can find out which services interoperate ("which service can talk to which") as most services don't interoperate with most other services—this is not an Adium thing.</p>
<p><strong>Note:</strong> We do not host any IM services ourselves. Adium is a third-party client for connecting to services run by other people (mostly companies).</p>
<div class="taskboxline">
@@ -45,7 +45,6 @@
<li><a href="Accounts-Bonjour.html">Bonjour</a>, compatible with iChat</li>
<li><a href="Accounts-Twitter.html">Twitter</a></li>
<li><a href="Accounts-IRC.html">IRC</a></li>
- <li><a href="Accounts-MySpace.html">MySpaceIM</a></li> <li><a href="Accounts-Gadu-Gadu.html">Gadu-Gadu</a></li>
<li><a href="Accounts-Sametime.html">IBM Lotus Sametime</a></li>
<li><a href="Accounts-GroupWise.html">Novell GroupWise</a></li>
@@ -60,11 +59,11 @@
<p>No service can talk to all services. This means in order to talk to contact X, you must have an account on the same service as contact X, or on any compatible service.</p>
<li>If you have an account on AIM, ICQ, or MobileMe, you can chat with anybody who uses AIM, ICQ, MobileMe, or SMS.</li>
- <li>If you have an account on Google Talk, XMPP ("Jabber"), LiveJournal, or Gizmo, you can chat with anybody who uses Google Talk, XMPP ("Jabber"), LiveJournal, or Gizmo.</li>+ <li>If you have an account on XMPP ("Jabber"), Google Talk or LiveJournal, you can chat with anybody who uses XMPP ("Jabber"), Google Talk or LiveJournal.</li> <li>In the official clients, MSN users can chat with Yahoo! users but this is not yet supported by Adium.</li>
<p><strong>XMPP transports</strong></p>
- <p>Some XMPP ("Jabber") servers (mostly private ones) allow chats with proprietary services such as AIM, MSN, and Yahoo! via a mechanism called "XMPP transports". In Adium, you should be able to chat through transports transparently (that is, it should work just like chatting with users who actually are on the same server). However, you will need to contact the administrator of your Jabber server to find out what services it has transports for. The public servers for Jabber.org and Google Talk do not support transports.</p>+ <p>Some XMPP ("Jabber") servers (mostly private ones) allow chats with proprietary services such as AIM, MSN, and Yahoo! via a mechanism called "XMPP transports". In Adium, you should be able to chat through transports transparently (that is, it should work just like chatting with users who actually are on the same server). However, you will need to contact the administrator of your XMPP ("Jabber") server to find out what services it has transports for. The public servers for Jabber.org and Google Talk do not support transports.</p> --- a/AdiumHelp/pgs/Accounts-MSN.html Sat Apr 05 12:41:19 2014 -0400
+++ b/AdiumHelp/pgs/Accounts-MSN.html Wed Apr 23 20:48:33 2014 +0200
@@ -77,7 +77,7 @@
<li>ListAllTopics.php</li>
- <li>.scr (<a class="ext_link" href="http://forums.worsethanfailure.com/forums/thread/126976.aspx">source</a>)</li> <p><a class="ext_link" href="http://www.allocinit.net/blog/msn-blocked-phrases/">Andrew Wellington has a much longer list.</a></p>
<p>See <a class="ext_link" href="http://virtuelvis.com/archives/2006/02/microsoft-censoring-msn-messenger">Microsoft censoring MSN Messenger conversations</a> for more information.</p>
--- a/AdiumHelp/pgs/Accounts-MySpace.html Sat Apr 05 12:41:19 2014 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">-<html xmlns="http://www.w3.org/1999/xhtml">-<meta http-equiv="content-type" content="text/html; charset=utf-8" />-<meta name="keywords" content="MySpaceIM" />-<meta name="description" content="MySpaceIM" />-<title>MySpaceIM</title>-<link href="../css/topicpage.css" type="text/css" rel="stylesheet" media="all" />- <div id="navleft"><a class="navleftsty" href="../AdiumHelp.html">Adium Help</a> <a class="navleftsty" href="AdiumDocumentation.html">Adium Documentation</a></div>- <div id="caticon"> <img src="../gfx/AdiumIcon.png" alt="Adium Icon" height="32" width="32" border="0" /> </div>- <div class="taskboxline">- <div class="taskboxheader">- <div class="taskboxtext">- <td><strong>Homepage:</strong></td>- <td> <a class="ext_link" href="http://www.myspace.com/guide/im">http://www.myspace.com/guide/im</a></td>- <td><strong>Type:</strong></td>- <td><strong>Identity:</strong></td>- <td><strong>Interoperability:</strong></td>- <td><strong>Popularity:</strong></td>- <p>MySpace is a social networking website. Its "MySpaceIM" chat service is supported in Adium 1.1.3 and later.</p>- <div class="taskboxline">- <div class="taskboxheader">- <div class="taskboxtext">- <div class="taskboxline">- <div class="taskboxheader">- <div class="taskboxtext">-<script type="text/javascript" src="../js/help.js"></script>--- a/AdiumHelp/pgs/Accounts-SettingYourStatus.html Sat Apr 05 12:41:19 2014 -0400
+++ b/AdiumHelp/pgs/Accounts-SettingYourStatus.html Wed Apr 23 20:48:33 2014 +0200
@@ -38,7 +38,7 @@
<div class="taskboxtext">
- <p>AIM, ICQ, Jabber, Sametime, and Yahoo allow you to set a status message. AIM and Yahoo available messages are "Plain Text" which means they can not support formatting such as bold or italic, nor can they support links. If you set such attributes, it will be stripped before the available message is set.</p>+ <p>AIM, ICQ, XMPP ("Jabber"), Sametime, and Yahoo allow you to set a status message. AIM and Yahoo available messages are "Plain Text" which means they can not support formatting such as bold or italic, nor can they support links. If you set such attributes, it will be stripped before the available message is set.</p> <p>AIM available messages are limited to approximately 60 characters by the AIM server. Messages longer than this will be truncated automatically.</p>
@@ -49,7 +49,7 @@
- <li>AIM, Jabber, MSN, and Yahoo support invisibility. Simply choose "Invisible" from the State menu in the Custom... status window. If you use Invisible often, we suggest checking "Save Custom Status" so the Invisible state will be in your Status menus</li>+ <li>AIM, XMPP ("Jabber"), MSN, and Yahoo support invisibility. Simply choose "Invisible" from the State menu in the Custom... status window. If you use Invisible often, we suggest checking "Save Custom Status" so the Invisible state will be in your Status menus</li> <li>In versions prior to 1.0, there is no Invisible status in Adium by default. You have to create such a status by choosing either of the two “Custom…” menu items in the Status menu, and changing the custom status's state to Invisible. Remember to choose “Save Custom Status” if you want to keep the Invisible status around.</li>
@@ -93,7 +93,7 @@
<div class="taskboxtext">
<p>Any status can have an "autoreply" which is sent in response to the first incoming message you receive from a contact. By default, Custom Away messages have an autoreply and other statuses do not. This can be controlled in the Custom Status dialogue box by toggling the Autoreply checkbox. Unless you specify otherwise, the autoreply is the same as your Status Message.</p>
- <p>AIM, ICQ, and Jabber contacts will be informed seamlessly that the message is an autoreply; on other services, Adium will add the "(Autoreply) " before your message so that the other side can tell the message's origin.</p>+ <p>AIM, ICQ, and XMPP ("Jabber") contacts will be informed seamlessly that the message is an autoreply; on other services, Adium will add the "(Autoreply) " before your message so that the other side can tell the message's origin.</p> <div class="taskboxline">
--- a/AdiumHelp/pgs/Accounts-XMPP.html Sat Apr 05 12:41:19 2014 -0400
+++ b/AdiumHelp/pgs/Accounts-XMPP.html Wed Apr 23 20:48:33 2014 +0200
@@ -37,13 +37,16 @@
<td><strong>Interoperability:</strong></td>
- <td>Google Talk, LiveJournal, Gizmo</td>+ <td>Google Talk, LiveJournal</td> - <p>Note that XMPP is special, due to being an open protocol. There is no central XMPP server, the structure is like e-mail. Everybody (with a static IP) can host an XMPP server, optionally linking it up to the global XMPP network (otherwise, only local users on the same server are accessible).</p>- <p>There are already several larger XMPP installations, like Google Talk, LiveJournal and Gizmo.</p>- <p>This openness also means that unless you want to install your own server (not recommended), you also have to choose a hoster for your account (just like for email). Besides the three mentioned in the previous paragraph, the community portal jabber.org also has a <a class="ext_link" href="http://www.jabber.org/web/Services">list</a>.</p>- <p>More technical information can be found at <a class="ext_link" href="http://www.xmpp.org/">the XMPP Standards Foundation</a>.</p>+ <p>Unlike traditional and proprietary instant messaging services, with XMPP (previously known as "Jabber") there is no central server. Similar to email, users can choose a server and they will be able to communicate with users connected to a different XMPP server. In fact, everybody (with a static IP) can host an XMPP server of their own, optionally linking it up to the global XMPP network (otherwise, only local users on the same server are accessible).</p> + <p>There are already several larger XMPP installations, like Google Talk and LiveJournal.</p> + <p>Further information:</p> + <li><a href="ServiceInformation-XMPPSupport.html">XMPP ("Jabber") in Adium</a></li> + <li><a href="Account-XMPP-RegisteringAccount.html">Registering an XMPP ("Jabber") account</a></li> <div class="taskboxline">
--- a/AdiumHelp/pgs/Accounts-iTunesIntegration.html Sat Apr 05 12:41:19 2014 -0400
+++ b/AdiumHelp/pgs/Accounts-iTunesIntegration.html Wed Apr 23 20:48:33 2014 +0200
@@ -47,10 +47,10 @@
<div class="taskboxline">
<div class="taskboxheader">
- <h3>MSN & Jabber</h3>+ <h3>MSN & XMPP ("Jabber")</h3> <div class="taskboxtext">
- <p>Apart from your status, MSN and Jabber show a separate "Now Playing" field in other people's clients. You can turn this on or off in the account's preferences → Privacy → "Let others know what iTunes is playing".</p>+ <p>Apart from your status, MSN and XMPP ("Jabber") show a separate "Now Playing" field in other people's clients. You can turn this on or off in the account's preferences → Privacy → "Let others know what iTunes is playing".</p> <div class="taskboxline">
--- a/AdiumHelp/pgs/AdiumDocumentation.html Sat Apr 05 12:41:19 2014 -0400
+++ b/AdiumHelp/pgs/AdiumDocumentation.html Wed Apr 23 20:48:33 2014 +0200
@@ -18,7 +18,7 @@
<h1>Adium Documentation</h1>
<p>Welcome to the Documentation!</p>
- <p>Adium seeks to be the most user-friendly and intuitive universal instant messaging client possible while maintaining significant flexibility. This documentation should help to answer most any question you may have; if you have a concern or request not covered here, please visit <a href=" /">Adium Help</a>.</p>+ <p>Adium seeks to be the most user-friendly and intuitive universal instant messaging client possible while maintaining significant flexibility. This documentation should help to answer most any question you may have; if you have a concern or request not covered here, please visit <a href="https://adium.im/help/">Adium Help</a>.</p> <p>The articles below cover a wide range of topics from initial setup and messaging to advanced contact list management and customization.</p>
<p>So don't hesitate – jump right in! :)</p>
<div class="taskboxline">
@@ -136,9 +136,9 @@
<li><a href="AdvancedFeatures-OTREncryption.html">OTR encryption ▸</a></li>
<li>Service-specific information</li>
- <li><a href="AdvancedFeatures-DirectConnect.html">AIM: Direct Connect ▸</a></li>- <li><a href="AdvancedFeatures-SearchForBuddyBy Email.html">AIM: Search for buddy by email address ▸</a></li>- <li><a href="AdvancedFeatures-NudgeBuzz.html">MSN: Nudge / Yahoo: Buzz ▸</a></li>+ <li><a href="AdvancedFeatures-AIM-DirectConnect.html">AIM: Direct Connect ▸</a></li> + <li><a href="AdvancedFeatures-AIM-SearchForBuddyByEmail.html">AIM: Search for buddy by email address ▸</a></li> + <li><a href="AdvancedFeatures-MSNYahoo-NudgeBuzz.html">MSN: Nudge / Yahoo: Buzz ▸</a></li> @@ -204,7 +204,6 @@
<li><a href="Accounts-Bonjour.html">Bonjour</a>, compatible with iChat</li>
<li><a href="Accounts-Twitter.html">Twitter</a></li>
<li><a href="Accounts-IRC.html">IRC</a></li>
- <li><a href="Accounts-MySpace.html">MySpaceIM</a></li> <li><a href="Accounts-Gadu-Gadu.html">Gadu-Gadu</a></li>
<li><a href="Accounts-Sametime.html">IBM Lotus Sametime</a></li>
<li><a href="Accounts-GroupWise.html">Novell GroupWise</a></li>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/AdiumHelp/pgs/AdvancedFeatures-AIM-DirectConnect.html Wed Apr 23 20:48:33 2014 +0200
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> +<link media="all" rel="stylesheet" href="../css/topicpage.css" type="text/css" /> +<title>AIM: DirectConnect</title> +<meta name="keywords" content="account, aim, aol, direct connect" /> +<meta name="description" content="Supplemental information about your AOL IM account." /> +<div id="banner"> <a name="account" id="account"></a><a name="aim" id="aim"></a> + <div id="navleft"><a class="navleftsty" href="../AdiumHelp.html">Adium Help</a> <a class="navleftsty" href="AdiumDocumentation.html">Adium Documentation</a></div> + <div id="caticon"> <img src="../gfx/AdiumIcon.png" alt="Adium Icon" height="32" width="32" border="0" /> </div> + <h1>AIM: DirectConnect</h1> + <div class="taskboxline"> + <div class="taskboxheader"> + <h3>Using Direct Connect</h3> + <div class="taskboxtext"> + <p>When using the AIM and Mobile Me services (including when talking to contacts using iChat), you can "directly connect" to send a contact inline pictures and large blocks of text. Images dragged and dropped – or pasted – into a chat which is directly connected are sent and displayed inside that window rather than via a separate file transfer.</p> + <p>To initiate a Direct Connect, simply drag or paste an image into the text entry area. Adium will invite the remote user to accept a direct connection (iChat automatically accepts such invitations) and then display the picture inline in both your message window and the other user's message window.</p> + <p>Direct Connect faces the same difficulties as <a href="AdvancedFeatures-FileTransfer.html">file transfer</a> (e.g. NAT traversal). + <p>Direct Connect is also called “direct messaging”, “direct IM”, or “direct chat”.</p> +<script type="text/javascript" src="../js/help.js"></script> --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/AdiumHelp/pgs/AdvancedFeatures-AIM-SearchForBuddyByEmail.html Wed Apr 23 20:48:33 2014 +0200
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> +<link media="all" rel="stylesheet" href="../css/topicpage.css" type="text/css" /> +<title>AIM: search for buddy by email address</title> +<meta name="keywords" content="account, aim, aol, search, email" /> +<meta name="description" content="Supplemental information about your AOL IM account." /> +<div id="banner"> <a name="account" id="account"></a><a name="msn" id="msn"></a> + <div id="navleft"><a class="navleftsty" href="../AdiumHelp.html">Adium Help</a> <a class="navleftsty" href="AdiumDocumentation.html">Adium Documentation</a></div> + <div id="caticon"> <img src="../gfx/AdiumIcon.png" alt="Adium Icon" height="32" width="32" border="0" /> </div> + <h1>AIM: search for buddy by email address</h1> + <div class="taskboxline"> + <div class="taskboxheader"> + <h3>Searching for a contact by their email address</h3> + <div class="taskboxtext"> + <p>If you want to find one of your AIM contacts by their email address, just select select "Search for Buddy by Email" from the submenu of the AIM account in the File menu.</p> +<script type="text/javascript" src="../js/help.js"></script> --- a/AdiumHelp/pgs/AdvancedFeatures-DirectConnect.html Sat Apr 05 12:41:19 2014 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">-<html xmlns="http://www.w3.org/1999/xhtml">-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />-<link media="all" rel="stylesheet" href="../css/topicpage.css" type="text/css" />-<title>AIM: DirectConnect</title>-<meta name="keywords" content="account, aim, aol, direct connect" />-<meta name="description" content="Supplemental information about your AOL IM account." />-<div id="banner"> <a name="account" id="account"></a><a name="aim" id="aim"></a>- <div id="navleft"><a class="navleftsty" href="../AdiumHelp.html">Adium Help</a> <a class="navleftsty" href="AdiumDocumentation.html">Adium Documentation</a></div>- <div id="caticon"> <img src="../gfx/AdiumIcon.png" alt="Adium Icon" height="32" width="32" border="0" /> </div>- <h1>AIM: DirectConnect</h1>- <div class="taskboxline">- <div class="taskboxheader">- <h3>Using Direct Connect</h3>- <div class="taskboxtext">- <p>When using the AIM and Mobile Me services (including when talking to contacts using iChat), you can "directly connect" to send a contact inline pictures and large blocks of text. Images dragged and dropped – or pasted – into a chat which is directly connected are sent and displayed inside that window rather than via a separate file transfer.</p>- <p>To initiate a Direct Connect, simply drag or paste an image into the text entry area. Adium will invite the remote user to accept a direct connection (iChat automatically accepts such invitations) and then display the picture inline in both your message window and the other user's message window.</p>- <p>Direct Connect faces the same difficulties as <a href="AdvancedFeatures-FileTransfer.html">file transfer</a> (e.g. NAT traversal).- <p>Direct Connect is also called “direct messaging”, “direct IM”, or “direct chat”.</p>-<script type="text/javascript" src="../js/help.js"></script>--- a/AdiumHelp/pgs/AdvancedFeatures-Events.html Sat Apr 05 12:41:19 2014 -0400
+++ b/AdiumHelp/pgs/AdvancedFeatures-Events.html Wed Apr 23 20:48:33 2014 +0200
@@ -17,7 +17,7 @@
- <p>Adium features a highly-customisable "Events" system which allows you to tie certain "actions" to "events" and save settings of this kind as "presets".</p>+ <p>Adium features a highly customisable "Events" system which allows you to tie certain "actions" to "events" and save settings of this kind as "presets".</p> <div class="taskboxline">
<div class="taskboxheader">
<h3>What are "events" and "actions"?</h3>
--- a/AdiumHelp/pgs/AdvancedFeatures-FileTransfer.html Sat Apr 05 12:41:19 2014 -0400
+++ b/AdiumHelp/pgs/AdvancedFeatures-FileTransfer.html Wed Apr 23 20:48:33 2014 +0200
@@ -17,7 +17,7 @@
- <p>Adium supports file transfers over AIM, Jabber, MSN, and Yahoo protocols.</p>+ <p>Adium supports file transfers over AIM, XMPP ("Jabber"), MSN, and Yahoo protocols.</p> <div class="taskboxline">
<div class="taskboxheader">
<h3>Which protocols support file transfer?</h3>
@@ -31,7 +31,7 @@
<li>SILC (not yet in Adium)</li>
<li>Yahoo when not using an HTTP proxy (is relayed via a file transfer server).</li>
- <li>XMPP (Jabber) when neither side is behind a NAT device.</li>+ <li>XMPP ("Jabber") when neither side is behind a NAT device.</li> --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/AdiumHelp/pgs/AdvancedFeatures-MSNYahoo-NudgeBuzz.html Wed Apr 23 20:48:33 2014 +0200
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> +<link media="all" rel="stylesheet" href="../css/topicpage.css" type="text/css" /> +<title>MSN: Nudge / Yahoo: Buzz</title> +<meta name="keywords" content="nudge, buzz, msn, yahoo" /> +<meta name="description" content="Buzz/Nudge in Adium." /> +<div id="banner"> <a name="account" id="account"></a><a name="aim" id="aim"></a> + <div id="navleft"><a class="navleftsty" href="../AdiumHelp.html">Adium Help</a> <a class="navleftsty" href="AdiumDocumentation.html">Adium Documentation</a></div> + <div id="caticon"> <img src="../gfx/AdiumIcon.png" alt="Adium Icon" height="32" width="32" border="0" /> </div> + <h1>MSN: Nudge / Yahoo: Buzz</h1> + <p>Adium calls it simply “notification”, and enables you to send and receive it.</p> + <p>The same information on this page is also presented in <a href="http://adium.im/screencasts/?video=5">an Adium screencast</a> on our website, which shows the feature in action.</p> + <div class="taskboxline"> + <div class="taskboxheader"> + <h3>Presenting notifications you receive</h3> + <div class="taskboxtext"> + <p>When somebody nudges/buzzes you, the official clients will shake the window and play a sound.</p> + <p>We don't offer the window-shaking action, but we do provide our entire usual suite of event actions. You see, receiving a notification is in Adium as one of the events in the Preferences. You determine what Adium will do when one comes in.</p> + <p>In the <strong>Events</strong> pane of Adium's Preferences simply select the “Notification received” event in the list, click the <strong>+</strong> button, and choose the action you want Adium to perform. You can add as many actions as you want.</p> + <div class="taskboxline"> + <div class="taskboxheader"> + <h3>Sending notifications</h3> + <div class="taskboxtext"> + <p>There are three ways to send a notification to one of your contacts:</p> + <li>The keyboard: Type “/nudge” / "/buzz" into the inputline and press Return or Enter.</li> + <li>The menu: Choose “Request Attention” from the Contact menu.</li> + <li>The toolbar: The “Request Attention” button is not on the chat window toolbar by default, so you need to add it. + <li>First, right-click on the chat window toolbar and choose “Customize Toolbar…”.</li> + <li>Drag the “Request Attention” button to the toolbar. Finally, click OK. From then on, when you want to send a notification, click “Request Attention” (or the shaking-emoticon icon if you're using Icon Only mode).</li> +<script type="text/javascript" src="../js/help.js"></script> --- a/AdiumHelp/pgs/AdvancedFeatures-NudgeBuzz.html Sat Apr 05 12:41:19 2014 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">-<html xmlns="http://www.w3.org/1999/xhtml">-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />-<link media="all" rel="stylesheet" href="../css/topicpage.css" type="text/css" />-<title>MSN: Nudge / Yahoo: Buzz</title>-<meta name="keywords" content="nudge, buzz, msn, yahoo" />-<meta name="description" content="Buzz/Nudge in Adium." />-<div id="banner"> <a name="account" id="account"></a><a name="aim" id="aim"></a>- <div id="navleft"><a class="navleftsty" href="../AdiumHelp.html">Adium Help</a> <a class="navleftsty" href="AdiumDocumentation.html">Adium Documentation</a></div>- <div id="caticon"> <img src="../gfx/AdiumIcon.png" alt="Adium Icon" height="32" width="32" border="0" /> </div>- <h1>MSN: Nudge / Yahoo: Buzz</h1>- <p>Adium calls it simply “notification”, and enables you to send and receive it.</p>- <p>The same information on this page is also presented in <a href="http://adium.im/screencasts/?video=5">an Adium screencast</a> on our website, which shows the feature in action.</p>- <div class="taskboxline">- <div class="taskboxheader">- <h3>Presenting notifications you receive</h3>- <div class="taskboxtext">- <p>When somebody nudges/buzzes you, the official clients will shake the window and play a sound.</p>- <p>We don't offer the window-shaking action, but we do provide our entire usual suite of event actions. You see, receiving a notification is in Adium as one of the events in the Preferences. You determine what Adium will do when one comes in.</p>- <p>In the <strong>Events</strong> pane of Adium's Preferences simply select the “Notification received” event in the list, click the <strong>+</strong> button, and choose the action you want Adium to perform. You can add as many actions as you want.</p>- <div class="taskboxline">- <div class="taskboxheader">- <h3>Sending notifications</h3>- <div class="taskboxtext">- <p>There are three ways to send a notification to one of your contacts:</p>- <li>The keyboard: Type “/nudge” / "/buzz" into the inputline and press Return or Enter.</li>- <li>The menu: Choose “Request Attention” from the Contact menu.</li>- <li>The toolbar: The “Request Attention” button is not on the chat window toolbar by default, so you need to add it.- <li>First, right-click on the chat window toolbar and choose “Customize Toolbar…”.</li>- <li>Drag the “Request Attention” button to the toolbar. Finally, click OK. From then on, when you want to send a notification, click “Request Attention” (or the shaking-emoticon icon if you're using Icon Only mode).</li>-<script type="text/javascript" src="../js/help.js"></script>--- a/AdiumHelp/pgs/AdvancedFeatures-OTREncryption.html Sat Apr 05 12:41:19 2014 -0400
+++ b/AdiumHelp/pgs/AdvancedFeatures-OTREncryption.html Wed Apr 23 20:48:33 2014 +0200
@@ -17,7 +17,7 @@
- <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>+ <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> <li>"Encryption: No one else can read your instant messages."</li>
<li>"Authentication: You are assured the correspondent is who you think it is."</li>
--- a/AdiumHelp/pgs/AdvancedFeatures-SearchForBuddyByEmail.html Sat Apr 05 12:41:19 2014 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">-<html xmlns="http://www.w3.org/1999/xhtml">-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />-<link media="all" rel="stylesheet" href="../css/topicpage.css" type="text/css" />-<title>AIM: search for buddy by email address</title>-<meta name="keywords" content="account, aim, aol, search, email" />-<meta name="description" content="Supplemental information about your AOL IM account." />-<div id="banner"> <a name="account" id="account"></a><a name="msn" id="msn"></a>- <div id="navleft"><a class="navleftsty" href="../AdiumHelp.html">Adium Help</a> <a class="navleftsty" href="AdiumDocumentation.html">Adium Documentation</a></div>- <div id="caticon"> <img src="../gfx/AdiumIcon.png" alt="Adium Icon" height="32" width="32" border="0" /> </div>- <h1>AIM: search for buddy by email address</h1>- <div class="taskboxline">- <div class="taskboxheader">- <h3>Searching for a contact by their email address</h3>- <div class="taskboxtext">- <p>If you want to find one of your AIM contacts by their email address, just select select "Search for Buddy by Email" from the submenu of the AIM account in the File menu.</p>-<script type="text/javascript" src="../js/help.js"></script>--- a/AdiumHelp/pgs/Messaging-FontsAndColors.html Sat Apr 05 12:41:19 2014 -0400
+++ b/AdiumHelp/pgs/Messaging-FontsAndColors.html Wed Apr 23 20:48:33 2014 +0200
@@ -109,7 +109,7 @@
<h3>Isn't this all one big mess?</h3>
<div class="taskboxtext">
- <p>Yes, it is. We'll iron this out in a future release.</p>+ <p>Yes, it is. We'd like to iron this out in a future release.</p> --- a/AdiumHelp/pgs/Messaging-GroupChat.html Sat Apr 05 12:41:19 2014 -0400
+++ b/AdiumHelp/pgs/Messaging-GroupChat.html Wed Apr 23 20:48:33 2014 +0200
@@ -24,7 +24,7 @@
<h3>Initiating/joining a group chat</h3>
<div class="taskboxtext">
- <p><b>AIM, Jabber, SameTime, Yahoo</b></p>+ <p><b>AIM, XMPP ("Jabber"), SameTime, Yahoo</b></p> <p>Choose <b>File</b> → <b>Join Group</b> Chat and enter the details for the chat. You may invite contacts to join you in the chat immediately via the Join Group Chat window, and you may invite them later by:</p>
<li>Selecting them in the contact list and choosing <b>Contact</b> → <b>Invite to Chat</b> and selecting the chat, or</li>
--- a/AdiumHelp/pgs/Messaging-SendingMessages.html Sat Apr 05 12:41:19 2014 -0400
+++ b/AdiumHelp/pgs/Messaging-SendingMessages.html Wed Apr 23 20:48:33 2014 +0200
@@ -37,7 +37,7 @@
<div class="taskboxtext">
<p>Type a message, then press Enter or Return. You can control whether Enter or Return inserts a new line instead of sending a message in the General Preferences. Option+Enter always inserts a new line. If the contact is online, the message will be sent immediately.</p>
- <p>If the contact is offline, the behavior depends on the instant messaging service you are using. In Yahoo, AIM/ICQ, and Jabber, the message is sent to the server and will be immediately received by the contact when next she signs online. On other services, Adium will give you the option to "Send Later". This will send the message the next time you are online with Adium and the contact is also online.</p>+ <p>If the contact is offline, the behavior depends on the instant messaging service you are using. In Yahoo, AIM/ICQ, and XMPP ("Jabber"), the message is sent to the server and will be immediately received by the contact when next she signs online. On other services, Adium will give you the option to "Send Later". This will send the message the next time you are online with Adium and the contact is also online.</p> <p>You can specify your <a href="Messaging-FontsAndColors.html">font or color</a> if you like.</p>
--- a/AdiumHelp/pgs/Messaging-TabbedMessaging.html Sat Apr 05 12:41:19 2014 -0400
+++ b/AdiumHelp/pgs/Messaging-TabbedMessaging.html Wed Apr 23 20:48:33 2014 +0200
@@ -24,7 +24,7 @@
<h3>Switching tabs with the keyboard</h3>
<div class="taskboxtext">
- <p>Switch tabs with <b>⌘-Left Arrow Key</b> and <b>⌘-Right Arrow Key</b>. This keyboard shortcut is customizable in <b>Preferences → General</b></p>+ <p>Switch tabs with <b>^⇥</b> (next tab) and <b>^⇧⇥</b> (previous tab). This keyboard shortcut is customizable in <b>Preferences → General</b>.</p> <div class="taskboxline">
--- a/AdiumHelp/pgs/Miscellaneous-AVSkypeSupport.html Sat Apr 05 12:41:19 2014 -0400
+++ b/AdiumHelp/pgs/Miscellaneous-AVSkypeSupport.html Wed Apr 23 20:48:33 2014 +0200
@@ -32,7 +32,7 @@
<div class="taskboxtext">
<p>Adium does not natively (i.e., without a plugin) support Skype.</p>
- <p>However, there is an unofficial third-party <a href="http://xtras.adium.im/index.php?a=xtras&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>+ <p>However, there is an unofficial third-party <a href="http://xtras.adium.im/index.php?a=xtras&xtra_id=5011">Skype Plugin</a> which allows Adium to use the <a class="ext_link" href="https://support.skype.com/en/faq/FA214/what-is-the-desktop-api">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> <p><strong>Why does Adium not officially support Skype?</strong></p>
<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>
<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>
--- a/AdiumHelp/pgs/Miscellaneous-LocationsAdiumFiles.html Sat Apr 05 12:41:19 2014 -0400
+++ b/AdiumHelp/pgs/Miscellaneous-LocationsAdiumFiles.html Wed Apr 23 20:48:33 2014 +0200
@@ -58,6 +58,17 @@
<div class="taskboxline">
<div class="taskboxheader">
+ <h3>Location of user icons</h3> + <div class="taskboxtext"> + <p><strong>Your own icons</strong></p> + <p>Recent icons set via the icon picker (both for contacts and for yourself) are cached at ~/Library/Images/iChat Recent Pictures, and such recent icons are shared with iChat.</p> + <p><strong>Icons of your contacts</strong></p> + <p>Icons, once retrieved, are cached at ~/Library/Caches/Adium/Default. (The "Library" folder is hidden in OS X versions 10.7 and newer. See this article for details.)</p> + <div class="taskboxline"> + <div class="taskboxheader"> <h3>Location of non-standard, installed Xtras</h3>
<div class="taskboxtext">
--- a/AdiumHelp/pgs/Miscellaneous-SupportWindowsLinuxMacOS9.html Sat Apr 05 12:41:19 2014 -0400
+++ b/AdiumHelp/pgs/Miscellaneous-SupportWindowsLinuxMacOS9.html Wed Apr 23 20:48:33 2014 +0200
@@ -30,7 +30,7 @@
<li><a class="ext_link" href="http://www.trillian.im/">Trillian</a> (commercial; free 'lite' version available)</li>
<li><a class="ext_link" href="http://www.miranda-im.org/">Miranda</a> (open source; free).</li>
- <p>There are some skins available for Trillian and Miranda which modify them to look like Adium in some ways, such as <a class="ext_link" href="http://isynack.com/index.php?2007/10/02/33-miranda-im-to-adiumx">this skin for Miranda</a>.</p>+ <p>There are some skins available for Trillian and Miranda which modify them to look like Adium in some ways.</p> <div class="taskboxline">
--- a/AdiumHelp/pgs/ServiceInformation-XMPPSupport.html Sat Apr 05 12:41:19 2014 -0400
+++ b/AdiumHelp/pgs/ServiceInformation-XMPPSupport.html Wed Apr 23 20:48:33 2014 +0200
@@ -4,9 +4,9 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link media="all" rel="stylesheet" href="../css/topicpage.css" type="text/css" />
-<title>XMPP (Jabber) in Adium</title>+<title>XMPP ("Jabber") in Adium</title> <meta name="keywords" content="xmpp, jabber" />
-<meta name="description" content="XMPP (Jabber) in Adium" />+<meta name="description" content="XMPP ("Jabber") in Adium" /> <div id="banner"> <a name="tabs" id="tabs"></a>
@@ -15,9 +15,9 @@
<div id="caticon"> <img src="../gfx/AdiumIcon.png" alt="Adium Icon" height="32" width="32" border="0" /> </div>
- <h1>XMPP (Jabber) in Adium</h1>+ <h1>XMPP ("Jabber") in Adium</h1> - <p>This page deals with XMPP (historically known as "Jabber") specialities.</p>+ <p>This page deals with <a href="Accounts-XMPP.html">XMPP</a> features.</p> <div class="taskboxline">
<div class="taskboxheader">
<h3>Commands in multi-user chats (MUCs)</h3>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/AdiumHelp/pgs/Troubleshooting-CommonProblems.html Wed Apr 23 20:48:33 2014 +0200
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<meta http-equiv="content-type" content="text/html; charset=utf-8" /> +<meta name="keywords" content="troubleshooting, problem, issue" /> +<meta name="description" content="Troubleshooting" /> +<title>Troubleshooting: common problems and solutions - Adium Documentation</title> +<link href="../css/topicpage.css" type="text/css" rel="stylesheet" media="all" /> + <div id="navleft"><a class="navleftsty" href="../AdiumHelp.html">Adium Help</a> <a class="navleftsty" href="AdiumDocumentation.html">Adium Documentation</a></div> + <div id="caticon"> <img src="../gfx/AdiumIcon.png" alt="Adium Icon" height="32" width="32" border="0" /> </div> + <h1>Troubleshooting: common problems and solutions</h1> + <div class="taskboxline"> + <div class="taskboxtext"> + <li><a href="Troubleshooting-ConnectionProblems.html">Connection problems</a></li> + <li><a href="Troubleshooting-ConnectionProblemsMSN.html">MSN-specific</a></li> + <li><a href="Troubleshooting-SleepMode.html">Adium and Mac OS X sleep mode</a></li> + <li><a href="Troubleshooting-RecoveringLostPasswords.html">Recovering lost passwords</a></li> + <li><a href="Troubleshooting-PersistentPromptsForPasswords.html">Persistent prompts for passwords</a></li> + <li><a href="Troubleshooting-RecoveringDeletedTranscripts.html">Recovering deleted transcripts</a></li> + <li><a href="Troubleshooting-BrokenTranscriptSearch.html">Transcript search working unreliably</a></li> + <li><a href="Troubleshooting-ProblemsWithParticularContact.html">Problems with a particular contact</a></li> + <li><a href="Troubleshooting-ICQTextEncoding.html">ICQ text encoding</a></li> + <div class="taskboxline"> + <div class="taskboxheader"> + <h3>If it still doesn't work</h3> + <div class="taskboxtext"> + <p>Still have your problem?</p> + <li>get support on the <a class="ext_link" href="http://forum.adium.im">Adium forums</a> or in the <a href="irc://irc.freenode.net/#adium">Adium IRC channel</a></li> + <li><a href="https://trac.adium.im/wiki/ReportingBugs">report a bug</a>.</li> +<script type="text/javascript" src="../js/help.js"></script> + <div id="footer"> <div class="donate"> + <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick</body>amp;submit.x=57</body>amp;submit.y=8</body>amp;encrypted=-----BEGIN+PKCS7-----%0D%0AMIIHFgYJKoZIhvcNAQcEoIIHBzCCBwMCAQExggEwMIIBLAIBADCBlDCBjjELMAkG%0D%0AA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQw%0D%0AEgYDVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9jZXJ0czERMA8GA1UE%0D%0AAxQIbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBhbC5jb20CAQAwDQYJ%0D%0AKoZIhvcNAQEBBQAEgYAFR5tF%2BRKUV3BS49vJraDG%2BIoWDoZMieUT%2FJJ1Fzjsr511%0D%0Au7hS1F2piJuHuqmm%2F0r8Kf8oaycOo74K3zLmUQ6T6hUS6%2Bh6lZAoIlhI3A1YmqIP%0D%0AdrdY%2FtfKRbWfolDumJ9Mdv%2FzJxPnpdQiTN5K1PMrPYE6GgPWE9WC4V9lqstSmTEL%0D%0AMAkGBSsOAwIaBQAwgZMGCSqGSIb3DQEHATAUBggqhkiG9w0DBwQIjtd%2BN9o4ZB6A%0D%0AcIbH8ZjOLmE35xBQ%2F93chtzIcRXHhIQJVpBRCkyJkdTD3libP3F7TgkrLij1DBxg%0D%0AfFlE0V%2FGTk29Ys%2FwsPO7hNs3YSNuSz0HT5F6sa8aXwFtMCE%2FgB1Ha4qdtYY%2BNETJ%0D%0AEETwNMLefjhaBfI%2BnRxl2K2gggOHMIIDgzCCAuygAwIBAgIBADANBgkqhkiG9w0B%0D%0AAQUFADCBjjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1Nb3Vu%0D%0AdGFpbiBWaWV3MRQwEgYDVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9j%0D%0AZXJ0czERMA8GA1UEAxQIbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBh%0D%0AbC5jb20wHhcNMDQwMjEzMTAxMzE1WhcNMzUwMjEzMTAxMzE1WjCBjjELMAkGA1UE%0D%0ABhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYD%0D%0AVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9jZXJ0czERMA8GA1UEAxQI%0D%0AbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBhbC5jb20wgZ8wDQYJKoZI%0D%0AhvcNAQEBBQADgY0AMIGJAoGBAMFHTt38RMxLXJyO2SmS%2BNdl72T7oKJ4u4uw%2B6aw%0D%0AntALWh03PewmIJuzbALScsTS4sZoS1fKciBGoh11gIfHzylvkdNe%2FhJl66%2FRGqrj%0D%0A5rFb08sAABNTzDTiqqNpJeBsYs%2Fc2aiGozptX2RlnBktH%2BSUNpAajW724Nv2Wvhi%0D%0Af6sFAgMBAAGjge4wgeswHQYDVR0OBBYEFJaffLvGbxe9WT9S1wob7BDWZJRrMIG7%0D%0ABgNVHSMEgbMwgbCAFJaffLvGbxe9WT9S1wob7BDWZJRroYGUpIGRMIGOMQswCQYD%0D%0AVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxFDAS%0D%0ABgNVBAoTC1BheVBhbCBJbmMuMRMwEQYDVQQLFApsaXZlX2NlcnRzMREwDwYDVQQD%0D%0AFAhsaXZlX2FwaTEcMBoGCSqGSIb3DQEJARYNcmVAcGF5cGFsLmNvbYIBADAMBgNV%0D%0AHRMEBTADAQH%2FMA0GCSqGSIb3DQEBBQUAA4GBAIFfOlaagFrl71%2Bjq6OKidbWFSE%2B%0D%0AQ4FqROvdgIONth%2B8kSK%2F%2FY%2F4ihuE4Ymvzn5ceE3S%2FiBSQQMjyvb%2Bs2TWbQYDwcp1%0D%0A29OPIbD9epdr4tJOUNiSojw7BHwYRiPh58S1xGlFgHFXwrEBb3dgNbMUa%2Bu4qect%0D%0AsMAXpVHnD9wIyfmHMYIBmjCCAZYCAQEwgZQwgY4xCzAJBgNVBAYTAlVTMQswCQYD%0D%0AVQQIEwJDQTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEUMBIGA1UEChMLUGF5UGFs%0D%0AIEluYy4xEzARBgNVBAsUCmxpdmVfY2VydHMxETAPBgNVBAMUCGxpdmVfYXBpMRww%0D%0AGgYJKoZIhvcNAQkBFg1yZUBwYXlwYWwuY29tAgEAMAkGBSsOAwIaBQCgXTAYBgkq%0D%0AhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3DQEJBTEPFw0wNDAzMjUwNDQ0%0D%0AMzRaMCMGCSqGSIb3DQEJBDEWBBRzTAS6zk5cmMeC49IorY8CM%2BkX0TANBgkqhkiG%0D%0A9w0BAQEFAASBgBsyRfMv9mSyoYq00wIB7BmUHFGq5x%2Ffnr8M24XbKjhkyeULk2NC%0D%0As4jbCgaWNg6grvccJtjbvmDskMKt%2BdS%2BEAkeWwm1Zf%2F%2B5u1fMyb5vo1NNcRIs5oq%0D%0A7SvXiLTPRzVqzQdhVs7PoZG0i0RRIb0tMeo1IssZeB2GE5Nsg0D8PwpB%0D%0A-----END+PKCS7-----"> + <div id="powered" style="opacity: 100%"> + <a href="https://developer.apple.com/wwdc/events/awards/"><img class="libgaim" src="../../images/ada.png" alt="Apple design awards 05 special mention"></a> + <a href="https://www.pidgin.im"><img class="libgaim" src="../../images/powered_by_libpurple.png" alt="Adium is powered by libpurple"></a> + <a class="cachefly" href="https://www.cachefly.com"><img src="../../images/cachefly.png" alt="CacheFly Logo"></a> + <a class="networkredux" href="http://www.networkredux.com"><img src="../../images/network_redux.png" alt="Network Redux Logo"></a> --- a/AdiumHelp/pgs/Troubleshooting-ConnectionProblems.html Sat Apr 05 12:41:19 2014 -0400
+++ b/AdiumHelp/pgs/Troubleshooting-ConnectionProblems.html Wed Apr 23 20:48:33 2014 +0200
@@ -33,7 +33,7 @@
<li>Double-click on the account which is having problems and go to the "Options" tab.</li>
<li>Delete the "login server" and "port" information, and hit OK.</li>
- <p>This will restore the server and port to the default setting. If you are still unable to connect, you can try the TroubleshootingTips or see the below explanation for a particular error.</p>+ <p>This will restore the server and port to the default setting. If you are still unable to connect, you can try the <a href="TroubleshootingTips.html">Troubleshooting tips</a> or see the below explanation for a particular error.</p> <div class="taskboxline">
--- a/AdiumHelp/pgs/Troubleshooting-ICQTextEncoding.html Sat Apr 05 12:41:19 2014 -0400
+++ b/AdiumHelp/pgs/Troubleshooting-ICQTextEncoding.html Wed Apr 23 20:48:33 2014 +0200
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<meta name="keywords" content="icq, text, encoding, utf8, iso, character, Cyrillic, gibberish" />+<meta name="keywords" content="icq, text, encoding, utf-8, iso, character, Cyrillic, gibberish" /> <meta name="description" content="ICQ Text Encoding" />
<title>ICQ Text Encoding</title>
<link href="../css/topicpage.css" type="text/css" rel="stylesheet" media="all" />
@@ -18,7 +18,7 @@
<h1>ICQ text encoding</h1>
<p>Computer programs use something called an encoding to turn human-language characters into bytes that the computers can swap back and forth, and to turn those bytes back into characters. If one program (your contact's client) sends text in one encoding, but the other program (your client—that is, Adium) is expecting a different encoding, then the receiving program may show the wrong characters.</p>
- <p>By default, Adium always uses UTF8 encoding given that both sides support it. You can tell Adium which encoding to expect if your contact a) doesn't support UTF8 and b) doesn't specify its encoding to Adium. The setting for this is to be found in the Options tab of your ICQ account in Adium.</p>+ <p>By default, Adium always uses UTF-8 encoding given that both sides support it. You can tell Adium which encoding to expect if your contact a) doesn't support UTF-8 and b) doesn't specify its encoding to Adium. The setting for this is to be found in the Options tab of your ICQ account in Adium.</p> <img src="../gfx/ICQEncoding-ICQAccount.png" width="400" alt="Screenshot of the Accounts pane of Adium's Preferences, showing to double-click on the ICQ account." />
--- a/AdiumHelp/pgs/Troubleshooting.html Sat Apr 05 12:41:19 2014 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">-<html xmlns="http://www.w3.org/1999/xhtml">-<meta http-equiv="content-type" content="text/html; charset=utf-8" />-<meta name="keywords" content="troubleshooting, problems, common, errors, disconnect, connection, support" />-<meta name="description" content="Troubleshooting" />-<title>Troubleshooting</title>-<link href="../css/topicpage.css" type="text/css" rel="stylesheet" media="all" />-<div id="banner"> <a name="troubleshooting.html" id="troubleshooting.html"></a>- <div id="navleft"><a class="navleftsty" href="../AdiumHelp.html">Adium Help</a> <a class="navleftsty" href="AdiumDocumentation.html">Adium Documentation</a></div>- <div id="caticon"> <img src="../gfx/AdiumIcon.png" alt="Adium Icon" height="32" width="32" border="0" /> </div>- <h1>Troubleshooting</h1>- <p>Having trouble with Adium?</p>- <div class="taskboxline">- <div class="taskboxheader">- <h3>Common problems and solutions</h3>- <div class="taskboxtext">- <li><a href="Troubleshooting-ConnectionProblems.html">Connection problems</a></li>- <li><a href="Troubleshooting-ConnectionProblemsMSN.html">MSN-specific</a></li>- <li><a href="Troubleshooting-SleepMode.html">Adium and Mac OS X sleep mode</a></li>- <li><a href="Troubleshooting-RecoveringLostPasswords.html">Recovering lost passwords</a></li>- <li><a href="Troubleshooting-PersistentPromptsForPasswords.html">Persistent prompts for passwords</a></li>- <li><a href="Troubleshooting-RecoveringDeletedTranscripts.html">Recovering deleted transcripts</a></li>- <li><a href="Troubleshooting-BrokenTranscriptSearch.html">Transcript search working unreliably</a></li>- <li><a href="Troubleshooting-ProblemsWithParticularContact.html">Problems with a particular contact</a></li>- <li><a href="Troubleshooting-ICQTextEncoding.html">ICQ text encoding</a></li>- <div class="taskboxline">- <div class="taskboxheader">- <h3>Troubleshooting Tips</h3>- <div class="taskboxtext">- <p>Here are some general tips for troubleshooting.</p>- <li><a href="TroubleshootingTips.html">Troubleshooting Tips</a></li>- <div class="taskboxline">- <div class="taskboxheader">- <div class="taskboxtext">- <p>Should questions remain, you can seek help at the following venues:</p>- <li>Visit our <a href="http://forums.cocoaforge.com/viewforum.php?f=13">forums at Cocoaforge</a>.</li>- <li>Visit our IRC support channel for users: <a href="irc://irc.freenode.net/adium">#adium on Freenode</a>.</li>-<script type="text/javascript" src="../js/help.js"></script>--- a/AdiumHelp/pgs/TroubleshootingTips.html Sat Apr 05 12:41:19 2014 -0400
+++ b/AdiumHelp/pgs/TroubleshootingTips.html Wed Apr 23 20:48:33 2014 +0200
@@ -109,8 +109,11 @@
<h3>If it still doesn't work</h3>
<div class="taskboxtext">
- <p>Still have your problem? Please see <a href="https://trac.adium.im/wiki/ReportingBugs">Reporting Bugs</a>, which tells you how to search for existing tickets (in case there already is one) and how to file a new one if one doesn't already exist.</p>- <p>Not sure whether the problem lies with Adium? Ask on the <a class="ext_link" href="http://forum.adium.im">Adium forums</a>, in the <a href="irc://irc.freenode.net/#adium">Adium IRC channel</a>, or on <a href="http://getsatisfaction.com/adium">getsatisfaction.com</a>.</p>+ <p>Still have your problem?</p> + <li>Get support on the <a class="ext_link" href="http://forum.adium.im">Adium forums</a> or in the <a href="irc://irc.freenode.net/#adium">Adium IRC channel</a></li> + <li><a href="https://trac.adium.im/wiki/ReportingBugs">Report a bug</a>.</li> --- a/ChangeLogs/Changes.txt Sat Apr 05 12:41:19 2014 -0400
+++ b/ChangeLogs/Changes.txt Wed Apr 23 20:48:33 2014 +0200
@@ -1,3 +1,4 @@
@@ -80,13 +81,33 @@
* Fixed ampersands being encoded mistakenly when adding a link. (#13429)
+Version 1.5.10 (04/XX/2014) + * Updated libpurple to 2.10.9, fixing many security issues. + * Updated the PSMTabBarControl framework, used in Adium for tabs: + * Fixed an issue which occurred when dragging a conversation window into an existing tabbed conversation window and which caused Adium to become unresponsive. (#16281) + * Fixed an issue causing tabs/windows to disappear when being dragged. (#15414, #15518, #15822, #16305) + * Fixed an issue where tabs would disappear after several hours. (#16262) + * Fixed visual glitches on bottom tabs seen on Retina Displays. (#16074) + * Tabs now use all the space in the tab bar. (#7690) + * Fixed tabs not being spoken by VoiceOver. (#16088) + * Fixed a problem that could cause high CPU load when a connection is lost. (#16431) + * Fixed a bug that can cause disconnects when using a Retina Mac with an external screen. (Johannes Loepelmann) (#16552) + * Fixed an issue causing to Adium to connect accounts during PowerNap. (Mayur Pawashe) (#16249) + * Fixed idle checks to no longer use the proximity sensor of modern Macs. (Christopher Loessl) + * Fixed dates in the chat log viewer not showing up for very old logs (2006 and earlier). (#16554) + * Security: Enabled a number of TLS ciphers using SHA256. + * Fixed connecting to servers with outdated TLS support using the unofficial SIPE plugin. (Michael Lamb) (#16550) + * Fixed vertical placement of the unread count in tabs. (#16318) + * Fixed a misbehaving link in the Setup Wizard. (#16587)
+Version 1.5.9 (12/03/2013) * Fixed a crash which could occur when attempting to send files, especially on OS X 10.9. ("fain") (#16352, #16430)
* Fixed a crash which could occur on OS X 10.9.
+ * Fixed an issue causing Adium to hang when encoding a message. * Fixed greyed-out user icons in the message view when using the "Stockholm" message style. (#16502)
* Fixed borderless contact lists not taking multi-screen menu bars into account. (#16514)
* Fixed building Adium on OS X 10.9. (#16408)
+ * Fixed some deprecated functions which were being logged to Console.app. (#16362) Version 1.5.8 (10/13/2013)
--- a/Copyright.txt Sat Apr 05 12:41:19 2014 -0400
+++ b/Copyright.txt Wed Apr 23 20:48:33 2014 +0200
@@ -67,6 +67,7 @@
@@ -74,6 +75,8 @@
@@ -90,6 +93,7 @@
--- a/Frameworks/AIUtilities Framework/Source/AIHostReachabilityMonitor.h Sat Apr 05 12:41:19 2014 -0400
+++ b/Frameworks/AIUtilities Framework/Source/AIHostReachabilityMonitor.h Wed Apr 23 20:48:33 2014 +0200
@@ -28,6 +28,8 @@
NSMutableArray *observers;
NSMutableArray *reachabilities;
+ NSMutableArray *AI_hostsBeforeSleep; + NSMutableArray *AI_observersBeforeSleep; NSMutableSet *unconfiguredHostsAndObservers;
--- a/Frameworks/AIUtilities Framework/Source/AIHostReachabilityMonitor.m Sat Apr 05 12:41:19 2014 -0400
+++ b/Frameworks/AIUtilities Framework/Source/AIHostReachabilityMonitor.m Wed Apr 23 20:48:33 2014 +0200
@@ -34,10 +34,16 @@
- (void)beginMonitorngIPChanges;
- (void)stopMonitoringIPChanges;
+@property (nonatomic, copy) NSArray *AI_hostsBeforeSleep; +@property (nonatomic, copy) NSArray *AI_observersBeforeSleep; +- (void)systemWillSleep:(NSNotification *)notification; - (void)systemDidWake:(NSNotification *)notification;
@implementation AIHostReachabilityMonitor
+@synthesize AI_hostsBeforeSleep, AI_observersBeforeSleep; #pragma mark Shared instance management
@@ -80,6 +86,11 @@
selector:@selector(systemDidWake:)
name:AISystemDidWake_Notification
+ [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(systemWillSleep:) + name:AISystemWillSleep_Notification @@ -93,6 +104,8 @@
[hosts release]; hosts = nil;
[observers release]; observers = nil;
[reachabilities release]; reachabilities = nil;
+ [AI_hostsBeforeSleep release]; AI_hostsBeforeSleep = nil; + [AI_observersBeforeSleep release]; AI_observersBeforeSleep = nil; [unconfiguredHostsAndObservers release]; unconfiguredHostsAndObservers = nil;
[hostAndObserverListLock unlock];
@@ -621,22 +634,26 @@
CFRelease(ipChangesRunLoopSourceRef);
ipChangesRunLoopSourceRef = nil;
+ self.AI_hostsBeforeSleep = nil; + self.AI_observersBeforeSleep = nil; #pragma mark Sleep and Wake
- * @brief System is waking from sleep+ * @brief System will go into sleep - * When the system wakes, manually reconfigure reachability checking as not all network configurations will report a change.+ * Before the system sleeps, unschedule reachability checking, and back up a copy of the hosts and observers to + * re-configure reachability for when the system wakes up -- (void)systemDidWake:(NSNotification *)notification+- (void)systemWillSleep:(NSNotification *)notification [hostAndObserverListLock lock];
- NSArray *oldHosts = [hosts copy];- NSArray *oldObservers = [observers copy];+ self.AI_hostsBeforeSleep = hosts; + self.AI_observersBeforeSleep = observers; [reachabilities enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
SCNetworkReachabilityUnscheduleFromRunLoop((SCNetworkReachabilityRef)obj,
@@ -649,7 +666,17 @@
[reachabilities removeAllObjects];
[hostAndObserverListLock unlock];
+ * @brief System is waking from sleep + * When the system wakes, manually reconfigure reachability checking as not all network configurations will report a change. +- (void)systemDidWake:(NSNotification *)notification + NSArray *oldHosts = self.AI_hostsBeforeSleep; + NSArray *oldObservers = self.AI_observersBeforeSleep; NSUInteger numObservers = [oldObservers count];
for (unsigned i = 0; i < numObservers; i++) {
NSString *host = [oldHosts objectAtIndex:i];
@@ -659,8 +686,8 @@
- [oldObservers release];+ self.AI_hostsBeforeSleep = nil; + self.AI_observersBeforeSleep = nil; --- a/Frameworks/AIUtilities Framework/Source/AIImageDrawingAdditions.m Sat Apr 05 12:41:19 2014 -0400
+++ b/Frameworks/AIUtilities Framework/Source/AIImageDrawingAdditions.m Wed Apr 23 20:48:33 2014 +0200
@@ -67,10 +67,18 @@
- (NSImage *)imageByScalingToSize:(NSSize)size DPI:(CGFloat)dpi
CGFloat backingScaleFactor = dpi / 72.0;
- if ([[NSScreen mainScreen] respondsToSelector:@selector(backingScaleFactor)]) {- backingScaleFactor /= [[NSScreen mainScreen] backingScaleFactor];+ CGFloat screenScalingFactor = 1.0; + for(NSScreen* screen in [NSScreen screens]) { + if ([screen respondsToSelector:@selector(backingScaleFactor)]) { + if([screen backingScaleFactor] > screenScalingFactor) { + screenScalingFactor = [screen backingScaleFactor]; + backingScaleFactor /= screenScalingFactor; return ([self imageByScalingToSize:NSMakeSize(size.width * backingScaleFactor, size.height * backingScaleFactor) fraction:1.0f flipImage:NO proportionally:YES allowAnimation:YES]);
--- a/Frameworks/AIUtilities Framework/Source/AILinkTrackingController.m Sat Apr 05 12:41:19 2014 -0400
+++ b/Frameworks/AIUtilities Framework/Source/AILinkTrackingController.m Wed Apr 23 20:48:33 2014 +0200
@@ -350,7 +350,7 @@
[[NSCursor arrowCursor] set]; //Restore the regular cursor
- [AITooltipUtilities showTooltipWithString:nil onWindow:nil atPoint:NSMakePoint(0,0) orientation:TooltipAbove]; //Hide the tooltip+ [AITooltipUtilities showTooltipWithString:@"" onWindow:nil atPoint:NSMakePoint(0,0) orientation:TooltipAbove]; //Hide the tooltip [hoveredLink release]; hoveredLink = nil;
[hoveredString release]; hoveredString = nil;
--- a/Frameworks/AIUtilities Framework/Source/ISO8601DateFormatter.h Sat Apr 05 12:41:19 2014 -0400
+++ b/Frameworks/AIUtilities Framework/Source/ISO8601DateFormatter.h Wed Apr 23 20:48:33 2014 +0200
@@ -46,6 +46,7 @@
NSTimeZone *defaultTimeZone;
ISO8601DateFormat format;
+ unichar timeZoneSeparator; --- a/Frameworks/AIUtilities Framework/Source/ISO8601DateFormatter.m Sat Apr 05 12:41:19 2014 -0400
+++ b/Frameworks/AIUtilities Framework/Source/ISO8601DateFormatter.m Wed Apr 23 20:48:33 2014 +0200
@@ -707,6 +707,7 @@
@synthesize timeSeparator;
+@synthesize timeZoneSeparator; - (NSString *) replaceColonsInString:(NSString *)timeFormat withTimeSeparator:(unichar)timeSep {
--- a/Frameworks/Adium Framework/Source/AIHTMLDecoder.m Sat Apr 05 12:41:19 2014 -0400
+++ b/Frameworks/Adium Framework/Source/AIHTMLDecoder.m Wed Apr 23 20:48:33 2014 +0200
@@ -210,7 +210,7 @@
NSFontManager *fontManager = [NSFontManager sharedFontManager];
NSColor *pageColor = nil;
- NSInteger *openFontTags = 0;+ NSInteger openFontTags = 0; //Setup the incoming message as a regular string, and get its length
NSString *inMessageString = [inMessage string];
--- a/Other/Adium Spotlight Importer/GetMetadataForHTMLLog.m Sat Apr 05 12:41:19 2014 -0400
+++ b/Other/Adium Spotlight Importer/GetMetadataForHTMLLog.m Wed Apr 23 20:48:33 2014 +0200
@@ -30,12 +30,12 @@
formatter.timeSeparator = '.';
NSRange openParenRange, closeParenRange;
- if ([pathToFile hasSuffix:@".chatlog"] && (openParenRange = [pathToFile rangeOfString:@"(" options:NSBackwardsSearch]).location != NSNotFound) {+ if ((openParenRange = [pathToFile rangeOfString:@"(" options:NSBackwardsSearch]).location != NSNotFound) { openParenRange = NSMakeRange(openParenRange.location, [pathToFile length] - openParenRange.location);
if ((closeParenRange = [pathToFile rangeOfString:@")" options:0 range:openParenRange]).location != NSNotFound) {
//Add and subtract one to remove the parenthesis
NSString *dateString = [pathToFile substringWithRange:NSMakeRange(openParenRange.location + 1, (closeParenRange.location - openParenRange.location))];
- return [formatter dateFromString:dateString];+ return [formatter dateFromString:[dateString stringByReplacingOccurrencesOfString:@"|" withString:@"-"]]; --- a/Plugins/Purple Service/libpurple_extensions/ssl-cdsa.c Sat Apr 05 12:41:19 2014 -0400
+++ b/Plugins/Purple Service/libpurple_extensions/ssl-cdsa.c Wed Apr 23 20:48:33 2014 +0200
@@ -57,6 +57,7 @@
#define PURPLE_SSL_CONNECTION_IS_VALID(gsc) (g_list_find(connections, (gsc)) != NULL)
#define PURPLE_SSL_CDSA_BUGGY_TLS_WORKAROUND "ssl_cdsa_buggy_tls_workaround"
+#define PURPLE_SSL_CDSA_BEAST_TLS_WORKAROUND "ssl_cdsa_beast_tls_workaround" * query_cert_chain - callback for letting the user review the certificate before accepting it
@@ -250,24 +251,26 @@
rrtn = read(sock, currData, bytesToGo);
+ rtn = errSSLClosedGraceful; /* this is guesswork... */
- rtn = errSSLClosedGraceful;+ rtn = errSSLClosedGraceful;
- fprintf(stderr,"SocketRead: read(%lu) error %d\n",- (unsigned long)bytesToGo, theErr);+ fprintf(stderr,"SocketRead: read(%lu) error %d\n", + (unsigned long)bytesToGo, theErr); @@ -333,69 +336,74 @@
ssl_cdsa_use_cipher(SSLCipherSuite suite, bool requireFS) {
- case SSL_RSA_WITH_3DES_EDE_CBC_MD5:- case SSL_RSA_WITH_RC2_CBC_MD5:- case SSL_RSA_WITH_3DES_EDE_CBC_SHA: case SSL_DH_DSS_WITH_3DES_EDE_CBC_SHA:
case SSL_DH_RSA_WITH_3DES_EDE_CBC_SHA:
- case TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA:- case TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA:- case SSL_RSA_WITH_RC4_128_MD5:- case SSL_RSA_WITH_RC4_128_SHA:- case TLS_ECDH_ECDSA_WITH_RC4_128_SHA:- case TLS_ECDH_RSA_WITH_RC4_128_SHA:- case TLS_RSA_WITH_AES_128_CBC_SHA:- case TLS_DH_DSS_WITH_AES_128_CBC_SHA:- case TLS_DH_RSA_WITH_AES_128_CBC_SHA:- case TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA:- case TLS_ECDH_RSA_WITH_AES_128_CBC_SHA:- case TLS_RSA_WITH_AES_256_CBC_SHA:- case TLS_DH_DSS_WITH_AES_256_CBC_SHA:- case TLS_DH_RSA_WITH_AES_256_CBC_SHA:- case TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA:- case TLS_ECDH_RSA_WITH_AES_256_CBC_SHA:- case TLS_RSA_WITH_AES_128_GCM_SHA256:- case TLS_RSA_WITH_AES_256_GCM_SHA384:- case TLS_DH_RSA_WITH_AES_128_GCM_SHA256:- case TLS_DH_RSA_WITH_AES_256_GCM_SHA384:- case TLS_DH_DSS_WITH_AES_128_GCM_SHA256:- case TLS_DH_DSS_WITH_AES_256_GCM_SHA384:- case TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256:- case TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384:- case TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256:- case TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384:- case TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256:- case TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384:- case TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256:- case TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384: case SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA:
case SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA:
- case TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA:- case TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA:- case TLS_ECDHE_ECDSA_WITH_RC4_128_SHA:- case TLS_ECDHE_RSA_WITH_RC4_128_SHA:+ case SSL_RSA_WITH_3DES_EDE_CBC_SHA: + case SSL_RSA_WITH_RC4_128_SHA: + case TLS_DH_DSS_WITH_AES_128_CBC_SHA: + case TLS_DH_DSS_WITH_AES_128_CBC_SHA256: + case TLS_DH_DSS_WITH_AES_128_GCM_SHA256: + case TLS_DH_DSS_WITH_AES_256_CBC_SHA: + case TLS_DH_DSS_WITH_AES_256_CBC_SHA256: + case TLS_DH_DSS_WITH_AES_256_GCM_SHA384: + case TLS_DH_RSA_WITH_AES_128_CBC_SHA: + case TLS_DH_RSA_WITH_AES_128_CBC_SHA256: + case TLS_DH_RSA_WITH_AES_128_GCM_SHA256: + case TLS_DH_RSA_WITH_AES_256_CBC_SHA: + case TLS_DH_RSA_WITH_AES_256_CBC_SHA256: + case TLS_DH_RSA_WITH_AES_256_GCM_SHA384: case TLS_DHE_DSS_WITH_AES_128_CBC_SHA:
+ case TLS_DHE_DSS_WITH_AES_128_CBC_SHA256: + case TLS_DHE_DSS_WITH_AES_128_GCM_SHA256: + case TLS_DHE_DSS_WITH_AES_256_CBC_SHA: + case TLS_DHE_DSS_WITH_AES_256_CBC_SHA256: + case TLS_DHE_DSS_WITH_AES_256_GCM_SHA384: case TLS_DHE_RSA_WITH_AES_128_CBC_SHA:
+ case TLS_DHE_RSA_WITH_AES_128_CBC_SHA256: + case TLS_DHE_RSA_WITH_AES_128_GCM_SHA256: + case TLS_DHE_RSA_WITH_AES_256_CBC_SHA: + case TLS_DHE_RSA_WITH_AES_256_CBC_SHA256: + case TLS_DHE_RSA_WITH_AES_256_GCM_SHA384: + case TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA: + case TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA: + case TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256: + case TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256: + case TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA: + case TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384: + case TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384: + case TLS_ECDH_ECDSA_WITH_RC4_128_SHA: + case TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA: + case TLS_ECDH_RSA_WITH_AES_128_CBC_SHA: + case TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256: + case TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256: + case TLS_ECDH_RSA_WITH_AES_256_CBC_SHA: + case TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384: + case TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384: + case TLS_ECDH_RSA_WITH_RC4_128_SHA: + case TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA: case TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA:
+ case TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256: + case TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256: + case TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA: + case TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384: + case TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384: + case TLS_ECDHE_ECDSA_WITH_RC4_128_SHA: + case TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA: case TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA:
- case TLS_DHE_DSS_WITH_AES_256_CBC_SHA:- case TLS_DHE_RSA_WITH_AES_256_CBC_SHA:- case TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA:+ case TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256: + case TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256: case TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA:
- case TLS_DHE_RSA_WITH_AES_128_GCM_SHA256:- case TLS_DHE_RSA_WITH_AES_256_GCM_SHA384:- case TLS_DHE_DSS_WITH_AES_128_GCM_SHA256:- case TLS_DHE_DSS_WITH_AES_256_GCM_SHA384:- case TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256:- case TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384:- case TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256: case TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384:
- case TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256:- case TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384:- case TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256: case TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384:
+ case TLS_ECDHE_RSA_WITH_RC4_128_SHA: + case TLS_RSA_WITH_AES_128_CBC_SHA: + case TLS_RSA_WITH_AES_128_CBC_SHA256: + case TLS_RSA_WITH_AES_128_GCM_SHA256: + case TLS_RSA_WITH_AES_256_CBC_SHA: + case TLS_RSA_WITH_AES_256_CBC_SHA256: + case TLS_RSA_WITH_AES_256_GCM_SHA384: @@ -528,6 +536,21 @@
protoErr = SSLSetProtocolVersionEnabled(cdsa_data->ssl_ctx, kTLSProtocol1, true);
+#ifndef MAC_OS_X_VERSION_10_9 + #define kSSLSessionOptionSendOneByteRecord 4 /* Appears in 10.9 */ + if (purple_account_get_bool(account, PURPLE_SSL_CDSA_BEAST_TLS_WORKAROUND, false)) { + purple_debug_info("cdsa", "Explicitly disabling SSL BEAST mitigation for broken server implementations\n"); + protoErr = SSLSetSessionOption(cdsa_data->ssl_ctx, kSSLSessionOptionSendOneByteRecord, false); + if (protoErr != noErr) { + purple_debug_info("cdsa", "SSLSetSessionOption failed to disable SSL BEAST mitigation\n"); * Set the peer's domain name so CDSA can check the certificate's CN
--- a/Plugins/Twitter Plugin/AITwitterAccount.m Sat Apr 05 12:41:19 2014 -0400
+++ b/Plugins/Twitter Plugin/AITwitterAccount.m Wed Apr 23 20:48:33 2014 +0200
@@ -1608,7 +1608,7 @@
range:NSMakeRange(0, mutableMessage.length)];
- NSString *message = [mutableMessage string];+ NSString *message = [[[mutableMessage string] copy] autorelease]; BOOL replyTweet = (replyTweetID.length > 0);
BOOL tweetLink = (tweetID.length && userID.length);
--- a/README.md Sat Apr 05 12:41:19 2014 -0400
+++ b/README.md Wed Apr 23 20:48:33 2014 +0200
@@ -1,36 +1,36 @@
-[Adium](http://adium.im)+[Adium](https://adium.im) -[](https://sourceforge.net/projects/adium/files/Adium_1.5.8.dmg/download?accel_key=67%3A1382826588%3Ahttps%253A//www.adium.im/%3A4df3bdae%249307b389bd2bf68b9102c79e586756ec533fe7d2&click_id=1f3aa4e6-3e8e-11e3-a034-0200ac1d1d9b-1&source=accel)+[](https://sourceforge.net/projects/adium/files/Adium_1.5.9.dmg/download?accel_key=67%3A1386175847%3Ahttps%253A//adium.im/%3A64fc072b%242796f9fa06c20c320881147a26394ee76682951e&click_id=399ffab8-5d04-11e3-b3d1-0200ac1d1d96-1&source=accel) -[Download Adium 1.5.8](https://sourceforge.net/projects/adium/files/Adium_1.5.8.dmg/download?accel_key=67%3A1382826588%3Ahttps%253A//www.adium.im/%3A4df3bdae%249307b389bd2bf68b9102c79e586756ec533fe7d2&click_id=1f3aa4e6-3e8e-11e3-a034-0200ac1d1d9b-1&source=accel)+[Download Adium 1.5.9](https://sourceforge.net/projects/adium/files/Adium_1.5.9.dmg/download?accel_key=67%3A1386175847%3Ahttps%253A//adium.im/%3A64fc072b%242796f9fa06c20c320881147a26394ee76682951e&click_id=399ffab8-5d04-11e3-b3d1-0200ac1d1d96-1&source=accel) -Adium is a free and open source instant messaging application for [OS X](https://www.apple.com/osx/), written using OS X's Cocoa API, released under the [GNU GPL](http://www.gnu.org/licenses/licenses.html#GPL) and developed by [the Adium team](https://trac.adium.im/wiki/AdiumTeam). Based on the [libpurple](https://trac.adium.im/wiki/LibPurple) protocol library, Adium can connect you to any number of messaging accounts on any combination of supported messaging services and then chat with other people using those services.+Adium is a free and open source instant messaging application for [OS X](https://www.apple.com/osx/), written using OS X's Cocoa API, released under the [GNU GPL](https://www.gnu.org/licenses/licenses.html#GPL) and developed by [the Adium team](https://trac.adium.im/wiki/AdiumTeam). Based on the [libpurple](https://trac.adium.im/wiki/LibPurple) protocol library, Adium can connect you to any number of messaging accounts on any combination of supported messaging services and then chat with other people using those services. * Open Source, so everyone can see how Adium works and [help improve it](https://trac.adium.im/wiki/Development)
-* Support for a wide range of different Instant Messaging services (see the [full list](http://adium.im/help/pgs/Accounts-ListOfServices.html))+* Support for a wide range of different Instant Messaging services (see the [full list](https://adium.im/help/pgs/Accounts-ListOfServices.html)) - * [Tabbed chat windows](http://adium.im/help/pgs/Messaging-TabbedMessaging.html)+ * [Tabbed chat windows](https://adium.im/help/pgs/Messaging-TabbedMessaging.html) - * [Address Book integration](http://adium.im/help/pgs/AdvancedFeatures-AddressBookIntegration.html)- * [WebKit Message View](http://adium.im/help/pgs/Messaging-MessageView.html): Theme your chat windows-* [Combined Contacts](http://adium.im/help/pgs/ContactList-CombiningContacts.html): Merge your contacts so that each one represents a person, not an account-* A sophisticated events system (including [Growl notifications](http://adium.im/help/pgs/AdvancedFeatures-GrowlSupport.html))+ * [Address Book integration](https://adium.im/help/pgs/AdvancedFeatures-AddressBookIntegration.html) + * [WebKit Message View](https://adium.im/help/pgs/Messaging-MessageView.html): Theme your chat windows +* [Combined Contacts](https://adium.im/help/pgs/ContactList-CombiningContacts.html): Merge your contacts so that each one represents a person, not an account +* A sophisticated events system (including [Growl notifications](https://adium.im/help/pgs/AdvancedFeatures-GrowlSupport.html)) * [OTR Encryption](https://trac.adium.im/wiki/OTREncryption)
-* [File Transfer](http://adium.im/help/pgs/AdvancedFeatures-FileTransfer.html)-* [Xtras](http://adium.im/help/pgs/AdvancedFeatures-AdiumXtras.html) and many, many other customization options+* [File Transfer](https://adium.im/help/pgs/AdvancedFeatures-FileTransfer.html) +* [Xtras](https://adium.im/help/pgs/AdvancedFeatures-AdiumXtras.html) and many, many other customization options * A beautiful icon, the "[Adiumy](https://trac.adium.im/wiki/Adiumy)" duck
* [Translations](https://trac.adium.im/wiki/Translations): Adium speaks 27 different languages
## System requirements ##
- **Adium 1.5 or later**: Mac OS X 10.6.8 or newer, an Apple-branded Macintosh computer
-- [Adium 1.4.5](http://adiumx.cachefly.net/Adium_1.4.5.dmg): Mac OS X 10.5.8-- [Adium 1.3.10](http://adiumx.cachefly.net/Adium_1.3.10.dmg): Mac OS X 10.4-- [Adium 1.0.6](http://adiumx.cachefly.net/Adium_1.0.6.dmg): Mac OS X 10.3.9-- [Adium X 0.89.1](http://adiumx.cachefly.net/AdiumX_0.89.1.dmg): Mac OS X 10.2.x and older+- [Adium 1.4.5](https://adiumx.cachefly.net/Adium_1.4.5.dmg): Mac OS X 10.5.8 +- [Adium 1.3.10](https://adiumx.cachefly.net/Adium_1.3.10.dmg): Mac OS X 10.4 +- [Adium 1.0.6](https://adiumx.cachefly.net/Adium_1.0.6.dmg): Mac OS X 10.3.9 +- [Adium X 0.89.1](https://adiumx.cachefly.net/AdiumX_0.89.1.dmg): Mac OS X 10.2.x and older Adium X 0.88 up to Adium 1.4.5 are Universal applications which run natively on both PowerPC- and Intel-based Macintosh computers. Adium 1.5 and up require an Intel based computer.
@@ -40,5 +40,5 @@
See [our own wiki](https://trac.adium.im/wiki/Development) for ways you can contribute to Adium.
## Adium Contact information ##
Binary file Resources/ca.lproj/Localizable.strings has changed
Binary file Resources/cs.lproj/Localizable.strings has changed
Binary file Resources/da.lproj/Localizable.strings has changed
Binary file Resources/de.lproj/Localizable.strings has changed
Binary file Resources/el_GR.lproj/Localizable.strings has changed
--- a/Resources/en_AU.lproj/Localizable.strings Sat Apr 05 12:41:19 2014 -0400
+++ b/Resources/en_AU.lproj/Localizable.strings Wed Apr 23 20:48:33 2014 +0200
@@ -1855,7 +1855,7 @@
"Incoming:" = "Incoming:";
/* No comment provided by engineer. */
-"Incorrect number of command argments." = "Incorrect number of command argments.";+"Incorrect number of command arguments." = "Incorrect number of command arguments."; /* Error message displayed when the server reports username or password as being incorrect. */
"Incorrect username or password" = "Incorrect username or password";
Binary file Resources/en_GB.lproj/Localizable.strings has changed
Binary file Resources/es.lproj/Localizable.strings has changed
Binary file Resources/fi.lproj/Localizable.strings has changed
Binary file Resources/fr.lproj/Localizable.strings has changed
Binary file Resources/fr_CA.lproj/Localizable.strings has changed
Binary file Resources/hu.lproj/Localizable.strings has changed
Binary file Resources/is.lproj/Localizable.strings has changed
Binary file Resources/it.lproj/Localizable.strings has changed
Binary file Resources/ja.lproj/Localizable.strings has changed
Binary file Resources/nb.lproj/Localizable.strings has changed
Binary file Resources/nl.lproj/Localizable.strings has changed
Binary file Resources/pl.lproj/Localizable.strings has changed
Binary file Resources/pt.lproj/Localizable.strings has changed
Binary file Resources/pt_PT.lproj/Localizable.strings has changed
Binary file Resources/ru.lproj/Localizable.strings has changed
Binary file Resources/sk_SK.lproj/Localizable.strings has changed
Binary file Resources/sl.lproj/Localizable.strings has changed
Binary file Resources/sv.lproj/Localizable.strings has changed
Binary file Resources/tr.lproj/Localizable.strings has changed
Binary file Resources/uk.lproj/Localizable.strings has changed
Binary file Resources/zh_CN.lproj/Localizable.strings has changed
Binary file Resources/zh_TW.lproj/Localizable.strings has changed
--- a/Source/AIChatLog.m Sat Apr 05 12:41:19 2014 -0400
+++ b/Source/AIChatLog.m Wed Apr 23 20:48:33 2014 +0200
@@ -309,12 +309,13 @@
formatter.timeSeparator = '.';
NSRange openParenRange, closeParenRange;
- if ([fileName hasSuffix:@".chatlog"] && (openParenRange = [fileName rangeOfString:@"(" options:NSBackwardsSearch]).location != NSNotFound) {+ if ((openParenRange = [fileName rangeOfString:@"(" options:NSBackwardsSearch]).location != NSNotFound) { openParenRange = NSMakeRange(openParenRange.location, [fileName length] - openParenRange.location);
if ((closeParenRange = [fileName rangeOfString:@")" options:0 range:openParenRange]).location != NSNotFound) {
//Add and subtract one to remove the parenthesis
NSString *dateString = [fileName substringWithRange:NSMakeRange(openParenRange.location + 1, (closeParenRange.location - openParenRange.location))];
- return [formatter dateFromString:dateString];+ // Fix really old chatlogs which use "(2005|05|07)". + return [formatter dateFromString:[dateString stringByReplacingOccurrencesOfString:@"|" withString:@"-"]]; --- a/Source/AdiumIdleManager.m Sat Apr 05 12:41:19 2014 -0400
+++ b/Source/AdiumIdleManager.m Wed Apr 23 20:48:33 2014 +0200
@@ -68,13 +68,26 @@
- (CFTimeInterval)currentMachineIdle
- return CGEventSourceSecondsSinceLastEventType(kCGEventSourceStateCombinedSessionState, kCGAnyInputEventType);+ CFTimeInterval smallestIdleTime; + smallestIdleTime = CGEventSourceSecondsSinceLastEventType(kCGEventSourceStateCombinedSessionState, kCGEventKeyDown); + tmp = CGEventSourceSecondsSinceLastEventType(kCGEventSourceStateCombinedSessionState, kCGEventMouseMoved); + if (tmp < smallestIdleTime) { + smallestIdleTime = tmp; + tmp = CGEventSourceSecondsSinceLastEventType(kCGEventSourceStateCombinedSessionState, kCGEventFlagsChanged); + if (tmp < smallestIdleTime) { + smallestIdleTime = tmp; + return smallestIdleTime; - * @brief Timer that checkes for machine idle+ * @brief Timer that checks for machine idle - * This timer periodically checks the machine for inactivity. When the machine has been inactive for atleast+ * This timer periodically checks the machine for inactivity. When the machine has been inactive for at least * MACHINE_IDLE_THRESHOLD seconds, a notification is broadcast.
* When the machine is active, this timer is called infrequently. It's not important to notice that the user went
--- a/Source/AdiumMessageEvents.m Sat Apr 05 12:41:19 2014 -0400
+++ b/Source/AdiumMessageEvents.m Wed Apr 23 20:48:33 2014 +0200
@@ -132,7 +132,7 @@
case AIChatInvalidNumberOfArguments:
- message = AILocalizedString(@"Incorrect number of command argments.",nil);+ message = AILocalizedString(@"Incorrect number of command arguments.",nil); case AIChatMessageSendingConnectionError:
--- a/Utilities/tosupportpage.sh Sat Apr 05 12:41:19 2014 -0400
+++ b/Utilities/tosupportpage.sh Wed Apr 23 20:48:33 2014 +0200
@@ -31,7 +31,7 @@
<a class="navtab" href="https://adium.im/blog/">Blog</a>\
<a class="navtabcurrent" href="https://adium.im/help">Help</a>\
<a class="navtab" href="https://trac.adium.im">Development</a>\
- <a class="navtab" href="http://adium.spreadshirt.com">Merchandise</a>\+ <a class="navtab" href="https://adium.spreadshirt.com">Merchandise</a>\ <a class="navtab" href="http://www.adiumxtras.com/">Xtras</a>\
| sed 's|</body>| <div id="footer"> <div class="donate">\
@@ -48,7 +48,7 @@
| sed 's|<a class="navleftsty" href="../AdiumHelp.html">Adium Help</a> <a class="navleftsty" href="AdiumDocumentation.html">Adium Documentation</a>|<a class="navleftsty" href="../">Adium Help</a> <a class="navleftsty" href="https://adium.im/screencasts/">Adium Videos</a> <a class="navleftsty active" href="AdiumDocumentation.html">Adium Documentation</a>|g'\
| sed 's|</title>| - Adium Documentation</title>|g'\
- | sed 's|<div id="pagetitle">|<div id="pagetitle"> <h3><span itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="/help" itemprop="url"><img src="../gfx/AdiumIcon.png" alt="Adium Icon" height="32" width="32" border="0" /><span itemprop="title">Adium Help</span></a></span> \> <span itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="AdiumDocumentation.html" itemprop="url"><span itemprop="title">Adium Documentation</span></a></span> \> </h3> |g'\+ | sed 's|<div id="pagetitle">|<div id="pagetitle"> <h3><span itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="/help" itemprop="url"><img src="../gfx/AdiumIcon.png" alt="Adium Icon" height="32" width="32" border="0" /><span itemprop="title">Adium Help</span></a></span> \> <span itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="AdiumDocumentation.html" itemprop="url"><span itemprop="title">Adium Documentation</span></a></span> \> </h3>|g'\ > "$1/pgs/$(basename $file)"
