HGKeeper

adium/adium

Merged adium-1.6 into default.

2012-08-08, Thijs Alkemade

d899ccda08c8

Parents 934acd721831 58b5c02fd64e
Children 6c064c1c2d07

Merged adium-1.6 into default.

18 files changed, 61 insertions(+), 27 deletions(-)

+9 -4

ChangeLogs/Changes.txt

+1 -0

+1 -1

Frameworks/Adium Framework/Source/AIAuthorizationRequestsWindowController.m

+1 -0

Frameworks/Adium Framework/Source/AIChat.m

+0 -0

Frameworks/libglib.framework/Versions/2.0.0/libglib

+0 -0

Frameworks/libgmodule.framework/Versions/2.0.0/libgmodule

+0 -0

Frameworks/libgobject.framework/Versions/2.0.0/libgobject

+0 -0

Frameworks/libgthread.framework/Versions/2.0.0/libgthread

+0 -0

Frameworks/libintl.framework/Versions/8/libintl

+0 -0

Frameworks/libjson-glib.framework/Versions/1.0.0/libjson-glib

+0 -0

Frameworks/libmeanwhile.framework/Versions/1/libmeanwhile

+0 -0

Frameworks/libpurple.framework/Versions/0.10.5/libpurple

+30 -5

Release/Makefile

+11 -9

Resources/Credits.rtf

+1 -1

Source/AIAccountListPreferences.m

+4 -4

Source/AIGradientView.m

+2 -2

Source/AILogViewerWindowController.m

+1 -1

Source/ESStatusPreferences.m

~~--- a/ChangeLogs/Changes.txt Wed Aug 08 16:21:21 2012 +0200~~

+++ b/ChangeLogs/Changes.txt Wed Aug 08 16:24:04 2012 +0200

@@ -1,11 +1,16 @@

Adium Version History

-----------------------

~~-Version 1.5.3 (XX/XX/XXXX)~~

+Version 1.5.3 (8/XX/2012)

+ * Fixed another problem with the transcript viewer causing search to fail when closing and reopening the window. (#13586, #15699)

+ * Fixed a problem with iTunes 10.6.3 on Mac OS X 10.6.8 causing the chat window's toolbar to break. (#16046)

+ * Fixed crash at startup that was meant to be fixed in 1.5.2. (#15787)

+ * Fixed a crash when receiving invalid XML on 10.8. (#16095)

+ * Fixed an issue that caused logging in to Facebook to fail when login approvals are enabled. (#15705)

* Icons set for group chat bookmarks will now show up on the tab bar in the chat window. (Andreas Marienborg) (#14484)

~~- * Fixed another problem with the transcript viewer causing search to fail when closing and reopening the window. (#13586)~~

~~- * Fixed an issue that caused logging in to Facebook to fail when login approvals are enabled. (#15705)~~

~~- * Fixed a problem with iTunes 10.6.3 on Mac OS X 10.6.8 causing the chat window's toolbar to break. (#16046)~~

+ * Fixed tables not being declared as such via VoiceOver. (Marco Zehe) (#16085)

* Fixed a problem with emoticons scaling disproportionately in the yMous message style when using OS X 10.8.

+ * Improved memory use slightly.

Version 1.5.2 (7/21/2012)

* Fixed an issue where the log indexer would never finish.

~~--- a/Copyright.txt Wed Aug 08 16:21:21 2012 +0200~~

+++ b/Copyright.txt Wed Aug 08 16:24:04 2012 +0200

@@ -118,6 +118,7 @@

Jay Weatherstone

Robby Weinberg

Ofri Wolfus

+Marco Zehe

Albert Zeyer

If you have contributed to Adium and are not on this list, please contact us.

~~--- a/Frameworks/Adium Framework/Source/AIAuthorizationRequestsWindowController.m Wed Aug 08 16:21:21 2012 +0200~~

+++ b/Frameworks/Adium Framework/Source/AIAuthorizationRequestsWindowController.m Wed Aug 08 16:24:04 2012 +0200

@@ -108,7 +108,7 @@

object:self.window];

[tableView accessibilitySetOverrideValue:AILocalizedString(@"Authorization Requests", nil)

~~- forAttribute:NSAccessibilityRoleDescriptionAttribute];~~

+ forAttribute:NSAccessibilityTitleAttribute];

[tableView selectRowIndexes:[NSIndexSet indexSetWithIndex:0] byExtendingSelection:NO];

[self.window setTitle:AUTHORIZATION_REQUESTS];

~~--- a/Frameworks/Adium Framework/Source/AIChat.m Wed Aug 08 16:21:21 2012 +0200~~

+++ b/Frameworks/Adium Framework/Source/AIChat.m Wed Aug 08 16:24:04 2012 +0200

@@ -120,6 +120,7 @@

[chatCreationInfo release]; chatCreationInfo = nil;

[enteredTextTimer release]; enteredTextTimer = nil;

[securityDetails release]; securityDetails = nil;

+ [lastMessageDate release]; lastMessageDate = nil;

[super dealloc];

}

Binary file Frameworks/libglib.framework/Versions/2.0.0/libglib has changed

Binary file Frameworks/libgmodule.framework/Versions/2.0.0/libgmodule has changed

Binary file Frameworks/libgobject.framework/Versions/2.0.0/libgobject has changed

Binary file Frameworks/libgthread.framework/Versions/2.0.0/libgthread has changed

Binary file Frameworks/libintl.framework/Versions/8/libintl has changed

Binary file Frameworks/libjson-glib.framework/Versions/1.0.0/libjson-glib has changed

Binary file Frameworks/libmeanwhile.framework/Versions/1/libmeanwhile has changed

Binary file Frameworks/libpurple.framework/Versions/0.10.5/libpurple has changed

~~--- a/Release/Makefile Wed Aug 08 16:21:21 2012 +0200~~

+++ b/Release/Makefile Wed Aug 08 16:24:04 2012 +0200

@@ -17,7 +17,7 @@

# - make all

###########

~~-VERSION=1.6hg~~

+VERSION=1.6

BUILD_IN_DEBUG_MODE?=FALSE

BETA?=TRUE

OFFICIAL_BUILD?=TRUE

@@ -69,9 +69,9 @@

endif

ifeq ($(BUILD_IN_DEBUG_MODE),TRUE)

~~- BUILDSTYLE=Release-Debug~~

+ BUILDSTYLE=Release-Debug

else

~~- BUILDSTYLE=Release~~

+ BUILDSTYLE=Release

endif

BUILDFLAGS+="BUILDCONFIGURATION=$(BUILDSTYLE)"

@@ -194,10 +194,35 @@

./make-diskimage.sh $(BUILD_DIR)/$(RELEASE_NAME).dmg $(ADIUM_DIR) "Adium $(VERSION)" dmg_adium.scpt $(ART_DIR)

ifeq ($(OFFICIAL_BUILD),TRUE)

~~- @echo DSA for Sparkle: `ruby sign_update.rb $(BUILD_DIR)/$(RELEASE_NAME_ESCAPED).dmg ~/adium-dsa-sign/dsa_priv.pem`~~

+ $(eval DSA := $(shell ruby sign_update.rb $(BUILD_DIR)/$(RELEASE_NAME_ESCAPED).dmg ~/adium-dsa-sign/dsa_priv.pem))

+ @echo DSA for Sparkle: $(DSA)

endif

~~- @echo Build finished. `md5 $(BUILD_DIR)/$(RELEASE_NAME_ESCAPED).dmg`~~

+ $(eval MDFIVEHASH := $(shell md5 -q $(BUILD_DIR)/$(RELEASE_NAME_ESCAPED).dmg))

+ @echo Build finished. $(MDFIVEHASH)

+ifeq ($(OFFICIAL_BUILD),TRUE)

+ifeq ($(BETA),TRUE)

+ @echo Add this to beta/index.php:

+ @echo " array("

+ @echo " \"ver\" => \"$(VERSION)\","

+ @echo " \"rev\" => \"`hg parent --template {node\|short}`\","

+ @echo " \"date\" => \"`date +"%Y-%m-%d"`\","

+ @echo " \"md5\" => \"$(MDFIVEHASH)\","

+ @echo " \"dsa\" => \"$(DSA)\""

+ @echo " ),"

+ @echo

+ @echo Add this to sparkle/appcast-beta.xml:

+ @echo " <item>"

+ @echo " <title>Adium $(VERSION)</title>"

+ @echo " <pubDate>`date +"%a, %d %b %Y %H:%M:%S %z"`</pubDate>"

+ @echo " <sparkle:releaseNotesLink>http://beta.adium.im/?notemplate</sparkle:releaseNotesLink>"

+ @echo " <sparkle:minimumSystemVersion>10.6.8</sparkle:minimumSystemVersion>"

+ @echo " <enclosure sparkle:dsaSignature=\"$(DSA)\" sparkle:version=\"$(VERSION)\" url=\"http://download.adium.im/Adium_$(VERSION).dmg\" length=\"`stat -f %z $(BUILD_DIR)/$(RELEASE_NAME_ESCAPED).dmg`\" type=\"application/octet-stream\"/>"

+ @echo " </item>"

+endif

#This is what nightly builds use. Does not update because buildbot does.

nightly: version clean compile createfolder prepare-release-bundle diskimage

~~--- a/Resources/Credits.rtf Wed Aug 08 16:21:21 2012 +0200~~

+++ b/Resources/Credits.rtf Wed Aug 08 16:24:04 2012 +0200

@@ -46,18 +46,12 @@

Colin Barrett\

Frank Dowsett\

Adrian Godoroja\

~~- Stephen Holt\~~

Peter Hosey\

~~-\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardeftab720\li100\slleading40\sb40~~

~~-\cf0 Alan Humpherys\~~

~~-\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40~~

~~-\cf0 Matthew Needham\~~

+ Matthew Needham\

\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40

\fs24 \cf0

~~-\fs22 Nicholas Peshek\~~

~~- Patrick Steinhardt\~~

~~- Robby Weinberg~~

+\fs22 Nicholas Peshek

\fs24 \

\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100

\cf0 \

@@ -76,6 +70,7 @@

Kyle Jorgensen

\fs20 (Adium 1.4 help updates)

\fs22 \

+ Shawn Khan\

George Lambrou

\fs20 (Interface Icons)

\fs22 \

@@ -360,6 +355,10 @@

Elliott Harris\

\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardeftab720\li100\slleading40\sb40

\cf0 Arno Hautala\

+\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40

+\cf0 Stephen Holt\

+\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardeftab720\li100\slleading40\sb40

+\cf0 Alan Humpherys\

Ian Krieg\

Scott Lamb\

Keith Lea\

@@ -371,7 +370,10 @@

\fs22 Andreas Monitzer\

\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardeftab720\li100\slleading40\sb40

\cf0 Chris Serino\

~~- David Smith~~

+ David Smith\

+\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40

+\cf0 Patrick Steinhardt\

+ Robby Weinberg

\fs24 \

\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardeftab720\li100

\cf0 \

~~--- a/Source/AIAccountListPreferences.m Wed Aug 08 16:21:21 2012 +0200~~

+++ b/Source/AIAccountListPreferences.m Wed Aug 08 16:24:04 2012 +0200

@@ -141,7 +141,7 @@

object:nil];

[tableView_accountList accessibilitySetOverrideValue:AILocalizedString(@"Accounts", nil)

~~- forAttribute:NSAccessibilityRoleDescriptionAttribute];~~

+ forAttribute:NSAccessibilityTitleAttribute];

// Start updating the reconnect time if an account is already reconnecting.

[self updateReconnectTime:nil];

~~--- a/Source/AIGradientView.m Wed Aug 08 16:21:21 2012 +0200~~

+++ b/Source/AIGradientView.m Wed Aug 08 16:24:04 2012 +0200

@@ -41,10 +41,10 @@

- (void)dealloc

{

~~- startingColor = nil;~~

~~- middleColor = nil;~~

~~- endingColor = nil;~~

~~- backgroundColor = nil;~~

+ [startingColor release]; startingColor = nil;

+ [middleColor release]; middleColor = nil;

+ [endingColor release]; endingColor = nil;

+ [backgroundColor release]; backgroundColor = nil;

[super dealloc];

}

~~--- a/Source/AILogViewerWindowController.m Wed Aug 08 16:21:21 2012 +0200~~

+++ b/Source/AILogViewerWindowController.m Wed Aug 08 16:24:04 2012 +0200

@@ -416,9 +416,9 @@

[textField_resultCount setStringValue:@""];

[tableView_results accessibilitySetOverrideValue:AILocalizedString(@"Transcripts", nil)

~~- forAttribute:NSAccessibilityRoleDescriptionAttribute];~~

+ forAttribute:NSAccessibilityTitleAttribute];

[outlineView_contacts accessibilitySetOverrideValue:AILocalizedString(@"Contacts", nil)

~~- forAttribute:NSAccessibilityRoleDescriptionAttribute];~~

+ forAttribute:NSAccessibilityTitleAttribute];

//Set emoticon filtering

showEmoticons = [[adium.preferenceController preferenceForKey:KEY_LOG_VIEWER_EMOTICONS

~~--- a/Source/ESStatusPreferences.m Wed Aug 08 16:21:21 2012 +0200~~

+++ b/Source/ESStatusPreferences.m Wed Aug 08 16:24:04 2012 +0200

@@ -120,7 +120,7 @@

[outlineView_stateList setUsesAlternatingRowBackgroundColors:YES];

[outlineView_stateList accessibilitySetOverrideValue:AILocalizedString(@"Statuses", nil)

~~- forAttribute:NSAccessibilityRoleDescriptionAttribute];~~

+ forAttribute:NSAccessibilityTitleAttribute];

/* Register as an observer of state array changes so we can refresh our list

* in response to changes. */