adium-1.4 3080:04d6ee8c45ac: Decrease fragility by clearing any ...

commits at adium.im commits at adium.im
Fri Oct 15 03:30:29 UTC 2010 

details:	http://hg.adium.im/adium-1.4/rev/04d6ee8c45ac
revision:	3080:04d6ee8c45ac
author:		Evan Schoenberg
date:		Thu Oct 14 22:29:08 2010 -0500

Decrease fragility by clearing any webkit style path that contains .app.  If for some odd reason the user is using an external style with .app in the name, they will simply occur a nearly-trivial performance hit when opening their first message window.
Subject: adium-1.4 3081:a135a1bae0e4: Correct a debug log

details:	http://hg.adium.im/adium-1.4/rev/a135a1bae0e4
revision:	3081:a135a1bae0e4
author:		Evan Schoenberg
date:		Thu Oct 14 22:29:50 2010 -0500

Correct a debug log
Subject: adium-1.4 3082:2a1d1d47ab95: merge

details:	http://hg.adium.im/adium-1.4/rev/2a1d1d47ab95
revision:	3082:2a1d1d47ab95
author:		Evan Schoenberg
date:		Thu Oct 14 22:30:24 2010 -0500

merge

diffs (288 lines):

diff -r 7eced108f702 -r 2a1d1d47ab95 Plugins/Purple Service/SLPurpleCocoaAdapter.m
--- a/Plugins/Purple Service/SLPurpleCocoaAdapter.m	Mon Oct 11 12:49:07 2010 -0500
+++ b/Plugins/Purple Service/SLPurpleCocoaAdapter.m	Thu Oct 14 22:30:24 2010 -0500
@@ -1039,7 +1039,7 @@
 				
 				if ((buddy = purple_find_buddy_in_group(account, [objectUID UTF8String], oldGroup))) {
 					// Perform the add to the new group. This will turn into a move, and will update serverside.
-					AILog(@"Buddy %p (%@) moving serverside to %@", buddy, objectUID, sourceGroupName);
+					AILog(@"Buddy %p (%@) moving serverside to %@", buddy, objectUID, groupName);
 					purple_blist_add_buddy(buddy, NULL, group, NULL);
 					// Continue so we avoid the "add to group" code below.
 					continue;
diff -r 7eced108f702 -r 2a1d1d47ab95 Plugins/WebKit Message View/AIWebKitMessageViewPlugin.m
--- a/Plugins/WebKit Message View/AIWebKitMessageViewPlugin.m	Mon Oct 11 12:49:07 2010 -0500
+++ b/Plugins/WebKit Message View/AIWebKitMessageViewPlugin.m	Thu Oct 14 22:30:24 2010 -0500
@@ -30,7 +30,7 @@
 
 @interface AIWebKitMessageViewPlugin ()
 - (void) resetStylesForType:(AIWebkitStyleType)styleType;
-- (void)performAdium14UpgradeIfNeeded;
+- (void)clearHardcodedBuiltInStylePaths;
 @end
 
 @implementation AIWebKitMessageViewPlugin
@@ -42,7 +42,7 @@
 {
 	styleDictionary = nil;
 	[adium createResourcePathForName:MESSAGE_STYLES_SUBFOLDER_OF_APP_SUPPORT];
-	[self performAdium14UpgradeIfNeeded];
+	[self clearHardcodedBuiltInStylePaths];
 	
 	//Setup our preferences
 	[adium.preferenceController registerDefaults:[NSDictionary dictionaryNamed:WEBKIT_DEFAULT_PREFS forClass:[self class]]
@@ -279,18 +279,17 @@
 
 #pragma mark -
 /*!
- * @brief Clears the cached style bundle path when Adium 1.4 loads for the first time, so it'll be recreated app-bundle-relative
+ * @brief Clears cached style bundle pathes if they are built-in but not bundle-relative; Adium 1.4b18 and prior made these.
  */
-- (void)performAdium14UpgradeIfNeeded
+- (void)clearHardcodedBuiltInStylePaths
 {
-#define KEY_CLEARED_CACHED_BUNDLE_PATH @"Adium 1.4:Cleared cached bundle path"
-	if (![[NSUserDefaults standardUserDefaults] boolForKey:KEY_CLEARED_CACHED_BUNDLE_PATH]) {
+	if ([[adium.preferenceController preferenceForKey:KEY_CURRENT_WEBKIT_STYLE_PATH
+												group:PREF_GROUP_WEBKIT_REGULAR_MESSAGE_DISPLAY] rangeOfString:@".app"].location != NSNotFound)
 		[self resetStylesForType:AIWebkitRegularChat];
+
+	if ([[adium.preferenceController preferenceForKey:KEY_CURRENT_WEBKIT_STYLE_PATH
+												group:PREF_GROUP_WEBKIT_GROUP_MESSAGE_DISPLAY] rangeOfString:@".app"].location != NSNotFound)
 		[self resetStylesForType:AIWebkitGroupChat];
-
-		[[NSUserDefaults standardUserDefaults] setBool:YES
-												forKey:KEY_CLEARED_CACHED_BUNDLE_PATH];
-	}
 }
 
 @end
diff -r 7eced108f702 -r 2a1d1d47ab95 Resources/Credits.rtf
--- a/Resources/Credits.rtf	Mon Oct 11 12:49:07 2010 -0500
+++ b/Resources/Credits.rtf	Thu Oct 14 22:30:24 2010 -0500
@@ -1,9 +1,9 @@
 {\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
 {\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;\red0\green0\blue0;}
+{\colortbl;\red255\green255\blue255;}
 \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40\ql\qnatural
 
-\f0\fs20 \cf2 \
+\f0\fs20 \cf0 \
 \
 \
 \
@@ -22,32 +22,32 @@
 \
 \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40\qc
 
-\b\fs28 \cf2 The Adium Team
+\b\fs28 \cf0 The Adium Team
 \fs24 \
 \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40\ql\qnatural
 
-\b0 \cf2 \
+\b0 \cf0 \
 \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40\ql\qnatural
 
-\b \cf2 Lead Developers
+\b \cf0 Lead Developers
 \b0 \
 	Evan Schoenberg, M.D.\
 	Zachary West\
 \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40\ql\qnatural
 
-\fs20 \cf2 \
+\fs20 \cf0 \
 \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40\ql\qnatural
 
-\b\fs24 \cf2 Project Manager\
+\b\fs24 \cf0 Project Manager\
 \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40\ql\qnatural
 
-\b0 \cf2 	Eric Richie\
+\b0 \cf0 	Eric Richie\
 \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40\ql\qnatural
 
-\fs20 \cf2 \
+\fs20 \cf0 \
 \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40\ql\qnatural
 
-\b\fs24 \cf2 Developers
+\b\fs24 \cf0 Developers
 \b0 \
 	Colin Barrett\
 	Frank Dowsett\
@@ -63,7 +63,9 @@
 \b Contributors\
 \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40\ql\qnatural
 
-\b0 \cf2 	Thijs Alkemade\
+\b0 \cf0 	Thijs Alkemade\
+	Paul Aurich\
+	John Bailey\
 	Adam Betts  
 \fs20 (Adiumy iconset)
 \fs24 \
@@ -80,7 +82,7 @@
 \
 \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40\ql\qnatural
 
-\b \cf2 Google Summer of Code \'97 2007
+\b \cf0 Google Summer of Code \'97 2007
 \b0 \
 	Erik Beerepoot, mentored by David Smith\
 	Andre Cohen, mentored by Brian E. Ganninger\
@@ -101,14 +103,14 @@
 \b Webmaster\
 \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40\ql\qnatural
 
-\b0 \cf2 	Zachary West\
+\b0 \cf0 	Zachary West\
 \
 \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40\ql\qnatural
 
-\b \cf2 Translators\
+\b \cf0 Translators\
 \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40\ql\qnatural
 
-\b0 \cf2 	T\'f3mas Alexander \'c1rnason  
+\b0 \cf0 	T\'f3mas Alexander \'c1rnason  
 \fs20 (Icelandic)
 \fs24 \
 	Armas  
@@ -214,7 +216,7 @@
 \fs24 \
 \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40\ql\qnatural
 
-\b \cf2 Retired Lead Developer
+\b \cf0 Retired Lead Developer
 \b0 \
 	Adam Iser\
 \
@@ -222,45 +224,45 @@
 \b Retired Project Manager\
 \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40\ql\qnatural
 
-\b0 \cf2 	Chris Forsythe\
+\b0 \cf0 	Chris Forsythe\
 \
 \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardeftab720\li100\slleading40\sb40\ql\qnatural
 
-\b \cf2 Retired Developers
+\b \cf0 Retired Developers
 \b0 \
 	Adam Atlas\
 \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40\ql\qnatural
-\cf2 	Graham Booker\
+\cf0 	Graham Booker\
 \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardeftab720\li100\slleading40\sb40\ql\qnatural
-\cf2 	Jorge Salvador Caffarena\
+\cf0 	Jorge Salvador Caffarena\
 	David Clark\
 	Brandon Delcamp\
 	Nelson Elhage\
 \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40\ql\qnatural
-\cf2 	Augie Fackler\
+\cf0 	Augie Fackler\
 \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardeftab720\li100\slleading40\sb40\ql\qnatural
-\cf2 	Brian Ganninger\
+\cf0 	Brian Ganninger\
 \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40\ql\qnatural
-\cf2 	Elliott Harris\
+\cf0 	Elliott Harris\
 \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardeftab720\li100\slleading40\sb40\ql\qnatural
-\cf2 	Arno Hautala\
+\cf0 	Arno Hautala\
 	Ian Krieg\
 	Scott Lamb\
 	Keith Lea\
 	Sam McCandlish\
 \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40\ql\qnatural
-\cf2 	Jeffrey Melloy  
+\cf0 	Jeffrey Melloy  
 \fs20 (SQL Logger)
 \fs24 \
 \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardeftab720\li100\slleading40\sb40\ql\qnatural
-\cf2 	Chris Serino\
+\cf0 	Chris Serino\
 \
 \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40\ql\qnatural
 
-\b \cf2 Retired Contributors\
+\b \cf0 Retired Contributors\
 \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40\ql\qnatural
 
-\b0 \cf2 	Sumeet "retsam" Agarwal\
+\b0 \cf0 	Sumeet "retsam" Agarwal\
 	Derrick "shadow" Brashear\
 	Lars "lechimp" N\'e6sbye Christensen\
 	Benjamin Costello 
@@ -313,10 +315,10 @@
 \
 \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40\ql\qnatural
 
-\b \cf2 Retired Translators\
+\b \cf0 Retired Translators\
 \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40\ql\qnatural
 
-\b0 \cf2 	Max Bertrand
+\b0 \cf0 	Max Bertrand
 \fs20   (French)
 \b\fs24 \
 
@@ -365,15 +367,15 @@
 \
 \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40\qc
 
-\b\fs28 \cf2 Special Thanks To
+\b\fs28 \cf0 Special Thanks To
 \b0\fs24 \
 \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40\ql\qnatural
 
-\b \cf2 \
+\b \cf0 \
 Other\
 \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40\ql\qnatural
 
-\b0 \cf2 	The Pidgin Team
+\b0 \cf0 	The Pidgin Team
 \fs20  \'a0(libpurple) \
 	
 \fs24 NetworkRedux.com 
@@ -387,10 +389,10 @@
 \
 \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40\ql\qnatural
 
-\b\fs24 \cf2 Original Adium and Previous Contributors\
+\b\fs24 \cf0 Original Adium and Previous Contributors\
 \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40\ql\qnatural
 
-\b0 \cf2 	Erik J. Barzeski
+\b0 \cf0 	Erik J. Barzeski
 \fs20  \'a0(Code Contributions) 
 \fs24 \
 	Jeremy Knickerbocker
@@ -416,11 +418,11 @@
 \fs24 \
 \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40\ql\qnatural
 
-\fs20 \cf2 \
+\fs20 \cf0 \
 Adium is distributed under the GNU General Public License. It is considered free software, and you are allowed to distribute it under certain conditions. See the GNU General Public License for more details.\
 \
 \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\ql\qnatural
-\cf2 \CocoaLigature0 Many of Adium's protocols are powered by Libpurple, a multi-protocol instant messaging library:\
+\cf0 \CocoaLigature0 Many of Adium's protocols are powered by Libpurple, a multi-protocol instant messaging library:\
      <http://developer.pidgin.im/>.\
 \
 Translation of Adium was aided by iLocalize by Arizona Software:\
@@ -466,7 +468,7 @@
 \CocoaLigature1  \CocoaLigature0 \'95\CocoaLigature1  \CocoaLigature0  Sparkle, an update framework\
      <http://sparkle.andymatuschak.org/>\CocoaLigature1 \
 \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40\ql\qnatural
-\cf2 \
+\cf0 \
 \
 \
 \

More information about the commits mailing list