adium 3098:3eaf93c20b5a: For releases, also clean designable.nib.

commits at adium.im commits at adium.im
Wed Jan 13 00:43:07 UTC 2010


details:	http://hg.adium.im/adium/rev/3eaf93c20b5a
revision:	3098:3eaf93c20b5a
author:		Smew
date:		Tue Jan 12 13:51:27 2010 -0500

For releases, also clean designable.nib.
(transplanted from 57a2028ec698a0379d2047eb5fac11628985c183)
Subject: adium 3099:d68b2e761e79: Fixes #12926 by setting the "First Run" preference correctly

details:	http://hg.adium.im/adium/rev/d68b2e761e79
revision:	3099:d68b2e761e79
author:		Andrew Wellington <proton at adium.im>
date:		Mon Dec 14 16:00:37 2009 +1100

Fixes #12926 by setting the "First Run" preference correctly
(transplanted from b94526ba05ad70f0b38ac17f1a7aa96c92f1f134)

diffs (37 lines):

diff -r 3a95f339be21 -r d68b2e761e79 Release/Makefile
--- a/Release/Makefile	Wed Dec 30 13:32:41 2009 -0500
+++ b/Release/Makefile	Mon Dec 14 16:00:37 2009 +1100
@@ -142,7 +142,7 @@
 	@# delete unneeded nib files for non-beta builds
 	@echo Cleaning Adium.app for release
 ifeq ($(BUILD_IN_DEBUG_MODE),FALSE)
-	find $(BUILD_DIR) \( -name classes.nib -or -name info.nib \) -type f -delete
+	find $(BUILD_DIR) \( -name classes.nib -or -name info.nib -or -name designable.nib \) -type f -delete
 endif
 	
 	@# delete backup files
diff -r 3a95f339be21 -r d68b2e761e79 Source/AIURLHandlerPlugin.m
--- a/Source/AIURLHandlerPlugin.m	Wed Dec 30 13:32:41 2009 -0500
+++ b/Source/AIURLHandlerPlugin.m	Mon Dec 14 16:00:37 2009 +1100
@@ -96,13 +96,14 @@
  */
 - (void)checkHandledSchemes
 {
-	if ((![[adium.preferenceController preferenceForKey:PREF_KEY_SET_DEFAULT_FIRST_TIME
-												  group:GROUP_URL_HANDLING] boolValue]) ||
-		([[adium.preferenceController preferenceForKey:PREF_KEY_ENFORCE_DEFAULT
-												 group:GROUP_URL_HANDLING] boolValue])) {
-		// Either this is our first launch, or we're set to enforce our defaults.
-		// Set ourself as the default for everything.
-		
+	if (![[adium.preferenceController preferenceForKey:PREF_KEY_SET_DEFAULT_FIRST_TIME
+												 group:GROUP_URL_HANDLING] boolValue]) {
+		[adium.preferenceController setPreference:[NSNumber numberWithBool:YES]
+										   forKey:PREF_KEY_SET_DEFAULT_FIRST_TIME
+											group:GROUP_URL_HANDLING];
+		[self setAdiumAsDefault];
+	} else if ([[adium.preferenceController preferenceForKey:PREF_KEY_ENFORCE_DEFAULT
+													   group:GROUP_URL_HANDLING] boolValue]) {
 		[self setAdiumAsDefault];
 	}
 	




More information about the commits mailing list