merge from default with a lot of effort

These cannot be weak.

By request, switch to 10.7 to take full advantage of ARC.

ARC-ify AdiumLibpurple.

ARC-ify AIUtilities.

Improvements to the change logs.

Fixed contact list wrong position at start-up under Mac OS X Lion. Fix suggested by wixardy. Fixes #15341. Fixes #15480.

Updated Makefile.

1.5rc3

Finished the sentence of this comment.

Blacklist the Skype plugin in 1.5, as it's known to be broken.

I know this introduces new strings that probably will not be translated in time, but too many people have it installed and don't know they need to update it.

This works better then previous way.

Better way of using two Xcode versions.

Make use of the scores when searching in preferences and select the best match. Fixes #15796

Rename 'Message Style' pane to 'Message View' fixing #15802.

Fix #15801 by defining a minimum width for the preferences window.

A better fix for 281ad094f064 which caused the search terms to be skipped.

Updated Italian localisation for 1.5rc2 from pi++. Fixes #15810. Fixes #15808.

Merged

Remove the hard-coded server name for LiveJournal accounts, they have an SRV record now.

Fixes #15777

Fix version requirement. Also fix minor changelogging boo-boos.

Updated change logs.

Forgot to refactor this part calling ESPresetNameSheetController.

Updated LMX. Removed PPC stuff.

Added -DNS_BLOCK_ASSERTIONS to JSONKit to improve performance.

Updated OAuthConsumer. Removed PPC stuff.

Refactored AINewContactWindowController to be acceptable to the static analyzer.

Keep the NSConnection AIAdium creates around, so the static analyzer can be happy about it.

Merged

This autorelease was wrong, the superclass calls [self autorelease] in -windowWillClose:. Made sure that's commented everywhere.

Fixed three new warnings that were introduced in the static analyzer (showOnWindow: is marked to release the receiver, so don't use it after calling it).

Removed a bunch of broken links/references to frameworks, looks like used and removed by the AV branch.

Updated JSONKit. Looks like analyzer won't complain anymore.

Refactor SHLinkEditorWindowController and ESPresetNameSheetController to be accepted by the static analyzer, and fix leaking when closing.

Some more annotations to AIAccount about authorization requests, I think the static analyzer is still not happy with it, though.

ESOTRPrivateKeyGenerationWindowController doesn't need to release itself in the -windowWillClose, but that does mean it leaks here.

Refactor ESPresetManagementController to be acceptable to the static analyzer, and fix it leaking after closing the window.

Refactor and annotate AdiumSetupWizard to be acceptable to the static analyzer.

This plugin is never unloaded, but handle it just in case, so this doesn't look like a leak.

Annotate XtrasInstaller to be acceptable for the static analyzer.

Refactor AIListLayoutWindowController to be acceptable to the static analyzer, and fix it leaking after closing the window.

Refactor ESTextAndButtonsWindowController and ESEditStatusGroupWindowController to be acceptable to the static analyzer, and fix them leaking after closing the window.

Correct 065615aec05d. Apparently, in Mac OS X (English) all words in menu items are capitalised.

1.5rc2

Linked the rest of the used libs, to the Xcode project.

Added this back. http://hg.adium.im/adium/rev/6c3cd092c3d4

Update ShortcutRecorder.

Move those two to the appropriate directory.

Refactor AINewBookmarkWindowController to be acceptable to the static analyzer, and fix it leaking after closing the window.

Refactored AINewGroupWindowController to be acceptable to the static analyzer, and fix it leaking after closing the window.

Refactored AITemporaryIRCAccountWindowController to be acceptable to the static analyzer.

Refactored AIListThemeWindowController to be acceptable to the static analyzer.

I think this way is better, to avoid saving the frame of the sheet as if it were a window.

Refactored AIEditAccountWindowController to be acceptable to the static analyzer.

Refactored AIDockIconSelectionSheet into a way the static analyzer accepts.

Fix a couple of leaks and incorrect memory management in AIEmoticonPreferences, also, create and open it in a way the static analyzer will accept.

Updated FriBidi to version 2 (0.19.2). Fixed few analyzer warnings.

This leak fix was wrong. NSWindowController subclasses aren't released until -windowWillClose:

Avoid a lot of false positives of the static analyzer.

Backout my changes to immutableCopy and use __attribute__((objc_method_family(copy))), as pointed out by Peter Hosey.

Another bunch of leak fixes, found by the static analyzer.

Fix another bunch of leaks found by the static analyzer.

Rename our immutableCopy to copyImmutable, to avoid a lot of false positive analyzer warnings.

Fix leaks in the deallocation of AIMetaContacts, found (partially) by the static analyzer.

Fix a couple of leaks found by the static analyzer in the initialization of the AILoggerPlugin.

Fixed 3 "Call to free data when error was returned during allocation" in AIKeychain. Analyzer Warnings--.

Fixed a bunch of "Argument to 'NSDictionary' method 'dictionaryWithObjectsAndKeys:' should be an Objective-C pointer type, not '_SOME_Ref'". Analyzer Warnings--.

Minor fix to previous fix :).

Fixed a mega bunch of "Method accepting NSError** should have a non-void return value to indicate whether or not an error occurred". Analyzer Warnings--.

Make some search terms match their group's title so that searching for tooltips works like it should.

Use different icons for preferences messages and window handling than the duplicates they were using.

Fixed "Argument in message expression is an uninitialized value" in AIChat.m. Analyzer Warnings--.

Fixed "Value stored to 'level' during its initialization is never read". Analyzer Warnings--.

Fixed 2 "The right operand to '-' is always 0". Analyzer Warnings--.

Fixed a bunch of "Value stored to 'OBJECT' is never read". Analyzer Warnings--.