adium 4624:cb7f33913572: Remove the hard-coded server name for L...

commits at adium.im commits at adium.im
Mon Jan 30 19:21:25 UTC 2012 

details:	http://hg.adium.im/adium/rev/cb7f33913572
revision:	4624:cb7f33913572
branch:		(none)
author:		Thijs Alkemade <thijsalkemade at gmail.com>
date:		Mon Jan 30 20:18:42 2012 +0100

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

Fixes #15777
Subject: adium 4625:4169ad7741ff: Merged

details:	http://hg.adium.im/adium/rev/4169ad7741ff
revision:	4625:4169ad7741ff
branch:		(none)
author:		Thijs Alkemade <thijsalkemade at gmail.com>
date:		Mon Jan 30 20:21:11 2012 +0100

Merged

diffs (143 lines):

diff -r f9c6c7e85abb -r 4169ad7741ff ChangeLogs/Changes Between Betas.txt
--- a/ChangeLogs/Changes Between Betas.txt	Sun Jan 29 23:38:19 2012 +0100
+++ b/ChangeLogs/Changes Between Betas.txt	Mon Jan 30 20:21:11 2012 +0100
@@ -1,12 +1,14 @@
-Adium 1.5xx
- * Fixed hang which could occur when receiving a message and opening the Transcript Viewer at the same time.
- * Fixed localisation of a couple of emoticons.
- * Renamed "Current Track" status to "iTunes Status" (known as "iTunes" prior to 1.5).
- * Updated localisations: German (#15586, #15733), Greek, Swedish (#15786).
- * Fixed initializers and did minor clean-up in: AISplitView, AIListOutlineView, AIAccountPlusFieldPromptController,
-   DCJoinChatWindowController, CSNewContactAlertWindowController, SHLinkEditorWindowController, AIListLayoutWindowController,
-   AIListThemeWindowController, AITextColorPreviewView, ErrorMessageWindowController, AWEzvContactManagerRendezvous, AIContactListImagePicker.
- * Fixed a leak when resizing animated Gif files.
+Adium 1.5rc2
+ General
+  * Fixed hang which could occur when receiving a message and opening the Transcript Viewer at the same time.
+  * Renamed "Current Track" status to "iTunes Status" (known as "iTunes" prior to 1.5).
+  * Fixed numerous memory leaks.
+  * Fixed numerous Clang Analyzer warnings.
+
+ Localisation
+  * Updated localisations: German (##15586, #15733), Greek, Swedish (#15786).
+  * Fixed localisation of a couple of emoticon names.
+
 
 Adium 1.5rc1
  Localisation
diff -r f9c6c7e85abb -r 4169ad7741ff ChangeLogs/Changes.txt
--- a/ChangeLogs/Changes.txt	Sun Jan 29 23:38:19 2012 +0100
+++ b/ChangeLogs/Changes.txt	Mon Jan 30 20:21:11 2012 +0100
@@ -2,7 +2,7 @@
 				-----------------------
 Version 1.5 (10/11/2011)
  Major changes
-  * Requires Mac OS X 10.6.0 or later
+  * Requires Mac OS X 10.6.8 or later
   * Requires an Intel Mac
   * Added 64bit support.
   * Updated to libpurple 2.10.0
@@ -122,6 +122,7 @@
   * New "About Adium" dialog. (Thanks to Mike Houben & Paul Wilde for graphics)
   * Aqualicious Graphite, new contact list theme to match OS X Graphite style.
   * Updated Growl.framework to 1.3.1.
+  * Fixed nummerous leaks.
   * The Downloads stack in the Dock will now bounce when Adium finishes receiving a file.
   * Quarantine received files after downloading, so the Finder will show a warning before opening received applications (similar to Safari).
   * Removed "Page Setup..." from the "File" menu. (#15367)
diff -r f9c6c7e85abb -r 4169ad7741ff Frameworks/Adium Framework/Resources/ca.lproj/EmoticonNames.strings
Binary file Frameworks/Adium Framework/Resources/ca.lproj/EmoticonNames.strings has changed
diff -r f9c6c7e85abb -r 4169ad7741ff Frameworks/Adium Framework/Resources/cs.lproj/EmoticonNames.strings
Binary file Frameworks/Adium Framework/Resources/cs.lproj/EmoticonNames.strings has changed
diff -r f9c6c7e85abb -r 4169ad7741ff Frameworks/Adium Framework/Resources/da.lproj/EmoticonNames.strings
Binary file Frameworks/Adium Framework/Resources/da.lproj/EmoticonNames.strings has changed
diff -r f9c6c7e85abb -r 4169ad7741ff Frameworks/Adium Framework/Resources/de.lproj/EmoticonNames.strings
Binary file Frameworks/Adium Framework/Resources/de.lproj/EmoticonNames.strings has changed
diff -r f9c6c7e85abb -r 4169ad7741ff Frameworks/Adium Framework/Resources/el_GR.lproj/EmoticonNames.strings
Binary file Frameworks/Adium Framework/Resources/el_GR.lproj/EmoticonNames.strings has changed
diff -r f9c6c7e85abb -r 4169ad7741ff Frameworks/Adium Framework/Resources/en.lproj/EmoticonNames.strings
Binary file Frameworks/Adium Framework/Resources/en.lproj/EmoticonNames.strings has changed
diff -r f9c6c7e85abb -r 4169ad7741ff Frameworks/Adium Framework/Resources/en_AU.lproj/EmoticonNames.strings
--- a/Frameworks/Adium Framework/Resources/en_AU.lproj/EmoticonNames.strings	Sun Jan 29 23:38:19 2012 +0100
+++ b/Frameworks/Adium Framework/Resources/en_AU.lproj/EmoticonNames.strings	Mon Jan 30 20:21:11 2012 +0100
@@ -35,7 +35,7 @@
 "Erm" = "Erm";
 
 /* Emoticon name */
-"Foot in mouth" = "Foot in mouth";
+"Foot In Mouth" = "Foot In Mouth";
 
 /* Emoticon name */
 "Frown" = "Frown";
diff -r f9c6c7e85abb -r 4169ad7741ff Frameworks/Adium Framework/Resources/en_GB.lproj/EmoticonNames.strings
Binary file Frameworks/Adium Framework/Resources/en_GB.lproj/EmoticonNames.strings has changed
diff -r f9c6c7e85abb -r 4169ad7741ff Frameworks/Adium Framework/Resources/es.lproj/EmoticonNames.strings
Binary file Frameworks/Adium Framework/Resources/es.lproj/EmoticonNames.strings has changed
diff -r f9c6c7e85abb -r 4169ad7741ff Frameworks/Adium Framework/Resources/fi.lproj/EmoticonNames.strings
Binary file Frameworks/Adium Framework/Resources/fi.lproj/EmoticonNames.strings has changed
diff -r f9c6c7e85abb -r 4169ad7741ff Frameworks/Adium Framework/Resources/fr.lproj/EmoticonNames.strings
Binary file Frameworks/Adium Framework/Resources/fr.lproj/EmoticonNames.strings has changed
diff -r f9c6c7e85abb -r 4169ad7741ff Frameworks/Adium Framework/Resources/fr_CA.lproj/EmoticonNames.strings
Binary file Frameworks/Adium Framework/Resources/fr_CA.lproj/EmoticonNames.strings has changed
diff -r f9c6c7e85abb -r 4169ad7741ff Frameworks/Adium Framework/Resources/hu.lproj/EmoticonNames.strings
Binary file Frameworks/Adium Framework/Resources/hu.lproj/EmoticonNames.strings has changed
diff -r f9c6c7e85abb -r 4169ad7741ff Frameworks/Adium Framework/Resources/is.lproj/EmoticonNames.strings
Binary file Frameworks/Adium Framework/Resources/is.lproj/EmoticonNames.strings has changed
diff -r f9c6c7e85abb -r 4169ad7741ff Frameworks/Adium Framework/Resources/it.lproj/EmoticonNames.strings
Binary file Frameworks/Adium Framework/Resources/it.lproj/EmoticonNames.strings has changed
diff -r f9c6c7e85abb -r 4169ad7741ff Frameworks/Adium Framework/Resources/ja.lproj/EmoticonNames.strings
Binary file Frameworks/Adium Framework/Resources/ja.lproj/EmoticonNames.strings has changed
diff -r f9c6c7e85abb -r 4169ad7741ff Frameworks/Adium Framework/Resources/nb.lproj/EmoticonNames.strings
Binary file Frameworks/Adium Framework/Resources/nb.lproj/EmoticonNames.strings has changed
diff -r f9c6c7e85abb -r 4169ad7741ff Frameworks/Adium Framework/Resources/nl.lproj/EmoticonNames.strings
Binary file Frameworks/Adium Framework/Resources/nl.lproj/EmoticonNames.strings has changed
diff -r f9c6c7e85abb -r 4169ad7741ff Frameworks/Adium Framework/Resources/pl.lproj/EmoticonNames.strings
Binary file Frameworks/Adium Framework/Resources/pl.lproj/EmoticonNames.strings has changed
diff -r f9c6c7e85abb -r 4169ad7741ff Frameworks/Adium Framework/Resources/pt.lproj/EmoticonNames.strings
Binary file Frameworks/Adium Framework/Resources/pt.lproj/EmoticonNames.strings has changed
diff -r f9c6c7e85abb -r 4169ad7741ff Frameworks/Adium Framework/Resources/pt_PT.lproj/EmoticonNames.strings
Binary file Frameworks/Adium Framework/Resources/pt_PT.lproj/EmoticonNames.strings has changed
diff -r f9c6c7e85abb -r 4169ad7741ff Frameworks/Adium Framework/Resources/ru.lproj/EmoticonNames.strings
Binary file Frameworks/Adium Framework/Resources/ru.lproj/EmoticonNames.strings has changed
diff -r f9c6c7e85abb -r 4169ad7741ff Frameworks/Adium Framework/Resources/sk_SK.lproj/EmoticonNames.strings
Binary file Frameworks/Adium Framework/Resources/sk_SK.lproj/EmoticonNames.strings has changed
diff -r f9c6c7e85abb -r 4169ad7741ff Frameworks/Adium Framework/Resources/sl.lproj/EmoticonNames.strings
Binary file Frameworks/Adium Framework/Resources/sl.lproj/EmoticonNames.strings has changed
diff -r f9c6c7e85abb -r 4169ad7741ff Frameworks/Adium Framework/Resources/sv.lproj/EmoticonNames.strings
Binary file Frameworks/Adium Framework/Resources/sv.lproj/EmoticonNames.strings has changed
diff -r f9c6c7e85abb -r 4169ad7741ff Frameworks/Adium Framework/Resources/tr.lproj/EmoticonNames.strings
Binary file Frameworks/Adium Framework/Resources/tr.lproj/EmoticonNames.strings has changed
diff -r f9c6c7e85abb -r 4169ad7741ff Frameworks/Adium Framework/Resources/uk_UA.lproj/EmoticonNames.strings
Binary file Frameworks/Adium Framework/Resources/uk_UA.lproj/EmoticonNames.strings has changed
diff -r f9c6c7e85abb -r 4169ad7741ff Frameworks/Adium Framework/Resources/zh_CN.lproj/EmoticonNames.strings
Binary file Frameworks/Adium Framework/Resources/zh_CN.lproj/EmoticonNames.strings has changed
diff -r f9c6c7e85abb -r 4169ad7741ff Frameworks/Adium Framework/Resources/zh_TW.lproj/EmoticonNames.strings
Binary file Frameworks/Adium Framework/Resources/zh_TW.lproj/EmoticonNames.strings has changed
diff -r f9c6c7e85abb -r 4169ad7741ff Frameworks/Adium Framework/Source/AIEmoticonPack.m
--- a/Frameworks/Adium Framework/Source/AIEmoticonPack.m	Sun Jan 29 23:38:19 2012 +0100
+++ b/Frameworks/Adium Framework/Source/AIEmoticonPack.m	Mon Jan 30 20:21:11 2012 +0100
@@ -580,7 +580,7 @@
 AILocalizedStringFromTable(@"Erm", "EmoticonNames", "Emoticon name")
 AILocalizedStringFromTable(@"Cool", "EmoticonNames", "Emoticon name")
 AILocalizedStringFromTable(@"Wink", "EmoticonNames", "Emoticon name")
-AILocalizedStringFromTable(@"Foot in mouth", "EmoticonNames", "Emoticon name")
+AILocalizedStringFromTable(@"Foot In Mouth", "EmoticonNames", "Emoticon name")
 AILocalizedStringFromTable(@"Frown", "EmoticonNames", "Emoticon name")
 AILocalizedStringFromTable(@"Confused", "EmoticonNames", "Emoticon name")
 AILocalizedStringFromTable(@"Halo", "EmoticonNames", "Emoticon name")
diff -r f9c6c7e85abb -r 4169ad7741ff Plugins/Purple Service/PurpleDefaultsLiveJournal.plist
--- a/Plugins/Purple Service/PurpleDefaultsLiveJournal.plist	Sun Jan 29 23:38:19 2012 +0100
+++ b/Plugins/Purple Service/PurpleDefaultsLiveJournal.plist	Mon Jan 30 20:21:11 2012 +0100
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>Connect Port</key>
 	<integer>5222</integer>
-	<key>Jabber:Connect Server</key>
-	<string>www.livejournal.com</string>
 	<key>Jabber:Resource</key>
 	<string>Adium</string>
 	<key>Jabber:Use TLS</key>

More information about the commits mailing list