From e0cc39c7dd358fc6ddae5566cd02c32ea9354b09 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Mon, 21 Aug 2006 22:23:47 +0000 Subject: [PATCH] Monotone-Parent: 0ffeb1b58183aef5fe52c0260be541c404cf9d8b Monotone-Revision: 4bd5f430f07481a1a60f5793472c59de68d874f8 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2006-08-21T22:23:47 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 3 +++ UI/SOGoUI/UIxComponent.m | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 249b121df..7fc2af927 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2006-08-21 Wolfgang Sourdeau + * UI/SOGoUI/UIxComponent.m ([UIxComponent -labelForKey:]): use + [self pageResourceManager] instead of [self resourceManager]. + * UI/Contacts/UIxContactEditorBase.m: invokes globallyUniqueObjectId on the clientobject's class instead of the hardcoded "SOGoFolder". diff --git a/UI/SOGoUI/UIxComponent.m b/UI/SOGoUI/UIxComponent.m index 2e7a8d941..203bdf1d6 100644 --- a/UI/SOGoUI/UIxComponent.m +++ b/UI/SOGoUI/UIxComponent.m @@ -402,7 +402,7 @@ static BOOL uixDebugEnabled = NO; /* find resource manager */ - if ((rm = [self resourceManager]) == nil) + if ((rm = [self pageResourceManager]) == nil) rm = [[WOApplication application] resourceManager]; if (rm == nil) [self warnWithFormat:@"missing resource manager!"];