14 months agoClose inactive branch HistoricMUCMessages
Robby Weinberg <wildwobby@wildwobby.com> [Sun, 20 Mar 2011 23:25:59 -0500] rev 3765
Close inactive branch

14 months agolibpurple 2.7.11 [im.pidgin.adium @ ab088877a85248be87a95a3b3357c96f79865806]
Thijs Alkemade <thijsalkemade@gmail.com> [Fri, 18 Mar 2011 12:21:25 +0100] rev 3764
libpurple 2.7.11 [im.pidgin.adium @ ab088877a85248be87a95a3b3357c96f79865806]

Correct the merge with i.p.a.1-4 by removing X-FACEBOOK-PLATFORM, fixing a crash on startup.
Also, libpurple has i386 and ppc again.

14 months agolibpurple 2.7.11 [im.pidgin.adium @ 6c11797f5c7d21c307a76ed96d7882e2ce7fe926]
Thijs Alkemade <thijsalkemade@gmail.com> [Fri, 18 Mar 2011 02:37:02 +0100] rev 3763
libpurple 2.7.11 [im.pidgin.adium @ 6c11797f5c7d21c307a76ed96d7882e2ce7fe926]

Now really. I had forgotten to update my working directory after the explicit merge in monotone...

14 months agoMerging this branch back in. libpurple is now at 2.7.11
Thijs Alkemade <thijsalkemade@gmail.com> [Fri, 18 Mar 2011 01:33:47 +0100] rev 3762
Merging this branch back in. libpurple is now at 2.7.11

14 months agolibpurple 2.7.11 [im.pidgin.adium @ 6c11797f5c7d21c307a76ed96d7882e2ce7fe926]
Thijs Alkemade <thijsalkemade@gmail.com> [Fri, 18 Mar 2011 01:29:17 +0100] rev 3761
libpurple 2.7.11 [im.pidgin.adium @ 6c11797f5c7d21c307a76ed96d7882e2ce7fe926]

Additionally, fix the build scripts to work even when XCode4 is installed (assuming XCode 3 still lives under /Developer-old).

14 months agoBut we do need a formatted string here... 10.6+
Stephen Holt <sholt@adium.im> [Tue, 15 Mar 2011 23:42:57 -0700] rev 3760
But we do need a formatted string here...

14 months agoNo need for stringWithFormat: here either 10.6+
Stephen Holt <sholt@adium.im> [Tue, 15 Mar 2011 23:42:24 -0700] rev 3759
No need for stringWithFormat: here either

14 months agoSome protocol warning cleanup. 10.6+
Stephen Holt <sholt@adium.im> [Tue, 15 Mar 2011 23:34:03 -0700] rev 3758
Some protocol warning cleanup.

14 months agoDeprecated NSImage methods with replacements only available on 10.6 (on 10.6+ branch only) 10.6+
Stephen Holt <sholt@adium.im> [Tue, 15 Mar 2011 23:31:39 -0700] rev 3757
Deprecated NSImage methods with replacements only available on 10.6 (on 10.6+ branch only)

14 months agoMerge 9bc0cfa2fa0d to 10.6+ branch 10.6+
Stephen Holt <sholt@adium.im> [Tue, 15 Mar 2011 23:26:18 -0700] rev 3756
Merge 9bc0cfa2fa0d to 10.6+ branch

14 months agoWe don't need this protocol yet.
Stephen Holt <sholt@adium.im> [Tue, 15 Mar 2011 23:06:35 -0700] rev 3755
We don't need this protocol yet.

14 months agoMerge 10.6+
Stephen Holt <sholt@adium.im> [Tue, 15 Mar 2011 23:01:11 -0700] rev 3754
Merge

14 months agoBacked out changeset 4b8d5b913c9b
Stephen Holt <sholt@adium.im> [Tue, 15 Mar 2011 22:59:57 -0700] rev 3753
Backed out changeset 4b8d5b913c9b

14 months agoMerging
Evan Schoenberg [Tue, 15 Mar 2011 20:31:02 -0500] rev 3752
Merging

14 months agoproject changes for 10.6+, on a 10.6+ branch for now, just to get them out of my tree :) 10.6+
Evan Schoenberg [Tue, 15 Mar 2011 20:28:24 -0500] rev 3751
project changes for 10.6+, on a 10.6+ branch for now, just to get them out of my tree :)

14 months agoNo need for stringWithFormat: here
Evan Schoenberg [Tue, 15 Mar 2011 20:26:15 -0500] rev 3750
No need for stringWithFormat: here

14 months agoDon't make the contact list stationary unless it's supposed to show at the desktop level. Fixes #15060
Evan Schoenberg [Tue, 15 Mar 2011 20:25:54 -0500] rev 3749
Don't make the contact list stationary unless it's supposed to show at the desktop level. Fixes #15060

14 months agoRemove a reference to togglegroups*.png that was missed in 310da23db99f
Frank Dowsett <wixardy@adium.im> [Tue, 15 Mar 2011 12:43:52 -0400] rev 3748
Remove a reference to togglegroups*.png that was missed in 310da23db99f

14 months agobacking out 0054af11643b
Stephen Holt <sholt@adium.im> [Mon, 14 Mar 2011 22:23:23 -0700] rev 3747
backing out 0054af11643b

14 months agobacking out 50f806e9a900
Stephen Holt <sholt@adium.im> [Mon, 14 Mar 2011 22:22:59 -0700] rev 3746
backing out 50f806e9a900

14 months agobacking out 4df726a9f736
Stephen Holt <sholt@adium.im> [Mon, 14 Mar 2011 22:22:31 -0700] rev 3745
backing out 4df726a9f736

14 months agoReplace CoreAudio methods deprecated in 10.6 with methods available since 10.4
Stephen Holt <sholt@adium.im> [Mon, 14 Mar 2011 22:20:38 -0700] rev 3744
Replace CoreAudio methods deprecated in 10.6 with methods available since 10.4

15 months agoimported patch weirdClangError
Stephen Holt <sholt@adium.im> [Tue, 01 Mar 2011 20:45:11 -0800] rev 3743
imported patch weirdClangError

14 months agoTweaks for building on Lion. woooo!
Stephen Holt <sholt@adium.im> [Mon, 14 Mar 2011 21:08:17 -0700] rev 3742
Tweaks for building on Lion. woooo!

15 months agoProject file updates for Xcode 4.1
Stephen Holt <sholt@adium.im> [Tue, 01 Mar 2011 20:45:11 -0800] rev 3741
Project file updates for Xcode 4.1

14 months agosweep this 64->32 warning under the rug, since it's in some generated code.
Stephen Holt <sholt@adium.im> [Mon, 14 Mar 2011 21:01:04 -0700] rev 3740
sweep this 64->32 warning under the rug, since it's in some generated code.

14 months agoRemove some methods depricated in 10.6, but with replacements available in 10.5
Stephen Holt <sholt@adium.im> [Mon, 14 Mar 2011 00:58:21 -0700] rev 3739
Remove some methods depricated in 10.6, but with replacements available in 10.5

14 months agoFix a warning for AutoHyperlink's propety getter/setters.
Stephen Holt <sholt@adium.im> [Mon, 14 Mar 2011 00:33:11 -0700] rev 3738
Fix a warning for AutoHyperlink's propety getter/setters.

15 months agofixes for various type warnings, including unimplimented protocols.
Stephen Holt <sholt@adium.im> [Tue, 01 Mar 2011 20:45:11 -0800] rev 3737
fixes for various type warnings, including unimplimented protocols.

15 months agoUpdate to protocols and cast properly for our outline views
Stephen Holt <sholt@adium.im> [Tue, 01 Mar 2011 20:45:11 -0800] rev 3736
Update to protocols and cast properly for our outline views

15 months agoQuiet a post-10.5 SDK build warning in AITooltipUtils. Still 10.5 compatable.
Stephen Holt <sholt@adium.im> [Tue, 01 Mar 2011 20:45:11 -0800] rev 3735
Quiet a post-10.5 SDK build warning in AITooltipUtils. Still 10.5 compatable.

14 months agoXMPP-MUC: Check log files for last activity in a channel when rejoining, to request only the necessary historic messages. HistoricMUCMessages
Thijs Alkemade <thijsalkemade@gmail.com> [Mon, 14 Mar 2011 13:40:18 +0100] rev 3734
XMPP-MUC: Check log files for last activity in a channel when rejoining, to request only the necessary historic messages.

Anything that indicates the user has received messages up to then can be used (so a <status /> or <message />). It takes that tag's timestamp, and requests everything from one second after that.

This does not guarantee no double messages or shown or no messages being lost: messages are being logged with the local timestamp, and the server has its own timestamp, which can differ a lot. I think this is the best solution that doesn't require merging the histories.

14 months agoFixed 2 more mem leaks in AIListOutlineView. #15047
Adrian Godoroja <robotive@me.com> [Sun, 13 Mar 2011 01:30:08 +0200] rev 3733
Fixed 2 more mem leaks in AIListOutlineView. #15047

14 months agoFix a crash which can occur if a IKPictureTakerRecentPicture doesn't have a smallIcon. Also, some efficiency since we're only displaying up to 10 recent pictures
Evan Schoenberg [Fri, 11 Mar 2011 21:13:17 -0600] rev 3732
Fix a crash which can occur if a IKPictureTakerRecentPicture doesn't have a smallIcon. Also, some efficiency since we're only displaying up to 10 recent pictures

14 months agoAdded DragAndDrop support for Changing User Picture (Contact List) #7444
Adrian Godoroja <robotive@me.com> [Wed, 09 Mar 2011 03:01:52 +0200] rev 3731
Added DragAndDrop support for Changing User Picture (Contact List) #7444

14 months agoThe substring fail when reading a bad log.
Thijs Alkemade <thijsalkemade@gmail.com> [Fri, 11 Mar 2011 18:32:39 +0100] rev 3730
The substring fail when reading a bad log.

I know this just fixes a symptom, but it's better than raising an exception.

14 months agoThese files aren't used anymore, and I doubt these preferences are necessary.
Thijs Alkemade <thijsalkemade@gmail.com> [Fri, 11 Mar 2011 14:22:56 +0100] rev 3729
These files aren't used anymore, and I doubt these preferences are necessary.

14 months agoXMPP-MUC: Request only historic messages from since the last message we've received. HistoricMUCMessages
Thijs Alkemade <thijsalkemade@gmail.com> [Fri, 11 Mar 2011 12:41:22 +0100] rev 3728
XMPP-MUC: Request only historic messages from since the last message we've received.

For now, only works when rejoining in the same session. It doesn't check the transcripts for the last message there.

(Will not actually work until libpurple is updated to 2.7.11, so creating a branch).

Refs #14219

14 months agos/adiumx.com/adium.im /OCD
Robert Vehse [Fri, 11 Mar 2011 03:08:44 +0100] rev 3727
s/adiumx.com/adium.im /OCD

14 months agoReplace a bunch of occurrences of "adiumx.com" by "adium.im" to put a smile on Adrian's face.
Robert Vehse [Fri, 11 Mar 2011 03:01:38 +0100] rev 3726
Replace a bunch of occurrences of "adiumx.com" by "adium.im" to put a smile on Adrian's face.

I don't feel safe about the others.

14 months agoPatch from Adrian Godoroja ("robotive") to fix #15052.
Robert Vehse [Fri, 11 Mar 2011 01:22:55 +0100] rev 3725
Patch from Adrian Godoroja ("robotive") to fix #15052.

14 months agoMinor AdiumHelp fix.
Robert Vehse [Fri, 11 Mar 2011 01:18:32 +0100] rev 3724
Minor AdiumHelp fix.

14 months agoChangelogging previous change and ac80f58b979a.
Thijs Alkemade <thijsalkemade@gmail.com> [Thu, 10 Mar 2011 22:34:56 +0100] rev 3723
Changelogging previous change and ac80f58b979a.

14 months agoLog all exceptions to the debug log with a backtrace.
Thijs Alkemade <thijsalkemade@gmail.com> [Thu, 10 Mar 2011 22:15:35 +0100] rev 3722
Log all exceptions to the debug log with a backtrace.

It would be preferable to crash on all uncaught exceptions, but HIToolbox catches all exceptions from the GUI. This is better than nothing.

14 months agoFixed 2 memory leaks in AIListOutlineView
Adrian Godoroja <robotive@me.com> [Wed, 09 Mar 2011 13:37:36 +0200] rev 3721
Fixed 2 memory leaks in AIListOutlineView

14 months agoFix aiignment of the "Edit" button in StatusPreferences.nib.
Robert Vehse [Thu, 10 Mar 2011 19:26:41 +0100] rev 3720
Fix aiignment of the "Edit" button in StatusPreferences.nib.

14 months agoUpdated German localisation.
Robert Vehse [Thu, 10 Mar 2011 19:22:52 +0100] rev 3719
Updated German localisation.

14 months agoCorrect a typo in .strings files.
Robert Vehse [Thu, 10 Mar 2011 18:45:22 +0100] rev 3718
Correct a typo in .strings files.

14 months agoIgnore Xcode 4's files.
Frank Dowsett <wixardy@adium.im> [Wed, 09 Mar 2011 18:04:38 -0500] rev 3717
Ignore Xcode 4's files.

14 months agoAvoid a possible crash.
Frank Dowsett <wixardy@adium.im> [Tue, 08 Mar 2011 14:04:51 -0500] rev 3716
Avoid a possible crash.

14 months agoMissed an index->anIndex.
Frank Dowsett <wixardy@adium.im> [Tue, 08 Mar 2011 14:04:45 -0500] rev 3715
Missed an index->anIndex.

14 months agotypo fix, shadowing fix, 64->32bit fixes.
Frank Dowsett <wixardy@adium.im> [Tue, 08 Mar 2011 12:10:44 -0500] rev 3714
typo fix, shadowing fix, 64->32bit fixes.

14 months ago"User Picture Change" menu now uses an NSMenu making it prettier Fixes #11964 Refs #9908
Adrian Godoroja <robotive@me.com> [Sat, 05 Mar 2011 22:31:14 +0200] rev 3713
"User Picture Change" menu now uses an NSMenu making it prettier Fixes #11964 Refs #9908

r=wix

14 months agoChangelog #13099 and give Marc Kalmes credit. Refs #13099.
Robert Vehse [Sun, 06 Mar 2011 21:46:42 +0100] rev 3712
Changelog #13099 and give Marc Kalmes credit. Refs #13099.

14 months agoAdd caching for results of allowdCharacters-methods
Marc Kalmes <mkalmes@mkalmes.net> [Sun, 06 Mar 2011 21:14:43 +0100] rev 3711
Add caching for results of allowdCharacters-methods

14 months agoAdd support for supported characters in jabber id (fixes #13099)
Marc Kalmes <mkalmes@mkalmes.net> [Sun, 06 Mar 2011 19:49:30 +0100] rev 3710
Add support for supported characters in jabber id (fixes #13099)

- Add method allowedCharactersInNode
- Add method allowedCharactersInDomain
- Add method allowedCharactersInResource
- Change implementation of allowedCharacters to call new methods
- Change implementation of allowedCharactersForUIDs to call allowedCharacters and new methods

14 months agoChangelog #13221.
Robert Vehse [Sat, 05 Mar 2011 22:53:18 +0100] rev 3709
Changelog #13221.

14 months agoMentions in topic updates appear to work inconsistently, disable showing them at all.
Thijs Alkemade <thijsalkemade@gmail.com> [Fri, 04 Mar 2011 22:48:19 +0100] rev 3708
Mentions in topic updates appear to work inconsistently, disable showing them at all.

For me, only the dock icon got a numbered badge, but no event (growl or sound) triggered and the tab counter didn't update. This makes it look like that counter is stuck.

14 months agoThere is no need for this wrapper.
Frank Dowsett <wixardy@adium.im> [Fri, 04 Mar 2011 13:10:58 -0500] rev 3707
There is no need for this wrapper.

15 months agoMaintain compatability with current build targets
Stephen Holt <sholt@adium.im> [Mon, 28 Feb 2011 17:49:25 -0800] rev 3706
Maintain compatability with current build targets

15 months agoFix deprecated methods in AIImageViewWithImagePicker.
Stephen Holt <sholt@adium.im> [Mon, 28 Feb 2011 13:27:35 -0800] rev 3705
Fix deprecated methods in AIImageViewWithImagePicker.

15 months agoConform to AIOutlineViewDelegate where necessary.
Stephen Holt <sholt@adium.im> [Mon, 28 Feb 2011 13:53:50 -0800] rev 3704
Conform to AIOutlineViewDelegate where necessary.

15 months agoFormally conform to NSWindowDelegate
Stephen Holt <sholt@adium.im> [Mon, 28 Feb 2011 13:43:07 -0800] rev 3703
Formally conform to NSWindowDelegate

15 months agoConform to TableViewDelegate protocols where necessary.
Stephen Holt <sholt@adium.im> [Mon, 28 Feb 2011 13:48:36 -0800] rev 3702
Conform to TableViewDelegate protocols where necessary.

15 months agoFix some mistakes on AdiumXtras help page.
Robert Vehse [Tue, 01 Mar 2011 01:47:29 +0100] rev 3701
Fix some mistakes on AdiumXtras help page.

15 months agoCertain versions of OS X like to have this style set.
Stephen Holt <sholt@adium.im> [Mon, 28 Feb 2011 09:25:12 -0800] rev 3700
Certain versions of OS X like to have this style set.

15 months agoAdd some new filetype icons from George Lambrou. Since the Xtras Manager uses these icons, and they don't look as good in there as they do in Finder, I think it would be better to have a different set for it. Refs #9392.
Frank Dowsett <wixardy@adium.im> [Sun, 27 Feb 2011 21:11:35 -0500] rev 3699
Add some new filetype icons from George Lambrou. Since the Xtras Manager uses these icons, and they don't look as good in there as they do in Finder, I think it would be better to have a different set for it. Refs #9392.

15 months agoMake sure this is only run on the main thread.
Frank Dowsett <wixardy@adium.im> [Fri, 25 Feb 2011 18:39:05 -0500] rev 3698
Make sure this is only run on the main thread.

15 months agoAnother icon from George
Evan Schoenberg [Sat, 26 Feb 2011 18:59:25 -0600] rev 3697
Another icon from George

15 months agoForcing some consistency
Evan Schoenberg [Sat, 26 Feb 2011 18:59:13 -0600] rev 3696
Forcing some consistency

15 months agoAnother change from Bogdan
Evan Schoenberg [Sat, 26 Feb 2011 18:58:57 -0600] rev 3695
Another change from Bogdan

15 months agoNew icons from George Lambrou. Awesome!
Evan Schoenberg [Sat, 26 Feb 2011 18:58:36 -0600] rev 3694
New icons from George Lambrou. Awesome!

15 months agoNew icons from Bogdan. Awesome!
Evan Schoenberg [Sat, 26 Feb 2011 18:56:52 -0600] rev 3693
New icons from Bogdan. Awesome!

15 months ago`basename` seems to not be happy with spaces.
Thijs Alkemade <thijsalkemade@gmail.com> [Sun, 27 Feb 2011 15:07:25 +0100] rev 3692
`basename` seems to not be happy with spaces.
(transplanted from 45f9510fb001c9d8e4d47fbf9744066a63c24ae3)

15 months agoAdd some documentation about Xtras from the Wiki to Adium Help.
Robert Vehse [Sun, 27 Feb 2011 14:36:09 +0100] rev 3691
Add some documentation about Xtras from the Wiki to Adium Help.