Put the Dock Icon / Status Menu Item Counts preferences at the bottom of this nib to allow some space for the text-heavy checkbox, fixing an internationalization layout issue. Fixes #13371

Add a hidden preference, AITwitterUseNonstandardRetweet, which forces the old-style "paste retweet into input bar." We can make this a preference in 1.4.1 if needed.
(transplanted from 1ce119b4a029b8bba0a7afd601b93c86b594d9f0)

Czech localization updates from Frantisek Erben

This method is no longer called by us or by Sparkle

Fixed a potential issue with Xtras installation via adiumxtra:// links on systems with case sensitive file systems

Fix more "status message" type confusion. Fixes #11491. Refs #13460.
(transplanted from 758f5a24e190dfe9da441966bb385b8c7869cade)

Simplify the "status message" contact/account property into one getter method. Correct error -1728 from AS on contact's status messages. Fixes #13460.

The totally undocumented -1728 error appears to be caused by runtime type disagreeing with event type. "status message" is apparently assumed to only have 1 code, so specifying one for contacts and one for accounts was confusing it when it was going to fetch it.
(transplanted from 1e8c89f99dfe50c2406a7552a8a90bae142677e0)

Use the account proxy for SSL connections for Yahoo. Fixes #13210.
(transplanted from fbb560e54233f3fe648a93b31ffe8fb4f5e1ea8d)

Enable facebook_manage_friends, so that we can actually manage friends lists. Fixes #13404.
(transplanted from c2a6b90a5b53ef69c61cd18ac1b69ac947569eab)

When loading the Privacy window, resize when it opens appropriately. Fixes #13307.
(transplanted from fa096eef7c0fdfee2642a38ca8099f89e8abe897)

LMX.framework with my change at http://bitbucket.org/zacwest/lmx-x86_64-currentindexfix/changeset/c6c1e2dedf92/, fixes currentIndex being lost, and repeating elements when processing multiple chunks. Refs #13362.

/me shakes fist at sholt for applying his changes to the branch.

Fix a few more issues with context reading; if we're reading less than readSize, we need to decrement readSize too. Refs #13362.
(transplanted from 51687f71fc6384eeed8507fd8d287e184071d2e2)

*sigh* The later it gets, the worst I read. Fix another using-value-as-key problem in this AILog.
(transplanted from bd512b533b9839640ab22bad4df38004f39c9706)

Durr, brain fart; we need to remove the keys, not some random nonsensical value-as-key. Refs #12233.

Please grab a nightly >= 1.5hgr2978 to test this.
(transplanted from a4ecbe8bed4622ae2d6c66a0934ea9272bf8171f)

Possibly correct a hang when dragging contacts around. Refs #12233.

The only explanation I can see for infinite looping in this while() is that orderIndexforObject is INFINITY, so our constant incrementing is yielding more INFINITY, ad infinitum.

I've added an AILog so that if this is truly the case it'll show up in a debug log. I'd be interested to see if this guess is right, especially since I can't figure out why it would happen except for corrupt index caches.
(transplanted from 4a64255881c8b5c3e65187efb00b531ee3ac9384)

When opening for a contact, don't silently switch the search type to "to". Fixes #12001.

This also moves the automatic selection below the "we're now updating for search" line, so that highlighting is applied to the log (since when it's asked to display, there's no search term for it).
(transplanted from 21c1813a173a6752964f95ab0f7d116e299dd872)

Fix the context parser ignoring pages. Fixes #13362.

Every iteration was doing:
1. Move to location for reading.
2. Read
3. Move to location for next read.

So we were skipping reads like a mofo here. I believe this fixes any remaining context issues that un-instance-variableing didn't hit.
(transplanted from 0eb39f6eb39c56f8e8335d6f73ecdddeabbcf2fa)

Avoid draining items we're still using; fix for some reason putting "Value" in this context object. Refs #13362.
(transplanted from 24c471ce6c9e88a9809f376dc5525ac85a0cc97a)

Don't use any instance variables to control parsing, use the parser's context info. Refs #13362.
(transplanted from 2a385da3eace06fe7a7dee95bef5971428b33b8c)

Don't deal with autorelease pools on the file level; deal with it in terms of chats. Refs #13362.
(transplanted from fa988de96a942c5f209a86b73e849b8996c10752)

Code simplification; remove the old preferences, and don't use a static variable to count the lines. Refs #13362.

I can't imagine using a static variable like this wouldn't cause problems, especially with "save chats" enabled; we'd be messing with the same static variable like crazy. I'm betting this explains some weird context problems, so let's see if this helps #13362.
(transplanted from 37f86ef91f6444487aafbe1af64a74f2a088fd9b)

Replace the (Authorize/Deny/Ignore).png images with (Authorize/Deny/Ignore).tiff images, with multiple sizes. From George Lambrou.
(transplanted from d525fccd2bcb061597107e35f404fed1ef5b7416)

Updated pl localization from toszcze. Fixes #13400.
(transplanted from b1aa7d6c2a6af6c6924fff7eddde33418ec5ccff)

Updated nb localization from sorngard. Fixes #13464.
(transplanted from 024a42caf6c53c270357bbe2d90c297921773012)

Updated nl localization from digistorm. Fixes #13468.
(transplanted from b2c72a8457da502824488fd41ce93ac5d8cd32c2)

Updated sv localization from Ponthus Blomquist.
(transplanted from 4c0441f19463fbe8b9f14f72df67a57805006605)

Updated localization-updater for current source hierarchy.
(transplanted from a27b551fe175487f6a9f0d63c744c30cd8127bce)

Add underscores to the list of permissible hash tag characters. Fixes #12673.
(transplanted from 8c9675f4e1472c7d9e0f72c6a53fb8bb60b138aa)

String comments

Store a per-chat preference for show/join leave notices. This is uniqued only by the chat name, but I think that's appropriate; the preference will then apply to the same room regardless of the account with which you connect to it. Fixes #12034

Unify AIXMLElement, including the method introduced in [58897a698d28], on NSUInteger, fixing at least one type-mismatch warning.

Set the Contact Info Inspector to not "hide on deactivate." Fixes #12714.

The inspector contains a fair amount of useful information, especially in the case of Facebook contacts or Address Book contacts. It's not as much of an inspector as other applications deal with: it's not just modifying the information it's inspecting, it's also presenting more information.

A future version of Adium could go the route of dividing a "get info" and "show inspector" version of this, but I've run into this situation enough that it drives me crazy having to tab back and forth for more information.
(transplanted from 67cf100919f4d0ba69117ad0ac3eb62189efb666)

Removed redundant method declarations introduced in [93ced8fc9973], effectively reverting that changeset. These are already declared (and the warning suppressed) in AILeopardCompatibility.h.

Fixed off-by-one-pixel alignment problem noted by Robby in #10239 (refs #10329) and replaced nib files' info/classes.nib with the modern designable/keyedobjects.nib which Interface Builder now creates

Corrected an off-by-1-pixel alignment problem with the last 4 checkboxes of the status window, pointed out by Robby in #10239. Refs #10239 (whose core issue is already fixed).

Revert the "never use last saved status" behavior. Re-fixes #6227.

The behavior was #ifdef'd out to appease MSN users, who wanted their status messages to propagate. Find some middle ground here: if a status message is currently set, a custom new-status window will retain it. Otherwise, it'll use the saved one. And we'll always use the last-saved status settings otherwise, so "autoreply" saving always works.
(transplanted from 9c32a9b78f76a2ce5f10db8bc36bb469274b431b)

FIxed all springs and struts on EditStateSheet nibs. Fixes #10239.

Added a `%variant%` keyword for message styles, and rearranged code a bit so that an AIWebkitMessageViewStyle keeps track of its active variant rather than AIWebKitMessageViewController doing so and passing it back to the activeStyle with various invocations.

Fixes #12702

Warnings--;

Whitespace fix

For our `WebView`s, use a preferences identifier of activeStyle-preferenceGroup. This uniques group chats from one-on-one chats when their preferences are being stored separately. The WebView preference identifier is used only transiently in our usage to allow all WebViews to update when one changes (via the preferences); this doesn't change our actual storage and retrieval of the prefs. Fixes #12810 by implementing Zac's suggestion there.

Avoid throwing unknown-selector problems when join views don't implement dragging ended or exited.
(transplanted from c38058f6fea8a7fc11d0d7d9fdda786ed4146f77)

Avoid asking for a non-existent key when dragging contacts into things.
(transplanted from 728b4e994ca22938cb5ff5365981de8c738980ba)

At some point in time, the need to replace & with & to allow linking to work died off. Do not try to mess with the URL at all. Fixes #13382.

Because & was being replaced with &, any following # were considered part of a &#…; sequence, which was causing some serious misparsing. By removing both the &->& and #->#, we kill two birds with one stone.
(transplanted from ba94093fbed86ca07cd2261c28a1b19a34da487e)

The context was being read in properly, we were just mis-parsing the Twitter end of it, which now works fine. Refs #13447 which didn't need this change.
(transplanted from 13548a608dd34e2070852af8009b73ceec3ae2db)

When in a group chat, the "get info" keyboard shortcut should always open the group chat. Fixes #11941.

My previous argument (of getting info on the selected object in the user list) is probably best served by the context menus in the user list, not the generic "Contact" one.
(transplanted from 0423824a16e0ce630a1e81c9bcd9dbbae1d71382)

Don't allow a user to try and follow themselves. Fixes #12092.
(transplanted from 7ffe6bd0f0d7f23adefb4936737b5b1f6cd3e644)

Hackify the retweet support to deal with Laconica not supporting /api/statuses/retweet/%d.xml yet by falling back on inserting it in the text field.
(transplanted from ffdf2878fc68066c51062abcda80bfbac5f81500)

Context-loaded Twitter messages my having '&' instead of '&'. This is valid, but we weren't considering it.
(transplanted from 592152c93c30b4cf628636e96898c061919f9eba)

Use recently-added -insertEscapedObject:atIndex: methods to prevent over-escaping context messages. Fixes #13447.
(transplanted from f23c6c342e18ea273c44ae7a3d49d763f0d3aa1e)

Header changes for adding - (void)insertEscapedObject:(id)obj atIndex:(unsigned)idx.
(transplanted from cb70a420e95395a2fd66004d80148fdabad80a39)

Doxygenize AIXMLElement and add -insertEscapedObject:atIndex: for use in a future commit.
(transplanted from a18df53b06178e6d8ce9842c59d424a1d9196c07)

If we try to update icons while the webview doesn't have an accessible documentFrame (e.g. while it is still working on loading its initial HTML), try again after a second. This fixes icons which are part of the initial bolus of information presented by a webview that change shortly after it loads, which can most noticeably happen when restoring a chat using a webview with icons in its header but could also occur if a user icon changed as we opened a chat window.

Fixes #12696

Remove underscore character hints from contact menu action items

Don't let a borderless contact list disappear if we filter all of its contacts away.

Some fixes for moving contacts, especially metacontacts, around. Refs #12156. This whole space is pretty complex, so I'm not sure if it fixes it or not; would appreciate further testing.

Updated zh_TW from Jack Lin.
(transplanted from e8c92c1a2dbec803f251302687044268eb58fdc0)

Updated hu localization from Péter Tutervai.
(transplanted from cf9880a9cad57436c077b382d163d772558e4f2f)

Updated zh_CN translation from JT Lee.
(transplanted from f70d625fda881233bcb1a8872ab2223d2826ce68)

im.pidgin.adium at 275309df32cc8e9f917529073caa4729aaa7d5a3, which has the collaborative efforts of Zac and I fixing AIM Direct IM Unicode support as well as current im.pidgin.pidgin at nearly 2.6.4.

Warnings -= 2;

* Fix a crash if `kDNSServiceErr_Invalid` is returned by `TXTRecordSetValue` which occured because the `%@` was being used for a C string
* Handle the situation which caused `kDNSServiceErr_Invalid` to be returned by `TXTRecordSetValue` if setting a long status message (≥ 250 characters) by truncating appropriately.

Fixes #11322

A manually specified display name must override any server-provided one. A chat can get a display name from the account's own information via -[CBPurpleAccount updateTitle:forChat:]. If an alias is specified for a chat, ensure that it is displayed by setting it at highest priority in the AIMutableOwnerArray.

Fixes #12771, including the comment within that ticket that changes to the alias via the Get Info window previously didn't live-update.

Changes in manual ordering must be relative to the visible objects within a group, not all of them, or the results wrong. I'm not sure how this was ever working; I suspect that it was relying on a sorting bug elsewhere in Adium which has been fixed in 1.4. Fixes #12096

Merge

Debug logging for moving objects around. Refs #12096

Trying to merge back into a single head.

Backed out changeset b86536983564: As with previous reversion, back out change which removed an override of a private method I didn't think we need but which appears to have created odd behavior... despite not seemingly being called. Hm.

Backed out changeset 68d1a7f1f4e4: This messed up highlighting weirdly. Will return to it later.

Resolve some warnings related to 64-bit compilation

Newline at end of file

Don't claim to implement methods we don't

Add interface declarations for 10.6+ methods we check for at runtime, suppressing 2 warnings when compiling

Remove unncessary attempted override of a private NSCell method
{{{
- (void)_drawHighlightWithFrame:(NSRect)cellFrame inView:(NSView *)inControlView
}}}
it's not even called as of 10.6, and it hasn't been doing its job in 10.5, as custom highlighting in the Regular and Borderless window lists (which use the standard cells rather than the Group Bubbles and Contact Bubbles style cells) doesn't work, with or without it.

Header change for typeToFindEnabled hidden pref