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 aa41810f585845fe0b61185e99cfa40f5e4e5e50..5ca833c03db22261d32e0cc6591a72536d85bf23 100644 (file)
--- 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 93475c9f5f6456588df3c66a5c95d6e597613dcb..275db0b21fe0cbdeac4072b8047c32a59bbe24cc 100644 (file)
--- 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 560f689dc9e7bacbffc805b934b2d8e16488c32c..2f16a6fc593527181af3cb6f8956600fecfe3490 100644 (file)
--- 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 3b5e467bee393a840ecebd44c6719b0b7a9629ce..7e4f24a55845e19cb29813ee1b15bc8f72a43bab 100644 (file)
--- 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 4508310c24a6c14a78733edcff5a77ba6448737d..2aa782b82dc19d834b48a024f38e7a67fb8c20d8 100644 (file)
--- 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