From 741ea236665df88a62391b94669593265ded0a9f Mon Sep 17 00:00:00 2001 From: znek Date: Tue, 4 Jan 2005 21:49:23 +0000 Subject: [PATCH] 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 --- sope-appserver/WEExtensions/ChangeLog | 5 +++++ sope-appserver/WEExtensions/JSClipboard.m | 16 ++++++---------- sope-appserver/WEExtensions/Version | 4 +++- .../WEExtensions.xcode/project.pbxproj | 2 +- sope-appserver/WEExtensions/common.h | 4 +--- sope-appserver/WOExtensions/ChangeLog | 6 ++++++ sope-appserver/WOExtensions/JSAlertPanel.m | 7 ++----- sope-appserver/WOExtensions/JSConfirmPanel.m | 9 +++------ sope-appserver/WOExtensions/JSImageFlyover.m | 16 ++++++---------- sope-appserver/WOExtensions/JSModalWindow.m | 9 +++------ sope-appserver/WOExtensions/Version | 4 +++- .../WOExtensions.xcode/project.pbxproj | 2 +- sope-appserver/WOExtensions/common.h | 7 ++----- 13 files changed, 42 insertions(+), 49 deletions(-) diff --git a/sope-appserver/WEExtensions/ChangeLog b/sope-appserver/WEExtensions/ChangeLog index bd4e4dda..8f76deb2 100644 --- a/sope-appserver/WEExtensions/ChangeLog +++ b/sope-appserver/WEExtensions/ChangeLog @@ -1,3 +1,8 @@ +2005-01-04 Marcus Mueller + + * common.h, JSClipboard.m: changed to use WOContext's new + resourceLookupLanguages now (v4.5.65) + 2004-12-14 Marcus Mueller * WEExtensions.xcode: minor changes and updated diff --git a/sope-appserver/WEExtensions/JSClipboard.m b/sope-appserver/WEExtensions/JSClipboard.m index 44edc24e..c0d13e48 100644 --- 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 c41a410a..4651c3e2 100644 --- 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 746537d2..5de1de1b 100644 --- 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 c1452079..5881f901 100644 --- 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 20f3697f..ed7e88ff 100644 --- a/sope-appserver/WOExtensions/ChangeLog +++ b/sope-appserver/WOExtensions/ChangeLog @@ -1,3 +1,9 @@ +2005-01-04 Marcus Mueller + + * 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 * WOKeyValueConditional.[api,m]: added "negate" binding (v4.5.21) diff --git a/sope-appserver/WOExtensions/JSAlertPanel.m b/sope-appserver/WOExtensions/JSAlertPanel.m index 96a1444b..3ed65cb4 100644 --- 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 d6f20c19..4854f602 100644 --- 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 f70ceb6d..e7a024be 100644 --- 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 32a753ea..a23d47ae 100644 --- 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 49f242e5..7c684d83 100644 --- 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 83215778..0c6d88b9 100644 --- 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 2836ab7f..93f58736 100644 --- 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 -- 2.39.5