updated to use new WOContext API introduced in NGObjWeb v4.5.106

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

diff --git a/sope-appserver/WEExtensions/ChangeLog b/sope-appserver/WEExtensions/ChangeLog
index bd4e4ddabb6830602d69fa1a043f8d6e5541e51d..8f76deb2b30475f836c14efd4b879f9e0fa97dc3 100644 (file)
--- a/sope-appserver/WEExtensions/ChangeLog
+++ b/sope-appserver/WEExtensions/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-04  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * common.h, JSClipboard.m: changed to use WOContext's new
+         resourceLookupLanguages now (v4.5.65)
+
 2004-12-14  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * WEExtensions.xcode: minor changes and updated

diff --git a/sope-appserver/WEExtensions/JSClipboard.m b/sope-appserver/WEExtensions/JSClipboard.m
index 44edc24e826ee7d44aef662fb1a8a4250999a2c0..c0d13e48b2cf8f6cfa98039c56e9fccd8c920e3d 100644 (file)
--- a/sope-appserver/WEExtensions/JSClipboard.m
+++ b/sope-appserver/WEExtensions/JSClipboard.m
@@ -67,16 +67,12 @@
   NSString          *tmp;
   NSArray           *languages;
 
-  rm = [[_ctx application] resourceManager];
-    
-  languages = [_ctx hasSession]
-    ? [[_ctx session] languages]
-    : [[_ctx request] browserLanguages];
-    
-  tmp = [rm urlForResourceNamed:_name
-            inFramework:_framework
-            languages:languages
-            request:[_ctx request]];
+  rm        = [[_ctx application] resourceManager];
+  languages = [_ctx resourceLookupLanguages];
+  tmp       = [rm urlForResourceNamed:_name
+                  inFramework:_framework
+                  languages:languages
+                  request:[_ctx request]];
   return tmp;
 }
 

diff --git a/sope-appserver/WEExtensions/Version b/sope-appserver/WEExtensions/Version
index c41a410afe17ef80110f2389ce30444bb7fee116..4651c3e2b66340d1d2fa11e6ddc164530ea8605d 100644 (file)
--- a/sope-appserver/WEExtensions/Version
+++ b/sope-appserver/WEExtensions/Version
@@ -1,3 +1,5 @@
 # version file
 
-SUBMINOR_VERSION:=64
+SUBMINOR_VERSION:=65
+
+# v4.5.65 requires libNGObjWeb v4.5.106

diff --git a/sope-appserver/WEExtensions/WEExtensions.xcode/project.pbxproj b/sope-appserver/WEExtensions/WEExtensions.xcode/project.pbxproj
index 746537d29bd9dfdac04af239697b20b9bbff20e3..5de1de1bade8b2d89b7caf81c5d5d1eb7bbe29be 100644 (file)
--- a/sope-appserver/WEExtensions/WEExtensions.xcode/project.pbxproj
+++ b/sope-appserver/WEExtensions/WEExtensions.xcode/project.pbxproj
@@ -772,7 +772,7 @@
                        );
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.64;
+                               DYLIB_CURRENT_VERSION = 4.5.65;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;

diff --git a/sope-appserver/WEExtensions/common.h b/sope-appserver/WEExtensions/common.h
index c14520794bd2eae4d1acd5a7f8d434cc402e6f4b..5881f901abc91a8105d186250394822270f24225 100644 (file)
--- a/sope-appserver/WEExtensions/common.h
+++ b/sope-appserver/WEExtensions/common.h
@@ -54,9 +54,7 @@ static inline NSString *WEUriOfResource(NSString *_name, WOContext *_ctx) {
   if (_name == nil)
     return nil;
   
-  languages = [_ctx hasSession]
-    ? [[_ctx session] languages]
-    : [[_ctx request] browserLanguages];
+  languages = [_ctx resourceLookupLanguages];
   
   if ((resourceManager = [[_ctx component] resourceManager]) == nil)
     resourceManager = [[_ctx application] resourceManager];

diff --git a/sope-appserver/WOExtensions/ChangeLog b/sope-appserver/WOExtensions/ChangeLog
index 20f3697f38f9f6d709eec2d9afe0f970450f274c..ed7e88ff33fd94d8cca3231be09c4d0671080ee1 100644 (file)
--- a/sope-appserver/WOExtensions/ChangeLog
+++ b/sope-appserver/WOExtensions/ChangeLog
@@ -1,3 +1,9 @@
+2005-01-04  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * common.h, JSConfirmPanel.m, JSAlertPanel.m, JSImageFlyover.m,
+         JSModalWindow.m: changed to use WOContext's new
+         resourceLookupLanguages now (v4.5.22)
+
 2004-12-21  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * WOKeyValueConditional.[api,m]: added "negate" binding (v4.5.21)

diff --git a/sope-appserver/WOExtensions/JSAlertPanel.m b/sope-appserver/WOExtensions/JSAlertPanel.m
index 96a1444bc154bb1ec36ac6d7d5ef502f9fc5db7c..3ed65cb4dc7396c6cc7f20116ab365c03c6bf096 100644 (file)
--- a/sope-appserver/WOExtensions/JSAlertPanel.m
+++ b/sope-appserver/WOExtensions/JSAlertPanel.m
@@ -163,11 +163,8 @@
   if (self->filename) {
     WOResourceManager *rm;
 
-    rm = [[_ctx application] resourceManager];
-    
-    languages = [_ctx hasSession]
-      ? [[_ctx session] languages]
-      : [[_ctx request] browserLanguages];
+    rm        = [[_ctx application] resourceManager];
+    languages = [_ctx resourceLookupLanguages];
     
     tmp = [rm urlForResourceNamed:[self->filename stringValueInComponent:comp]
               inFramework:[comp frameworkName]

diff --git a/sope-appserver/WOExtensions/JSConfirmPanel.m b/sope-appserver/WOExtensions/JSConfirmPanel.m
index d6f20c1957e62ba3bf852f90a5b5917362213f52..4854f602277a4cc642d73307fb30cdb7c81b2a6b 100644 (file)
--- a/sope-appserver/WOExtensions/JSConfirmPanel.m
+++ b/sope-appserver/WOExtensions/JSConfirmPanel.m
@@ -202,12 +202,9 @@
   if (self->filename) { /* image */
       WOResourceManager *rm;
 
-      rm = [[_ctx application] resourceManager];
-    
-      languages = [_ctx hasSession]
-        ? [[_ctx session] languages]
-        : [[_ctx request] browserLanguages];
-    
+      rm        = [[_ctx application] resourceManager];
+      languages = [_ctx resourceLookupLanguages];
+
       tmp = [rm urlForResourceNamed:[self->filename stringValueInComponent:comp]
                 inFramework:[comp frameworkName]
                 languages:languages

diff --git a/sope-appserver/WOExtensions/JSImageFlyover.m b/sope-appserver/WOExtensions/JSImageFlyover.m
index f70ceb6d81892aa51547fda091a3ca2881c4d9cd..e7a024be745742d47285accf2e882cb76e9b1cb4 100644 (file)
--- a/sope-appserver/WOExtensions/JSImageFlyover.m
+++ b/sope-appserver/WOExtensions/JSImageFlyover.m
@@ -201,16 +201,12 @@
   NSString          *tmp;
   NSArray           *languages;
 
-  rm = [[_ctx application] resourceManager];
-    
-  languages = [_ctx hasSession]
-    ? [[_ctx session] languages]
-    : [[_ctx request] browserLanguages];
-    
-  tmp = [rm urlForResourceNamed:_name
-            inFramework:_framework
-            languages:languages
-            request:[_ctx request]];
+  rm        = [[_ctx application] resourceManager];
+  languages = [_ctx resourceLookupLanguages];
+  tmp       = [rm urlForResourceNamed:_name
+                  inFramework:_framework
+                  languages:languages
+                  request:[_ctx request]];
   return tmp;
 }
     

diff --git a/sope-appserver/WOExtensions/JSModalWindow.m b/sope-appserver/WOExtensions/JSModalWindow.m
index 32a753ea7330c230607bf449b875e686c451a9a2..a23d47aea95b68a8a8195b046d3d6a1a1c5b6011 100644 (file)
--- a/sope-appserver/WOExtensions/JSModalWindow.m
+++ b/sope-appserver/WOExtensions/JSModalWindow.m
@@ -243,12 +243,9 @@
   if (self->filename) {
     WOResourceManager *rm;
 
-    rm = [[_ctx application] resourceManager];
-    
-    languages = [_ctx hasSession]
-      ? [[_ctx session] languages]
-      : [[_ctx request] browserLanguages];
-    
+    rm        = [[_ctx application] resourceManager];
+    languages = [_ctx resourceLookupLanguages];
+
     tmp = [rm urlForResourceNamed:[self->filename stringValueInComponent:comp]
               inFramework:[comp frameworkName]
               languages:languages

diff --git a/sope-appserver/WOExtensions/Version b/sope-appserver/WOExtensions/Version
index 49f242e531df55a4ec8619c8424bdc414d69e19a..7c684d83aefd03b54cc3caab0df6d3e5c3bf0a9e 100644 (file)
--- a/sope-appserver/WOExtensions/Version
+++ b/sope-appserver/WOExtensions/Version
@@ -1,3 +1,5 @@
 # $Id$
 
-SUBMINOR_VERSION:=21
+SUBMINOR_VERSION:=22
+
+# v4.5.22 requires libNGObjWeb v4.5.106

diff --git a/sope-appserver/WOExtensions/WOExtensions.xcode/project.pbxproj b/sope-appserver/WOExtensions/WOExtensions.xcode/project.pbxproj
index 832157782001743e8a7ba28b23959a2f2eb04ee9..0c6d88b9072a8bade2f2caac3ed51e37dd46e970 100644 (file)
--- a/sope-appserver/WOExtensions/WOExtensions.xcode/project.pbxproj
+++ b/sope-appserver/WOExtensions/WOExtensions.xcode/project.pbxproj
@@ -615,7 +615,7 @@
                        );
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.21;
+                               DYLIB_CURRENT_VERSION = 4.5.22;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;

diff --git a/sope-appserver/WOExtensions/common.h b/sope-appserver/WOExtensions/common.h
index 2836ab7f1d2f6c2910449152c9d086ae64293c6b..93f5873676c80201404b650c83cecb9dd5660618 100644 (file)
--- a/sope-appserver/WOExtensions/common.h
+++ b/sope-appserver/WOExtensions/common.h
@@ -49,12 +49,9 @@ static inline NSString *WOUriOfResource(NSString *_name, WOContext *_ctx) {
   if (_name == nil)
     return nil;
 
-  languages = [_ctx hasSession]
-    ? [[_ctx session] languages]
-    : [[_ctx request] browserLanguages];
-  
+  languages       = [_ctx resourceLookupLanguages];
   resourceManager = [[_ctx application] resourceManager];
-  
+
   uri = [resourceManager urlForResourceNamed:_name
                          inFramework:nil
                          languages:languages