adium/adium
merge adium-1.6 into default
+3
-0
+12
-0
+2
-2
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-0
+0
-1
+30
-4
+1
-1
+1
-1
+1
-1
+2
-2
+37
-0
+101
-0
+0
-64
+60
-0
+1
-1
+1
-1
+1
-1
+2
-2
+1
-1
+125
-0
+0
-60
+60
-0
+1
-1
+1
-1
+1
-0
+2
-2
+2
-2
+0
-116
+116
-0
+100
-0
+21
-4
+19
-0
+29
-0
+0
-10
+0
-4
+3
-3
+6
-2
+6
-24
+2
-8
+25
-11
+1
-11
+1
-1
+2
-2
+1
-0
+1
-1
+3
-4
+9
-2
+1
-5
+128
-819
+8
-7
+29
-108
+1
-1
+1
-1
+2
-2
+++ b/.hgtags Sat Jul 13 13:01:04 2013 -0400
@@ -6,3 +6,6 @@
+++ b/Adium.xcodeproj/project.pbxproj Sat Jul 13 13:01:04 2013 -0400
@@ -1051,10 +1051,14 @@
5A9A9F8911F2951400328DF9 /* AIDoNothingContactAlertPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A9A9F8811F2951400328DF9 /* AIDoNothingContactAlertPlugin.m */; };
5A9A9F8B11F295EB00328DF9 /* events-do-nothing.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 5A9A9F8A11F295EB00328DF9 /* events-do-nothing.tiff */; };
5AA2A0EE14B3EFF500B4DB65 /* AIOSCompatibility.h in Headers */ = {isa = PBXBuildFile; fileRef = 5AA2A0ED14B3EFF500B4DB65 /* AIOSCompatibility.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 5ACA086A17873AEA00B15047 /* AIButtonWithCursor.h in Headers */ = {isa = PBXBuildFile; fileRef = 5ACA086817873AEA00B15047 /* AIButtonWithCursor.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 5ACA086B17873AEA00B15047 /* AIButtonWithCursor.m in Sources */ = {isa = PBXBuildFile; fileRef = 5ACA086917873AEA00B15047 /* AIButtonWithCursor.m */; };
5ACF27391392C74A004B6AEF /* AIHighlightingTextField.h in Headers */ = {isa = PBXBuildFile; fileRef = 5ACF27351392C74A004B6AEF /* AIHighlightingTextField.h */; };
5ACF273A1392C74A004B6AEF /* AIHighlightingTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 5ACF27361392C74A004B6AEF /* AIHighlightingTextField.m */; };
5ACF273B1392C74A004B6AEF /* AIPreferenceCollectionView.h in Headers */ = {isa = PBXBuildFile; fileRef = 5ACF27371392C74A004B6AEF /* AIPreferenceCollectionView.h */; };
5ACF273C1392C74A004B6AEF /* AIPreferenceCollectionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5ACF27381392C74A004B6AEF /* AIPreferenceCollectionView.m */; };
+ 5AC423F3178CBD5100F5911A /* ChatCyclingDefaults-Old.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D7F1E815F85DD300F32F9B /* ChatCyclingDefaults-Old.plist */; };
+ 5AC423F7178CBD5700F5911A /* ChatCyclingDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D7F1E915F85DD300F32F9B /* ChatCyclingDefaults.plist */; };
5ADFFE5D133846C300069C1B /* keys.png in Resources */ = {isa = PBXBuildFile; fileRef = 5ADFFE5C133846C300069C1B /* keys.png */; };
5AEE60011602BAE200304672 /* AIBoolToControlTextColorTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 979AA6A614D59DC8008730DF /* AIBoolToControlTextColorTransformer.m */; };
6311F4710E340DD2004234B8 /* AISharedAdium.h in Headers */ = {isa = PBXBuildFile; fileRef = 6311F46F0E340DD2004234B8 /* AISharedAdium.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -3998,6 +4002,8 @@
5AC7F26313B42952002D7265 /* Preferences-AddressBookIntegration.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "Preferences-AddressBookIntegration.xib"; path = "Resources/Preferences-AddressBookIntegration.xib"; sourceTree = "<group>"; };
5AC7F26513B42A55002D7265 /* Preferences-Encryption.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "Preferences-Encryption.xib"; path = "Resources/Preferences-Encryption.xib"; sourceTree = "<group>"; };
5AC7F26713B43612002D7265 /* Preferences-MessageAlerts.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "Preferences-MessageAlerts.xib"; path = "Resources/Preferences-MessageAlerts.xib"; sourceTree = "<group>"; };
+ 5ACA086817873AEA00B15047 /* AIButtonWithCursor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIButtonWithCursor.h; path = "Frameworks/AIUtilities Framework/Source/AIButtonWithCursor.h"; sourceTree = "<group>"; };
+ 5ACA086917873AEA00B15047 /* AIButtonWithCursor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIButtonWithCursor.m; path = "Frameworks/AIUtilities Framework/Source/AIButtonWithCursor.m"; sourceTree = "<group>"; };
5ACF27331392C585004B6AEF /* Preferences.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = Preferences.xib; path = Resources/Preferences.xib; sourceTree = "<group>"; };
5ACF27351392C74A004B6AEF /* AIHighlightingTextField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIHighlightingTextField.h; path = "Frameworks/AIUtilities Framework/Source/AIHighlightingTextField.h"; sourceTree = "<group>"; };
5ACF27361392C74A004B6AEF /* AIHighlightingTextField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIHighlightingTextField.m; path = "Frameworks/AIUtilities Framework/Source/AIHighlightingTextField.m"; sourceTree = "<group>"; };
@@ -7629,6 +7635,8 @@
@@ -9211,6 +9219,7 @@
@@ -9927,6 +9936,8 @@
@@ -10719,6 +10730,7 @@
+++ b/AdiumHelp/AdiumHelp.html Sat Jul 13 13:01:04 2013 -0400
@@ -23,8 +23,8 @@
+++ b/AdiumHelp/pgs/Accounts-CreatingAccounts.html Sat Jul 13 13:01:04 2013 -0400
@@ -61,7 +61,6 @@
+++ b/AdiumHelp/pgs/AdiumDocumentation.html Sat Jul 13 13:01:04 2013 -0400
@@ -80,7 +80,7 @@
<table width="100%" border="0" cellspacing="0" cellpadding="0" summary="One column table with heading">
<td width="150" rowspan="2" valign="top"><img src="../gfx/Message-sm.png" height="auto" width="150" border="0" alt="Message window screenshot" /> </td>
+ <td valign="top" colspan="3"><p>The chat window lets you communicate with your contacts. There are various features of this window from choosing which account of your contact you're talking to or want to talk to, adding files and emoticons to conversations and past chat history with the contact.</p></td>
@@ -97,18 +97,39 @@
+ <table width="100%" border="0" cellspacing="0" cellpadding="0" summary="One column table with heading">
+ <td width="150" rowspan="2" valign="top"><img src="../gfx/GrowlNotification1.png" height="auto" width="150" border="0" alt="Example Growl Notification" /> </td>
+ <td valign="top" colspan="3"><p>Adium features a highly-customisable "Events" system which enables you to set up different kinds of notifications and other actions for events.</p></td>
<table width="100%" border="0" cellspacing="0" cellpadding="0" summary="One column table with heading">
+ <td width="150" rowspan="2" valign="top"><img src="../gfx/Adium-Xtras.png" height="auto" width="150" border="0" alt="Example Growl Notification" /> </td>
@@ -136,11 +157,16 @@
+++ b/AdiumHelp/pgs/AdvancedFeatures-AdiumXtras-DockIcons.html Sat Jul 13 13:01:04 2013 -0400
@@ -47,7 +47,7 @@
+++ b/AdiumHelp/pgs/AdvancedFeatures-AdiumXtras-MenuBarIcons.html Sat Jul 13 13:01:04 2013 -0400
@@ -43,7 +43,7 @@
+++ b/AdiumHelp/pgs/AdvancedFeatures-AdiumXtras-SoundSets.html Sat Jul 13 13:01:04 2013 -0400
@@ -46,7 +46,7 @@
+++ b/AdiumHelp/pgs/AdvancedFeatures-AdiumXtras.html Sat Jul 13 13:01:04 2013 -0400
@@ -68,7 +68,7 @@
+ <p>An Xtra installed from the Adium Xtras site is supported by the Xtra's author. The first place to seek support is on the Xtra's page, probably in the comments unless the author has given other instructions. If that doesn't work, try the <a class="ext_link" href="http://forums.cocoaforge.com/viewforum.php?f=13">Adium forum</a>.</p>
@@ -76,7 +76,7 @@
+++ b/AdiumHelp/pgs/AdvancedFeatures-EmailNotification.html Sat Jul 13 13:01:04 2013 -0400
@@ -0,0 +1,37 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+ <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>
+ <p>On supported services, Adium can notify you when you receive new email on the address associated with your account. Adium will not notify of email for any other email account; Adium is not a mail client and does not intend to replace one.</p>
+++ b/AdiumHelp/pgs/AdvancedFeatures-Events.html Sat Jul 13 13:01:04 2013 -0400
@@ -0,0 +1,101 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+ <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>
+ <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>Events are all kinds of things happening in Adium like messages being sent or contacts changing their status. Actions are things that are done when those events occur, for example a sound being played, the bouncing of the dock icon or sending a message.</p>
+ <li>display (<a class="ext_link" href="http://growl.info">Growl</a>- or <a class="ext_link" href="http://support.apple.com/kb/ht5362">Notification-Center</a>-type) visual notifications when you receive new messages</li>
+ <p>For events, actions can be added and removed. Events can be edited globally and on a per-contact basis.</p>
+ <p>Depending on the situation, you might like to have different actions for events. To avoid having to edit all events every time, you can save global event settings as presets. Adium comes with three pre-existing presets: "Default Notifications", "Audio Notifications" and "Visual Notifications".</p>
+ <p>To edit an event globally, first open the <strong>Events</strong> section of Adium's preferences.</p>
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
+++ b/AdiumHelp/pgs/AdvancedFeatures-VisualNotifications.html Sat Jul 13 13:01:04 2013 -0400
@@ -0,0 +1,60 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+ <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>
+ <p>Visual notifications are a means of unobtrusively informing you when things happen, for example when you receive a message. In their default configuration, they fade into the top-right corner of your screen for a moment and then fade out again.</p>
+ <p>Adium features comprehensive support for visual notifications by ways of OS X's very own <a class="ext_link" href="http://support.apple.com/kb/ht5362">Notification Center</a> (on OS X 10.8 and later), third-party software <a class="ext_link" href="http://growl.info">Growl</a> as well as built-in notifications called "Mist" (on OS 10.7 and older).</p>
+ <p>This page explains the three different notification mechanisms mentioned above. See <a href="AdvancedFeatures-Events.html">Events</a> on how to tell Adium when to display visual notifications.<p>
+ <p>The third-party application Growl.app has been around about as long as Adium itself – a long time before Apple introduced "Notification Center" (NC) in OS X 10.8 ("Mountain Lion").</p>
+ <p>While Growl.app is the obvious solution for users on previous versions of OS X, it also has a lot to offer to OS X users on 10.8, especially in the way of customisability and extendability. For example, there are dozens of different styles to choose from.</p>
+ <p>To install Growl.app either <a class="ext_link" href="https://itunes.apple.com/de/app/growl/id467939042?mt=12">buy the application from the Mac App Store</a> (recommended, it's not expensive), or get an older and free version from <a class="ext_link" href="http://growl.info/downloads">http://growl.info/downloads</a> (not recommended and not supported on OS X 10.8 and later).</p>
+ <p>If you have Growl.app installed and would prefer to use Notification Center notifications for Adium, you need to make the change in Growl's preferences.</p>
+ <p>To uninstall the Growl application, follow the <a class="ext_link" href="http://growl.info/documentation/growl-package-removal.php">instructions on the Growl website</a>.</p>
+ <p>As of Adium 1.5, Adium is able to show Growl-style notifications on OS X versions 10.7 and 10.6 without the Growl application installed. This feature is called <a class="ext_link" href="http://growl.info/notetodevelopers">Mist</a>.</p>
+ <p>If you want to use a different style or use some of the more advanced features of Growl, you will have to either <a class="ext_link" href="https://itunes.apple.com/de/app/growl/id467939042?mt=12">buy the application from the Mac App Store</a> (recommended, it's not expensive), or get an older and free version from <a class="ext_link" href="http://growl.info/downloads">http://growl.info/downloads</a> (not recommended and not supported on OS X 10.8 and later).</p>
+++ b/AdiumHelp/pgs/ContactList-BlockingUnblocking.html Sat Jul 13 13:01:04 2013 -0400
@@ -82,7 +82,7 @@
+ <p><b>Note:</b> Unfortunately, not all services support all privacy settings; Adium does not currently present this information as clearly as it should. This will hopefully be fixed at a later point on the libpurple (https://trac.adium.im/wiki/LibPurple) level. (See http://developer.pidgin.im/wiki/GSoC2009/PrivacyRewrite for more information)</p>
+++ b/AdiumHelp/pgs/ContactList-StatusIcons.html Sat Jul 13 13:01:04 2013 -0400
@@ -88,7 +88,7 @@
+++ b/AdiumHelp/pgs/Messaging-GroupChat.html Sat Jul 13 13:01:04 2013 -0400
@@ -24,7 +24,7 @@
+++ b/AdiumHelp/pgs/Messaging-MessageView.html Sat Jul 13 13:01:04 2013 -0400
@@ -22,7 +22,7 @@
+ <p>Adium's message display, "WebKit Message View" (WKMV), is powered by WebKit (<a class="ext_link" href="https://trac.adium.im/wiki/WebKit">dedicated Adium Wiki entry</a>; <a class="ext_link" href="http://webkit.org/">official site</a>), the same layout engine which drives Apple's Safari web browser. This allows Adium to support an incredible variety of beautiful message display styles, and allows web-savvy users to become developers of Adium's appearance without touching a line of code.</p>
@@ -41,7 +41,7 @@
<p>Hundreds of additional message styles are available from the <a class="ext_link" href="http://xtras.adium.im/">Adium Xtras site</a>, and can be installed by clicking the install link on the Xtra's page. To install a message style that you have already downloaded, simply doubleclick it. In either case, Adium will launch and put it into the correct place for you.</p>
+++ b/AdiumHelp/pgs/Miscellaneous-AVSkypeSupport.html Sat Jul 13 13:01:04 2013 -0400
@@ -33,7 +33,7 @@
<p>Yes: The third-party <a href="http://xtras.adium.im/index.php?a=xtras&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>
+ <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>
<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>
+++ b/AdiumHelp/pgs/Miscellaneous-PasswordProtection.html Sat Jul 13 13:01:04 2013 -0400
@@ -0,0 +1,125 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<meta name="keywords" content="password, protection, security, FileVault, transcripts, logs, settings, preferences" />
+ <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>
+ <h3>I have friends and family who use Adium on the same machine I use. How do I keep them from seeing my contacts and transcripts, or worse, chatting with my friends?</h3>
+ <p>Adium doesn't provide a facility to password-protect your accounts (other than the account password that every service requires) or your transcripts.</p>
+ <p>Our opinion is that it would be duplicated effort. Mac OS X allows you to set up multiple password-protected user accounts. Our recommendation is that you should use this feature. Similarly, if you want the transcripts to be encrypted, we recommend using Mac OS X's built-in <a class="ext_link" href="http://support.apple.com/kb/ht4790">FileVault</a> feature, which encrypts everything in your Home folder.</p>
+ <p>Adium does let you require you to enter your account password to log into your account; simply don't enter it into the AccountEditor, and don't check the “Save password” checkbox in the password prompt. Of course, if you have multiple accounts, this will become something of a hassle.</p>
+ <p>Set up a Mac OS X account for every person who uses Adium on your system. Then, your settings (accounts, contacts, transcripts, AdiumXtras, preferences) will be totally separate from theirs—they won't even be in the same folder.</p>
+ <li>Enter your desired password in the “New Password” field, then again in the Verify field. Alternatively, click the button with a key icon to have Mac OS X generate your password. Either way, be sure to remember your new password, or write it down and store it in a safe place (not on, under, behind, or near your computer).</li>
+ <li>Optionally, enter a hint to your password. Mac OS X will present this clue after three incorrect attempts, in case you forget your password. For that reason, it should be a clue that you would understand and an attacker wouldn't. (For the same reason, don't simply put your password in this field, or you will show your password to an attacker after three incorrect attempts.)</li>
+ <li>Click on the padlock icon in the lower-left corner of the window. Enter the username and password of an administrator account on the system.</li>
+ <li>Uncheck the “Automatically log in as:” checkbox (also known as the “Make my system insecure” checkbox).</li>
+ <li>For added security, switch the “Display login window as:” setting from “List of users” to “Name and password”. This will require you to type in both your username and your password, rather than pick the username from a list. In a sense, this turns your username into a second, weak password, since anybody attempting to login must already know a username rather than be able to pick it from the list.</li>
+ <p>Afterward, whenever you leave your computer, you can put it to sleep (easy to do on laptops: just close the lid) or turn on the screen saver.</p>
+ <p>You can do this on a laptop as well, but on those machines, it's easier to just close the lid.</p>
+ <p>Afterward, you can activate the screen saver by choosing “Lock Screen” from the Keychain Menu Extra (which is a black padlock in the menu bar).</p>
+ <p>Apple's Knowledge Base has <a class="ext_link" href="http://support.apple.com/kb/ht4790">instructions for turning on FileVault</a>.</p>
+ <h3>I'm not on a shared computer, but I need to encrypt my transcripts for another reason and can't use FileVault (e.g., PortableAdium). What do I do?</h3>
+ <li>Find your Logs folder. It's this folder: (Your Home folder)/Library/Application Support/Adium 2.0/Users/Default/Logs.</li>
+ <p align="center"> <img src="../gfx/PasswordProtection-DiskUtilityCreateEncryptedDiskImage.png" width="400" " alt="" /></p>
+ <li>Choose “Secure Empty Trash” from the Finder menu. (This obliterates the contents of the unencrypted files, so that nobody—not even you—can recover them later.)</li>
+ <li>Hold down ⌘ and Option, and drag the Logs folder back to where you copied it from. This creates the alias pointing from the alias's location (in the Default folder) to the real Logs folder's location (on the disk image).</li>
+ <p>When you launch Adium and start a chat, it will mount the disk image automatically. You should regularly make backups of both the disk image file and your keychain.</p>
+ <h3>Wouldn't it be easier to let my partner/relatives/friend to use Adium in my OS X user account?</h3>
+ <li>Turn off “Remember password” on every account so that nobody can, accidentally or intentionally, log in as someone else.</li>
+ <p>They will also have to use the same settings you use for things like the message view style. If they change those settings, they will be changing them for you, too, and you'll probably want to change them back.</p>
+ <p>Each of you can set Adium in its Preferences to automatically set you as Away or log out (Offline) when you switch to a different account, so you won't need to do that manually before switching accounts.</p>
+ <p>This is better not only because it's easier and faster, but also because each of you can have your own settings. Each of you can have your own choice of contact list theme, message view style, fonts, emoticon set, desktop picture, etc. Transcripts and other data are also stored separately for each user (in each user's Home folder).</p>
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
+++ b/AdiumHelp/pgs/Miscellaneous-SupportWindowsLinuxMacOS9.html Sat Jul 13 13:01:04 2013 -0400
@@ -0,0 +1,60 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+ <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>
+ <p>Adium is only available on <a class="ext_link" href="http://www.apple.com/macosx">Mac OS X</a>.</p>
+ <p>Adium is written with very Mac specific code—mostly, but not entirely, Cocoa. Porting it to another platform would require rewriting the entire application.</p>
+ <p>Several multi-protocol IM clients already exist for Windows. We recommended <a class="ext_link" href="http://pidgin.im/">Pidgin for Windows</a>; it is open-source and free and Adium uses Pidgin's core (libpurple) for most protocols. Other options include:</p>
+ <li><a class="ext_link" href="http://www.trillian.im/">Trillian</a> (commercial; free 'lite' version available)</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>If you're using <a class="ext_link" href="http://www.gtk.org/">GTK+</a>, we recommend <a class="ext_link" href="http://pidgin.im/">Pidgin</a>. Adium uses Pidgin's core (libpurple) for most protocols.</p>
+ <p>If you're using <a class="ext_link" href="http://www.kde.org/">KDE</a>, we recommend <a class="ext_link" href="http://kopete.kde.org/">Kopete</a>. Kopete even works with <a href="http://xtras.adium.im/index.php?a=search&cat_id=5">Adium message view styles</a>.</p>
+ <p><b>But couldn't you use <a class="ext_link" href="http://www.gnustep.org/">GNUStep</a>?</b></p>
+ <p>We use Cocoa Bindings, Carbon, Quartz, Core Foundation, and Search Kit, among other APIs. These features are not available in GNUStep.</p>
+ <p>There was a GNUStep implementation very long ago, but it fell out of date and was missing features.</p>
+++ b/AdiumHelp/pgs/ServiceInformation-TwitterSupport.html Sat Jul 13 13:01:04 2013 -0400
@@ -34,7 +34,7 @@
+++ b/AdiumHelp/pgs/Troubleshooting-ConnectionProblemsMSN.html Sat Jul 13 13:01:04 2013 -0400
@@ -22,7 +22,7 @@
+ <p>This is caused by "incorrect" contacts in contact lists. If you're running into this error you need you need to remove the offending contact. You can identify it by getting a debug log (see <a class="ext_link" href="https://trac.adium.im/wiki/CurrentAdiumDebug">CurrentAdiumDebug</a> for instructions) and looking for the following sequence in the log:</p>
+++ b/AdiumHelp/pgs/Troubleshooting-RecoveringDeletedTranscripts.html Sat Jul 13 13:01:04 2013 -0400
@@ -29,6 +29,7 @@
<li>The contents of that folder are subfolders, one per account; the contents of each subfolder are more subfolders, one per contact. So, for example, if your AIM username is jdoe and you have a contact named jsmith, the logs folder will contain a folder named “AIM.jdoe” that contains a subfolder named “jsmith”.</li>
+ <p align="center"> <img src="../gfx/RecoveringDeletedTranscripts-AdiumLogsFolder.png" width="400" " alt="" /></p>
+++ b/AdiumHelp/pgs/Troubleshooting-RecoveringLostPasswords.html Sat Jul 13 13:01:04 2013 -0400
@@ -24,7 +24,7 @@
+ <p>If you don't remember what service you use, you'll first need to open up the Accounts pane of Adium's Preferences, and then refer to <a href="Accounts-ListOfServices.html">"ListOfServices"</a> to determine the name of the service.</p>
<div style="float:right"><img src="../gfx/RecoveringLostPasswords-KeychainAccess.png" alt="Path to Keychain Access." /></div>
@@ -51,7 +51,7 @@
<p>If you can't find any IM-service passwords in the Keychain, or none of them work, you'll have to have the IM service change your password.</p>
<p>Most services, if not all, don't keep a clear-text copy of your password to send you because if they lost that database (by accident or by theft), people's accounts could be compromised. They keep only an encrypted version of the password, which is more secure, but inconvenient because it leaves changing it as your only option.</p>
<p><i>Again, note that Adium is a third-party client; we don't run any of the instant-messaging services that Adium supports. If you want your password sent to you or changed, you'll need to contact the IM service that you're using.</i></p>
+ <p>We maintain a list of contact information for various services on the <a href="Accounts-CreatingAccounts.html">Creating accounts</a> page. We're not recommending that you throw away your old account and create a new one—it just happens to be the same contact information.</p>
<p>Once you have your password up and running, we recommend that you turn on the “Remember Password” option in Adium. This saves your password in the Mac OS X Keychain, so that you won't have to enter it every time you launch Adium. The Keychain encrypts the password, so it is secure, and it allows you to look it up if you ever need it again.
+++ b/AdiumHelp/pgs/TroubleshootingTips.html Sat Jul 13 13:01:04 2013 -0400
@@ -91,7 +91,7 @@
<p>Occasionally, an issue in Adium can be caused by a strange setting for your OS X user, or other installed software (especially system mods and hacks). Temporarily creating a new user (in System Preferences → Accounts) is the best way to check against these issues.</p>
+ <p>Create the account, log out of your account (Apple Menu → Log Out), and log into the new one. If the problem doesn't occur on the other user account, then you know it's something in your current account. If you don't know where to go from there, <a href="https://trac.adium.im/wiki/ContactUs">Contact Us</a> and we'll help you narrow the field.</p>
@@ -108,7 +108,7 @@
+ <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>
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,116 +0,0 @@
+++ b/AdiumHelp/pgs/WhatsNew1.4.html Sat Jul 13 13:01:04 2013 -0400
@@ -0,0 +1,116 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<div id="banner"> <a name="whatsnew1.4.html" id="WhatsNew1.4.html"></a><a name="ax-whatsnew" id="ax-whatsnew"></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>
+ <p>Adium 1.4 was in development for over two years (after the release of Adium 1.3 on 8/25/2008) and sports many new features. Just a few of the major improvements are listed below. We hope Adium makes instant messaging wonderful for you.</p>
+ <table width="100%" border="0" cellspacing="0" cellpadding="0" summary="One column table with heading">
+ <td width="150" rowspan="2" valign="top"><img src="../gfx/Twitter from account selection.png" alt="Image of Adium account types with IRC selected" height="auto" width="150" border="0" /> </td>
+ <table width="100%" border="0" cellspacing="0" cellpadding="0" summary="One column table with heading">
+ <td width="150" rowspan="2" valign="top"><img src="../gfx/IRC from account selection.png" alt="Image of Adium account types with Twitter selected" height="auto" width="150" border="0" /> </td>
+ <li>Mass-modify attributes of user list members from the group chat's action widget below the user list.</li>
+ <table width="100%" border="0" cellspacing="0" cellpadding="0" summary="One column table with heading">
+ <td width="150" rowspan="2" valign="top"><img src="../gfx/Group Chat.png" alt="Image of a group chat" height="auto" width="150" border="0" /> </td>
+ <li>Support for topics. (Note that message styles must support the feature for them to show up.)</li>
+ <table width="100%" border="0" cellspacing="0" cellpadding="0" summary="One column table with heading">
+ <td width="150" rowspan="2" valign="top"><img src="../gfx/Authorization Requests window.png" alt="Image of the Authorization Requests window" height="auto" width="150" border="0" /> </td>
+ <li>The authorization requests window has add, ignore, and deny toolbar and context menu items.</li>
+ <table width="100%" border="0" cellspacing="0" cellpadding="0" summary="One column table with heading">
+ <td width="150" rowspan="2" valign="top"><img src="../gfx/New Smooth Operator.png" alt="Image of new Smooth Operator" height="auto" width="150" border="0" /> </td>
+++ b/AdiumHelp/pgs/WhatsNew1.6.html Sat Jul 13 13:01:04 2013 -0400
@@ -0,0 +1,100 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<div id="banner"> <a name="whatsnew1.6.html" id="WhatsNew1.6.html"></a><a name="ax-whatsnew" id="ax-whatsnew"></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>
+ <table width="100%" border="0" cellspacing="0" cellpadding="0" summary="One column table with heading">
+ <td width="150" rowspan="2" valign="top"><img src="../gfx/New Smooth Operator.png" alt="Image of new Smooth Operator" height="auto" width="150" border="0" /> </td>
+ <table width="100%" border="0" cellspacing="0" cellpadding="0" summary="One column table with heading">
+ <td width="150" rowspan="2" valign="top"><img src="../gfx/Twitter from account selection.png" alt="Image of Adium account types with IRC selected" height="auto" width="150" border="0" /> </td>
+ <table width="100%" border="0" cellspacing="0" cellpadding="0" summary="One column table with heading">
+ <td width="150" rowspan="2" valign="top"><img src="../gfx/Group Chat.png" alt="Image of a group chat" height="auto" width="150" border="0" /> </td>
+ <table width="100%" border="0" cellspacing="0" cellpadding="0" summary="One column table with heading">
+ <td width="150" rowspan="2" valign="top"><img src="../gfx/IRC from account selection.png" alt="Image of Adium account types with Twitter selected" height="auto" width="150" border="0" /> </td>
+++ b/ChangeLogs/Changes.txt Sat Jul 13 13:01:04 2013 -0400
@@ -21,6 +21,9 @@
+ * Fixed an issue where the default encryption setting was not applied to newly-added contacts. (#13915)
@@ -39,6 +42,7 @@
@@ -52,6 +56,8 @@
* Changed hotkey behaviour to hide Adium when pressed while Adium is active. (#4859) (Rafael Glauber)
@@ -61,17 +67,28 @@
- Fixed DNS leaks in libpurple. / Added a "Tor (SOCKS5)" proxy option, which uses the Tor proxy option of libpurple. (#15161)
* Fixed erroneous OS X quarantine warning on launch ("'Adium.app' is an application downloaded from the Internet. Are you sure you want to open it?"). (#16034)
+ * 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)
+ * XMPP: refer to XMPP as "XMPP (Jabber)". Unfortunately, just "XMPP" still has some potential for confusion. (#16435)
+ * Fixed a bug that could cause Adium and other applications to hang and could lead to corruption of the Keychain when permanently trusting an untrusted SSL certificate. (#16365)
* Fixed a bug that could cause SSL connections to be closed prematurely. (#15405, #15411, #15741, #16356)
+ * Removed all anonymous ciphers from the list Adium tries, these are insecure and would crash Adium.
+++ b/Frameworks/AIUtilities Framework/Source/AIButtonWithCursor.h Sat Jul 13 13:01:04 2013 -0400
@@ -0,0 +1,19 @@
+ * Adium is the legal property of its developers, whose names are listed in the copyright file included
+ * This program is free software; you can redistribute it and/or modify it under the terms of the GNU
+ * General Public License as published by the Free Software Foundation; either version 2 of the License,
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * You should have received a copy of the GNU General Public License along with this program; if not,
+++ b/Frameworks/AIUtilities Framework/Source/AIButtonWithCursor.m Sat Jul 13 13:01:04 2013 -0400
@@ -0,0 +1,29 @@
+ * Adium is the legal property of its developers, whose names are listed in the copyright file included
+ * This program is free software; you can redistribute it and/or modify it under the terms of the GNU
+ * General Public License as published by the Free Software Foundation; either version 2 of the License,
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * You should have received a copy of the GNU General Public License along with this program; if not,
+++ b/Frameworks/Adium Framework/Source/AIAdiumProtocol.h Sat Jul 13 13:01:04 2013 -0400
@@ -16,16 +16,6 @@
+++ b/Frameworks/Adium Framework/Source/AIInterfaceControllerProtocol.h Sat Jul 13 13:01:04 2013 -0400
@@ -54,13 +54,9 @@
+++ b/Frameworks/Adium Framework/Source/AIMessageEntryTextView.h Sat Jul 13 13:01:04 2013 -0400
@@ -18,7 +18,7 @@
@@ -53,7 +53,7 @@
@@ -69,7 +69,7 @@
+++ b/Frameworks/Adium Framework/Source/AIMessageEntryTextView.m Sat Jul 13 13:01:04 2013 -0400
@@ -30,6 +30,8 @@
@@ -955,8 +957,9 @@
+ pushIndicator = [[AIButtonWithCursor alloc] initWithFrame:NSMakeRect(0, 0, [pushIndicatorImage size].width, [pushIndicatorImage size].height)];
@@ -1741,11 +1744,12 @@
+++ b/Plugins/Dual Window Interface/AIMessageWindowController.m Sat Jul 13 13:01:04 2013 -0400
@@ -239,7 +239,6 @@
&& [[adium.preferenceController preferenceForKey:KEY_CONFIRM_MSG_CLOSE group:PREF_GROUP_CONFIRMATIONS] boolValue]) {
@@ -249,18 +248,6 @@
@@ -271,12 +258,7 @@
NSAlert *alert = [NSAlert alertWithMessageText:AILocalizedString(@"Are you sure you want to close this window?", nil)
@@ -284,11 +266,11 @@
+ [[alert suppressionButton] setTitle:AILocalizedString(@"Do not warn when closing unread chats", nil)];
@@ -302,7 +284,7 @@
+++ b/Plugins/General Preferences/ESGeneralPreferences.h Sat Jul 13 13:01:04 2013 -0400
@@ -30,24 +30,18 @@
+++ b/Plugins/General Preferences/ESGeneralPreferences.m Sat Jul 13 13:01:04 2013 -0400
@@ -19,6 +19,8 @@
@@ -98,23 +100,28 @@
+ [checkbox_showInMenu setLocalizedString:AILocalizedString(@"Show Adium's status in the menu bar", nil)];
+ [checkbox_updatesAutomatic setLocalizedString:AILocalizedString(@"Automatically check for updates", nil)];
+ [checkbox_updatesIncludeBetas setLocalizedString:AILocalizedString(@"Update to beta versions when available", nil)];
+ [checkbox_updatesProfileInfo setLocalizedString:AILocalizedString(@"Include anonymous system profile", nil)];
@@ -152,4 +159,11 @@
+++ b/Plugins/Purple Service/AIPurpleCertificateTrustWarningAlert.m Sat Jul 13 13:01:04 2013 -0400
@@ -152,16 +152,6 @@
@@ -179,7 +169,7 @@
+++ b/Plugins/Purple Service/ESJabberService.m Sat Jul 13 13:01:04 2013 -0400
@@ -79,7 +79,7 @@
+++ b/Plugins/Purple Service/ESSimpleService.m Sat Jul 13 13:01:04 2013 -0400
@@ -51,13 +51,13 @@
+++ b/Plugins/Twitter Plugin/AITwitterAccount.m Sat Jul 13 13:01:04 2013 -0400
@@ -188,6 +188,7 @@
+++ b/Plugins/Twitter Plugin/STTwitter/STTwitterAPIWrapper.m Sat Jul 13 13:01:04 2013 -0400
@@ -75,7 +75,7 @@
+++ b/README.md Sat Jul 13 13:01:04 2013 -0400
@@ -1,14 +1,13 @@
+[](https://sourceforge.net/projects/adium/files/Adium_1.5.7.dmg/download?accel_key=67%3A1373330536%3Ahttps%253A//adium.im/%3A20578a1d%246c0ac46006327d57ebeb294a94d676fc046839e9&click_id=6718b910-e830-11e2-898a-0200ac1d1d8c-1&source=accel)
+[Download Adium 1.5.7](https://sourceforge.net/projects/adium/files/Adium_1.5.7.dmg/download?accel_key=67%3A1373330536%3Ahttps%253A//adium.im/%3A20578a1d%246c0ac46006327d57ebeb294a94d676fc046839e9&click_id=6718b910-e830-11e2-898a-0200ac1d1d8c-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.
+++ b/Release/upload-nightly.sh Sat Jul 13 13:01:04 2013 -0400
@@ -13,5 +13,12 @@
ssh ${NIGHTLY_USER}@${NIGHTLY_HOST} "ls -d ${NIGHTLY_REPO}-${NIGHTLY_BRANCH} || mkdir ${NIGHTLY_REPO}-${NIGHTLY_BRANCH}"
+scp build/latestDelta.info build/latest.info build/${ADIUM_RELEASE_NAME}.dmg.md5 build/${ADIUM_RELEASE_NAME}.dmg ${NIGHTLY_USER}@${NIGHTLY_HOST}:${NIGHTLY_REPO}-${NIGHTLY_BRANCH}
+++ b/Resources/ConfirmationDefaults.plist Sat Jul 13 13:01:04 2013 -0400
@@ -2,14 +2,10 @@
+++ b/Resources/Preferences-General.xib Sat Jul 13 13:01:04 2013 -0400
@@ -2,13 +2,13 @@
@@ -16,7 +16,6 @@
@@ -42,13 +41,42 @@
@@ -84,7 +112,7 @@
@@ -93,16 +121,12 @@
@@ -120,10 +144,10 @@
@@ -144,31 +168,7 @@
@@ -189,353 +189,37 @@
@@ -551,7 +235,7 @@
@@ -574,7 +258,7 @@
@@ -597,7 +281,7 @@
@@ -616,16 +300,16 @@
@@ -644,7 +328,7 @@
@@ -663,7 +347,7 @@
@@ -676,7 +360,9 @@
@@ -687,7 +373,7 @@
@@ -706,7 +392,7 @@
@@ -730,7 +416,7 @@
@@ -754,10 +440,10 @@
@@ -776,7 +462,7 @@
@@ -830,78 +516,6 @@
@@ -973,14 +587,6 @@
@@ -997,6 +603,22 @@
@@ -1092,162 +714,6 @@
@@ -1281,28 +747,22 @@
@@ -1400,121 +860,6 @@
@@ -1607,6 +952,19 @@
@@ -1617,39 +975,19 @@
@@ -1684,7 +1022,7 @@
@@ -1795,6 +1133,7 @@
@@ -1802,6 +1141,10 @@
@@ -1810,11 +1153,7 @@
@@ -1825,8 +1164,6 @@
@@ -1838,24 +1175,8 @@
@@ -1898,14 +1219,6 @@
@@ -1948,9 +1261,5 @@
+++ b/Resources/Preferences-MessageAlerts.xib Sat Jul 13 13:01:04 2013 -0400
@@ -2,13 +2,13 @@
@@ -267,7 +267,7 @@
@@ -275,7 +275,7 @@
@@ -295,6 +295,7 @@
+++ b/Source/AIAdium.m Sat Jul 13 13:01:04 2013 -0400
@@ -79,9 +79,7 @@
- (void)handleURLEvent:(NSAppleEventDescriptor *)event withReplyEvent:(NSAppleEventDescriptor *)replyEvent;
- (void)fileTransferQuitQuestion:(NSNumber *)number userInfo:(id)info suppression:(NSNumber *)suppressed;
@@ -276,70 +274,41 @@
+ questionToAsk = (([chatController unviewedContentCount] > 1) ? [NSString stringWithFormat:AILocalizedString(@"You have %d unread messages.",@"Quit Confirmation"), [chatController unviewedContentCount]] : AILocalizedString(@"You have an unread message.",@"Quit Confirmation"));
+ [self unreadQuitQuestion:[NSNumber numberWithInteger:ret] userInfo:userInfo suppression:[NSNumber numberWithBool:suppressed]];
+ questionToAsk = (([fileTransferController activeTransferCount] > 1) ? [NSString stringWithFormat:AILocalizedString(@"You have %d file transfers in progress.",@"Quit Confirmation"), [fileTransferController activeTransferCount]] : AILocalizedString(@"You have a file transfer in progress.",@"Quit Confirmation"));
+ [self fileTransferQuitQuestion:[NSNumber numberWithInteger:ret] userInfo:userInfo suppression:[NSNumber numberWithBool:suppressed]];
@@ -433,32 +402,8 @@
@@ -481,8 +426,8 @@
@@ -499,30 +444,6 @@
+++ b/Source/AIMessageAlertsAdvancedPreferences.m Sat Jul 13 13:01:04 2013 -0400
@@ -60,7 +60,7 @@
[checkbox_badgeDockIcon setLocalizedString:AILocalizedString(@"Display a count badge on the dock icon", nil)];
[checkbox_unreadConversations setLocalizedString:AILocalizedString(@"Count unread conversations instead of unread messages", nil)];
+ [checkbox_unreadContentMention setLocalizedString:AILocalizedString(@"For group chats, only count number of highlights and mentions", nil)];
+++ b/Source/AdiumSetupWizard.m Sat Jul 13 13:01:04 2013 -0400
@@ -271,7 +271,7 @@
+ AILocalizedString(@"<HTML>To chat with your friends, family, and coworkers, you must have an instant messaging account on the same service they do. Choose a service, name, and password below; if you don't have an account yet, click <A HREF=\"https://adium.im/help/pgs/Accounts-CreatingAccounts.html\">here</A> for more information.\n\nAdium supports as many accounts as you want to add; you can always add more in the "Accounts" pane of the Adium Preferences.</HTML>", nil)
+++ b/Utilities/tosupportpage.sh Sat Jul 13 13:01:04 2013 -0400
@@ -30,7 +30,7 @@
@@ -55,4 +55,4 @@