adium 3867:f9d144a7451a: Remove WEBKIT_DEFAULT_STYLE. We already...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/f9d144a7451a
revision:	3867:f9d144a7451a
branch:		(none)
author:		mathuaerknedam
date:		Fri Apr 15 09:23:30 2011 -0500

Remove WEBKIT_DEFAULT_STYLE. We already define the default message style in 'webkit defaults.plist' and use KEY_WEBKIT_STYLE. We don't need to maintain the default style in two different places.

diffs (27 lines):

diff -r 842521f83bc7 -r f9d144a7451a Plugins/WebKit Message View/AIWebKitMessageViewPlugin.h
--- a/Plugins/WebKit Message View/AIWebKitMessageViewPlugin.h	Thu Apr 14 15:09:13 2011 -0400
+++ b/Plugins/WebKit Message View/AIWebKitMessageViewPlugin.h	Fri Apr 15 09:23:30 2011 -0500
@@ -42,11 +42,6 @@
 #define WEBKIT_DEFAULT_PREFS					@"WebKit Defaults"
 
 /*!
- *	@brief The bundle identifier of the style we revert to if the preferred style isn't available
- */
-#define WEBKIT_DEFAULT_STYLE					@"im.adium.Stockholm.style"
-
-/*!
  *	@brief The path to the currently selected message style
  */
 #define KEY_CURRENT_WEBKIT_STYLE_PATH			@"Current Style Path"
diff -r 842521f83bc7 -r f9d144a7451a Plugins/WebKit Message View/AIWebKitMessageViewPlugin.m
--- a/Plugins/WebKit Message View/AIWebKitMessageViewPlugin.m	Thu Apr 14 15:09:13 2011 -0400
+++ b/Plugins/WebKit Message View/AIWebKitMessageViewPlugin.m	Fri Apr 15 09:23:30 2011 -0500
@@ -147,7 +147,7 @@
 	NSBundle	 *defaultMessageStyleBundle = nil;
 
 	if (!defaultMessageStyleBundle) {
-		defaultMessageStyleBundle = [styles objectForKey:WEBKIT_DEFAULT_STYLE];
+		defaultMessageStyleBundle = [styles objectForKey:KEY_WEBKIT_STYLE];
 	}
 
 	if (!defaultMessageStyleBundle) {