adium 3306:10e4103acf79: In a previous commit message styles sta...

commits at adium.im commits at adium.im
Fri Sep 17 21:17:39 UTC 2010


details:	http://hg.adium.im/adium/rev/10e4103acf79
revision:	3306:10e4103acf79
author:		mathuaerknedam
date:		Thu Sep 16 16:15:56 2010 -0500

In a previous commit message styles started using a CFBundleIdentifier of im.adium.* rather than com.adiumx.*, but I forgot to change the three places in the code where this was referenced. Fixed.
Subject: adium 3307:8da59f3355f0: Adium has been trying to fall back from minimal to minimal_2.0, but minimal 2.0 was repalced with minimal_mod long ago. Now minimal and minimal_2.0 will fallback to minimal_mod.

details:	http://hg.adium.im/adium/rev/8da59f3355f0
revision:	3307:8da59f3355f0
author:		mathuaerknedam
date:		Thu Sep 16 16:31:05 2010 -0500

Adium has been trying to fall back from minimal to minimal_2.0, but minimal 2.0 was repalced with minimal_mod long ago. Now minimal and minimal_2.0 will fallback to minimal_mod.
Subject: adium 3308:a27907b5a9f2: Renkoo Naked (which was removed) should fallback to Renkoo.

details:	http://hg.adium.im/adium/rev/a27907b5a9f2
revision:	3308:a27907b5a9f2
author:		mathuaerknedam
date:		Thu Sep 16 16:34:06 2010 -0500

Renkoo Naked (which was removed) should fallback to Renkoo.
Subject: adium 3309:5297a5921cad: merge

details:	http://hg.adium.im/adium/rev/5297a5921cad
revision:	3309:5297a5921cad
author:		mathuaerknedam
date:		Fri Sep 17 16:17:33 2010 -0500

merge

diffs (91 lines):

diff -r 8e259662ede0 -r 5297a5921cad ChangeLogs/Changes.txt
--- a/ChangeLogs/Changes.txt	Thu Sep 16 11:46:14 2010 -0500
+++ b/ChangeLogs/Changes.txt	Fri Sep 17 16:17:33 2010 -0500
@@ -1,17 +1,34 @@
 				Adium Version History
 				-----------------------
 Version 1.5 (X/X/XXX)
- * 64bit support
+ Major changes
+  * Added 64bit support.
+  * Updated to libpurple 2.7.4mtn.
 
- * Fixed a crash related to Cyrillic nicknames in IRC. (#13351)
- * Added a "Do Nothing" event. (#3590).
- * Clicking on a link whilst holding the Cmd key opens the link in the background. (#12129)
- * Improved the logic for the display of tooltips. (#12774)
- * Added a "Reopen Closed Tab" menu item to the File menu that will restore the most recently closed tab. (#12537)
- * Added Regex support for mentions. (#12832)
- * Added version numbers for Xtras to Xtras Manager. (#11285)
- * Fixed link insertion for NetNewsWire. (#11389)
- * Added Google Chrome support for link insertion.
+ Contact List
+  * Improved the logic for the display of tooltips. (#12774)
+
+ Events and Notifications
+  * Added a "Do Nothing" event. (#3590).
+  * Added Regex support for mentions. (#12832)
+
+ Messaging
+  * Added a "Reopen Closed Tab" menu item to the File menu that will restore the most recently closed tab. (#12537)
+  * Clicking on a link whilst holding the Cmd key opens the link in the background. (#12129)
+  * Fixed link insertion for NetNewsWire. (#11389)
+  * Added Google Chrome support for link insertion.
+
+ AIM
+  * Added a preference for AIM: allow multiple sign in locations defaulting to true. (#5790)
+
+ IRC
+  * Fixed a crash related to Cyrillic nicknames in IRC. (#13351)
+
+ Xtras
+  * Added version numbers for Xtras to Xtras Manager. (#11285)
+
+ * Add the "On Accounts" table to the nextKeyView in the 'Add Contact' window. (#14269)
+
  * Added a menu item to view release notes in the help menu. (#8569)
  * Miscellaneous improvements to Copyright.txt file.
  
diff -r 8e259662ede0 -r 5297a5921cad Plugins/WebKit Message View/AIWebKitMessageViewPlugin.h
--- a/Plugins/WebKit Message View/AIWebKitMessageViewPlugin.h	Thu Sep 16 11:46:14 2010 -0500
+++ b/Plugins/WebKit Message View/AIWebKitMessageViewPlugin.h	Fri Sep 17 16:17:33 2010 -0500
@@ -44,7 +44,7 @@
 /*!
  *	@brief The bundle identifier of the style we revert to if the preferred style isn't available
  */
-#define WEBKIT_DEFAULT_STYLE					@"com.adiumx.stockholm.style"
+#define WEBKIT_DEFAULT_STYLE					@"im.adium.Stockholm.style"
 
 /*!
  *	@brief The path to the currently selected message style
diff -r 8e259662ede0 -r 5297a5921cad Plugins/WebKit Message View/AIWebKitMessageViewPlugin.m
--- a/Plugins/WebKit Message View/AIWebKitMessageViewPlugin.m	Thu Sep 16 11:46:14 2010 -0500
+++ b/Plugins/WebKit Message View/AIWebKitMessageViewPlugin.m	Fri Sep 17 16:17:33 2010 -0500
@@ -139,9 +139,13 @@
 	if ([identifier isEqualToString:@"com.adiumx.eclipse.style"]) {
 		defaultMessageStyleBundle = [styles objectForKey:@"com.adiumx.gonedark.style"];
 	} else if ([identifier isEqualToString:@"com.adiumx.plastic.style"]) {
-		defaultMessageStyleBundle = [styles objectForKey:@"com.adiumx.stockholm.style"];
+		defaultMessageStyleBundle = [styles objectForKey:@"im.adium.Stockholm.style"];
+	} else if ([identifier isEqualToString:@"com.adiumx.renkooNaked.style"]) {
+		defaultMessageStyleBundle = [styles objectForKey:@"im.adium.Renkoo.style"];
 	} else if ([identifier isEqualToString:@"com.adiumx.minimal.style"]) {
-		defaultMessageStyleBundle = [styles objectForKey:@"com.adiumx.minimal_2.0.style"];
+		defaultMessageStyleBundle = [styles objectForKey:@"im.adium.minimal_mod.style"];
+	} else if ([identifier isEqualToString:@"com.adiumx.minimal_2.0.style"]) {
+		defaultMessageStyleBundle = [styles objectForKey:@"im.adium.minimal_mod.style"];
 	} 
 
 	if (!defaultMessageStyleBundle) {
diff -r 8e259662ede0 -r 5297a5921cad Plugins/WebKit Message View/WebKit Defaults.plist
--- a/Plugins/WebKit Message View/WebKit Defaults.plist	Thu Sep 16 11:46:14 2010 -0500
+++ b/Plugins/WebKit Message View/WebKit Defaults.plist	Fri Sep 17 16:17:33 2010 -0500
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>Message Style</key>
-	<string>com.adiumx.stockholm.style</string>
+	<string>im.adium.Stockholm.style</string>
 	<key>Show User Icons</key>
 	<true/>
 	<key>DefaultFontFamily</key>




More information about the commits mailing list