Correct the tendancy of the character counter to shift positions/shrink when the message window is resized. Fixes #11898.

Add NSFastEndumeration protocol support to AHHyperlinkScanner. Closes #12789

Fixes #10625. Fixes #6539. Emoticon replacement issues.

* Adds the `symbolCharacterSet` to the characters trimmed from the ends of strings
* Removes characters in the current `replacementString` from the `endingTrimSet`, and stores the set in a static NSDictionary for faster recall later.
* Improved condition for deciding end-of-string replaceability
* Corrects a condition where the replacement algorithm may terminate early.

Copy of gtkmedia from pidgin with some minor namespace changes so far

Project changes for vv setup

Set the Gstreamer plugin path to load plugins from gstreamer.framework's PlugIns folder

This can be in version control

Headers for current libpuprle

Frameworks from current build

Update for current libpurple

im.pidgin.adium @ 95e1a9a37ac63c1d120c7be71104e2eb189c661f (libpurple 2.6.0mtn) built with vv support

We do our own linkification; I'm pretty sure we don't need this new libidn support. If there's a case for using it (and therefore including a build of libidn within Adium) let me know

libgstbase 0.10.13 and libgstinterfaces from gstreamer 0.10.24, which I believe exist as a linking technicality and don't actually add anything that's used

libgstfarsight (gst-plugins-farsight) 0.12.11

libgstreamer 0.10.24, gst-plugins-base 0.10.23, gst-plugins-good 0.10.15, and gst-plugins-bad 0.10.13

We need the current version of libxml for gstreamer (2.2)

Enable gstreamer and vv

vv_dependencies_make.sh should be run next

Universalize the vv dependencies, universalize the gst plugins, and put the gst plugins into a PlugIns folder within libgstreamer.framework after universalizing them

Use the current (and necessary) versions of some vv dependencies, and add download of libNICE

farsight needs libnice; libxml takes a while building python bindings which we don't need; prompt to run purple_make when complete

Don't leak the color arrays for group chats.

Use AIImageTextCell to center the text vertically in the advanced preferences pane

Patch from wildwobby to improve the margin between the left edge of the preferences window and the icons in the new Advanced Preferences pane.

Patch from '''mathuaerknedam''' which adds a message style keyword `%userIcons%` which is replaced by `showIcons` if user icons are enabled in the Messages preferences and `hideIcons` if they aren't. This lets him do some CSS voodoo of some sort :) Fixes #11874

Patch from mathuaerknedam to fix `%serviceIconImg%` and add a tooltip to it. Fixes #12664. Thanks!

Patch from wildwobby to fix dead assignment in RBSplitView.m. Fixes #12459. Thanks!

Patch from wildwobbly: Fixes variable that is assigned and declared, only to be reassigned a few lines down. Removed first line, redeclared at first actual use of variable.

Thanks! Fixes #12460

Backed out changeset e5f9c498c127

Backed out changeset 604fa8a4e257 - incorrect log message

Handle dragging a contact from a chat's group list to a contact list group appropriately. Fixe #12358

Don't let the contact list's outline view go to 0 pixels high when showing the filter bar. This fixes a filter bar animation occurring before the contact list is populated. Fixes #12214

The notification selector in the superclass was changed, but this subclassing of it wasn't fully updated. Fixes updating of the hidden/visible state of a borderless contact list based upon whether or not it contains any rows and is supposed to hide when empty. Fixes #12206

We have to link against QuickTime and QTKit frameworks again since we're not using NSSound

Add json-glib to the urls to download for dependency building

Fix link to sf.net mirror for meanwhile download

I'm sorry about this long merge; I'm not sure how else to resolve so I can push

Merge?

Completed NSSound backout

Backed out changeset 3063c2f304a0. Closes #12098. This may be revisited when Adium requires Mac OS X 10.6; NSSound is not usable in Mac OS X 10.5.7.

Continuing backout of NSSound; Refs #12098

Backed out changeset e72c1ec0419a

Beginning backout of NSSound; Refs #12098

Backed out changeset 8b455a7d180d

Nonsound change from [2165]

Backed out changeset 8b455a7d180d - revert NSSound caching. Refs #12098

Merge

Zac West is now co-lead developer; blog post is up at http://adium.im/blog/2009/07/zac-west-co-lead-developer/

Back to 1.4hg for the nightly.

Version up to 1.4b8.

im.pidgin.adium at c46ba578108576be9927a82636db9534587ce011, which also has pidgin-facebookchat at r261.

Merge.

Backed out changeset fc55c522b2d5

This is breaking emoticons such as "<3 <3 <3 <3".

im.pidgin.adium at c543331cf58f6b20e8b497ac885703a1acaced3a, which fixes both Yahoos connecting.

Also has pidgin-facebookchat at r620, which adds group ("friend list") support, thus unbreaking meta contacts which contain Facebook contacts, along with things like buddy icons not working.

im.pidgin.adium at 534ffccfd244372a8f2569168b1bc15b8c9d9054, which separates out Yahoo into 2 protocols (JP, regular). Neither currently connect.

pidgin-facebookchat, as well, at r564.

Abstract multipart image uploading a bit and add an imageshack.us service for image uploading.

Set our distid for AOL as per their request

Minor code cleanup to make this shorter in preparation for Colin and me hacking on it a bit

Put the 'defer' back for this script. I had thought it was unsupported, but perhaps not.

Transplant 2da626ce439f from adium-1.3, mark the nib as localizable. Refs #12480.

Merge backout

Backed out changeset 0e0e38e66cf2 pending getting some questions Colin had answered in the bug. Reopens #10594

A few more simplifications, getting Template.html down to an even 200 lines

Merge backout

Simplify Template.html a bunch. I think this may also fix a few emoticon issues

Add iPhone SDK support to AutoHyperlinks. Fixes #10594

Backed out changeset fc55c522b2d5. Testing if it caused a regression

Patch from Robby Weinberg to remove an extraneous line of code. Fixes #12458.

Patch from Robby Weinberg to fix the character counter not auto-resizing. Fixes #11996.

Clarify a few Twitter error messages:
* Post an event when a Tweet is successfully sent.
* Say "unable to update timeline:" instead of "an error occurred:" - a lot of users were thinking their tweets weren't posted.
* Remove the "…or being upgraded" for the failwhale error.

Fix the ticket #6539 Adium "Don't show all the emoticons in the contact names"

Patch from MartialL that fixes #3807. A few relatively minor changes by me

Patch from MartialL that fixes #3807

Trivial simplification. Was investigating a crash here, but didn't determine the cause

Make mvv3 not coalesce, as originally intended. Nice catch mathuaerknedam