From: znek <znek@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Tue, 4 Jan 2005 01:16:34 +0000 (+0000)
Subject: bugixes
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7128eceb0744f4078f3f4260e2068a9d0b01353;p=sope

bugixes

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@478 e4a50df8-12e2-0310-a44c-efbce7f8a7e3
---

diff --git a/sopex/SOPEX/ChangeLog b/sopex/SOPEX/ChangeLog
index aa41810f..5ca833c0 100644
--- a/sopex/SOPEX/ChangeLog
+++ b/sopex/SOPEX/ChangeLog
@@ -1,3 +1,10 @@
+2005-01-04  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+	* SOPEXAppController.m: changed default handling in -prepareForLaunch
+	  to be more applicable to the changed conditions. It would probably
+	  be best to have a search list, but AFAIK Apple removed this from
+	  NSUserDefaults ... sigh. (v2.0.2)
+
 2005-01-03  Marcus Mueller  <znek@mulle-kybernetik.com>
 
 	* v2.0.1
diff --git a/sopex/SOPEX/Info.plist b/sopex/SOPEX/Info.plist
index 93475c9f..275db0b2 100644
--- a/sopex/SOPEX/Info.plist
+++ b/sopex/SOPEX/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.0.1</string>
+	<string>2.0.2</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>
diff --git a/sopex/SOPEX/SOPEX.xcode/project.pbxproj b/sopex/SOPEX/SOPEX.xcode/project.pbxproj
index 560f689d..2f16a6fc 100644
--- a/sopex/SOPEX/SOPEX.xcode/project.pbxproj
+++ b/sopex/SOPEX/SOPEX.xcode/project.pbxproj
@@ -243,7 +243,7 @@
 			);
 			buildSettings = {
 				DYLIB_COMPATIBILITY_VERSION = 2.0.0;
-				DYLIB_CURRENT_VERSION = 2.0.1;
+				DYLIB_CURRENT_VERSION = 2.0.2;
 				FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				FRAMEWORK_VERSION = A;
 				GCC_ENABLE_TRIGRAPHS = NO;
diff --git a/sopex/SOPEX/SOPEXAppController.m b/sopex/SOPEX/SOPEXAppController.m
index 3b5e467b..7e4f24a5 100644
--- a/sopex/SOPEX/SOPEXAppController.m
+++ b/sopex/SOPEX/SOPEXAppController.m
@@ -159,22 +159,22 @@ static BOOL     isInRADMode = YES;
 }
 
 - (void)prepareForLaunch {
-  if([self isInRADMode]) {
-    NSUserDefaults *ud;
-    
-    ud = [NSUserDefaults standardUserDefaults];
-
-    /* NGLogging */
+  NSUserDefaults *ud;
 
-    [ud setObject:@"SOPEXConsoleAppender" forKey:@"NGLogDefaultAppenderClass"];
-    [ud setObject:@"SOPEXConsoleEventFormatter"
-        forKey:@"NGLogDefaultLogEventFormatterClass"];
+  ud = [NSUserDefaults standardUserDefaults];
 
-    /* SOPE options */
-
-    /* wildcard host and automatic port */
-    [ud setObject:@"*:auto" forKey:@"WOPort"];
+  /* NGLogging */
+  
+  [ud setObject:@"SOPEXConsoleAppender" forKey:@"NGLogDefaultAppenderClass"];
+  [ud setObject:@"SOPEXConsoleEventFormatter"
+      forKey:@"NGLogDefaultLogEventFormatterClass"];
+  
+  /* SOPE options */
+  
+  /* wildcard host and automatic port */
+  [ud setObject:@"*:auto" forKey:@"WOPort"];
 
+  if([self isInRADMode]) {
     // the next entry works, because  executable's cwd is the project directory
     // (set in project's launch options)
     [ud setObject:[[NSFileManager defaultManager] currentDirectoryPath]
@@ -200,6 +200,11 @@ static BOOL     isInRADMode = YES;
     [ud setBool:YES forKey:@"WOProfileHttpAdaptor"];
 #endif
   }
+  else {
+    [ud setBool:YES forKey:@"WOCachingEnabled"];
+    [ud setBool:NO  forKey:@"WODebuggingEnabled"];
+    [ud removeObjectForKey:@"WOProjectDirectory"];
+  }
 }
 
 
diff --git a/sopex/SOPEX/Version b/sopex/SOPEX/Version
index 4508310c..2aa782b8 100644
--- a/sopex/SOPEX/Version
+++ b/sopex/SOPEX/Version
@@ -8,7 +8,7 @@
 
 MAJOR_VERSION=2
 MINOR_VERSION=0
-SUBMINOR_VERSION=1
+SUBMINOR_VERSION=2
 
 # v2.0.0 requires NGObjWeb v4.5.95
 # v1.0.7 requires NGObjWeb v4.2.341