From: helge <helge@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Thu, 21 Jul 2005 14:30:35 +0000 (+0000)
Subject: work on shares
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c9be9f6bbf6a420b6930e8d2ad0a9a3a4e79cc2;p=scalable-opengroupware.org

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 c3190919..ba069600 100644
--- 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 bb423b42..851dfb62 100644
--- 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 d04d860b..04922e48 100644
--- 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 191e256f..7a496da8 100644
--- 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