work on shares

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@873 d1b88da0-ebda-0310-925b-ed51d893ca5b

diff --git a/SOGo/SoObjects/SOGo/ChangeLog b/SOGo/SoObjects/SOGo/ChangeLog
index c319091940222387170cfa534cb405c2ceccd3b0..ba069600e3069fecf2d8c8d670446bdd6e17cf3e 100644 (file)
--- a/SOGo/SoObjects/SOGo/ChangeLog
+++ b/SOGo/SoObjects/SOGo/ChangeLog
@@ -1,5 +1,8 @@
 2005-07-21  Helge Hess  <helge.hess@opengroupware.org>
 
+       * SOGoUser.m: added a method to fetch share/emitter address pairs from
+         the AgenorUserManager (v0.9.68)
+
        * AgenorUserManager.m: rewrote to use NSMutableDictionary instead of
          SOGoLRUCache. Flush caches every hour (configurable using
          'AgenorCacheCheckInterval' default). Added method to retrieve the

diff --git a/SOGo/SoObjects/SOGo/SOGoUser.h b/SOGo/SoObjects/SOGo/SOGoUser.h
index bb423b425fadfc7904257fcd388879a7c4d10b1b..851dfb62d1f8473bf8aac331d66cb58236db571f 100644 (file)
--- a/SOGo/SoObjects/SOGo/SOGoUser.h
+++ b/SOGo/SoObjects/SOGo/SOGoUser.h
@@ -34,6 +34,8 @@
     context.activeUser
 */
 
+@class NSString, NSArray, NSDictionary, NSUserDefaults;
+
 @class NSString, NSArray, NSURL, NSUserDefaults;
 
 @interface SOGoUser : SoUser
@@ -47,11 +49,15 @@
 
 - (NSString *)email;
 - (NSString *)cn;
+- (NSURL *)freeBusyURL;
+
+/* shares and identities */
+
 - (NSString *)primaryIMAP4AccountString;
 - (NSString *)primaryMailServer;
 - (NSArray *)additionalIMAP4AccountStrings;
 - (NSArray *)additionalEMailAddresses;
-- (NSURL *)freeBusyURL;
+- (NSDictionary *)additionalIMAP4AccountsAndEMails;
 
 /* defaults */
 

diff --git a/SOGo/SoObjects/SOGo/SOGoUser.m b/SOGo/SoObjects/SOGo/SOGoUser.m
index d04d860bf85e9dbfdc8e4e279e913c86bddeb6de..04922e4828745c07a0d42684e6ca4c5fc7e47d54 100644 (file)
--- a/SOGo/SoObjects/SOGo/SOGoUser.m
+++ b/SOGo/SoObjects/SOGo/SOGoUser.m
@@ -68,6 +68,10 @@
   return [[self userManager] getSharedMailboxEMailsForUID:[self login]];
 }
 
+- (NSDictionary *)additionalIMAP4AccountsAndEMails {
+  return [[self userManager] getSharedMailboxesAndEMailsForUID:[self login]];
+}
+
 - (NSURL *)freeBusyURL {
   return [[self userManager] getFreeBusyURLForUID:[self login]];
 }

diff --git a/SOGo/SoObjects/SOGo/Version b/SOGo/SoObjects/SOGo/Version
index 191e256f179a57f74107541df1590a3971133520..7a496da885011e8af4974ff63f2f44c53138d6ae 100644 (file)
--- a/SOGo/SoObjects/SOGo/Version
+++ b/SOGo/SoObjects/SOGo/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=67
+SUBMINOR_VERSION:=68
 
 # v0.9.63 requires libNGiCal          v4.5.54
 # v0.9.60 requires libNGiCal          v4.5.49