From: helge <helge@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Thu, 14 Jul 2005 14:00:19 +0000 (+0000)
Subject: moved SOGoAuthenticator and SOGoUser to libSOGo
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02549b620c653f3b19b2a7748ca744de6a61e3d6;p=scalable-opengroupware.org

moved SOGoAuthenticator and SOGoUser to libSOGo


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

diff --git a/SOGo/Main/ChangeLog b/SOGo/Main/ChangeLog
index a7f320e0..62201d31 100644
--- a/SOGo/Main/ChangeLog
+++ b/SOGo/Main/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-14  Helge Hess  <helge.hess@opengroupware.org>
+
+	* moved SOGoUser and SOGoAuthenticator to libSOGo (v0.9.33)
+
 2005-07-14  Marcus Mueller  <znek@mulle-kybernetik.com>
 
 	* SOGoUserHomePage.m: vacation message state is now properly being
diff --git a/SOGo/Main/GNUmakefile b/SOGo/Main/GNUmakefile
index 414e7f18..8cbc220c 100644
--- a/SOGo/Main/GNUmakefile
+++ b/SOGo/Main/GNUmakefile
@@ -17,8 +17,6 @@ $(SOGOD)_OBJC_FILES += \
 	sogod.m			\
 	SOGo.m			\
 	SOGoProductLoader.m	\
-	SOGoAuthenticator.m	\
-	SOGoUser.m		\
 
 # product
 
diff --git a/SOGo/Main/SOGo.m b/SOGo/Main/SOGo.m
index 59d43860..d68e81ad 100644
--- a/SOGo/Main/SOGo.m
+++ b/SOGo/Main/SOGo.m
@@ -31,8 +31,8 @@
 
 @end
 
-#include "SOGoAuthenticator.h"
 #include "SOGoProductLoader.h"
+#include <SOGo/SOGoAuthenticator.h>
 #include <WEExtensions/WEResourceManager.h>
 #include <SOGo/SOGoUserFolder.h>
 #include "common.h"
diff --git a/SOGo/Main/SOGoUserHomePage.m b/SOGo/Main/SOGoUserHomePage.m
index 9d442660..564fe0d2 100644
--- a/SOGo/Main/SOGoUserHomePage.m
+++ b/SOGo/Main/SOGoUserHomePage.m
@@ -38,7 +38,7 @@
 
 #include <SOGo/AgenorUserManager.h>
 #include <SOGo/WOContext+Agenor.h>
-#include "SOGoUser.h"
+#include <SOGo/SOGoUser.h>
 #include "common.h"
 
 @implementation SOGoUserHomePage
@@ -176,6 +176,7 @@ static NSArray *internetAccessStates = nil;
 }
 
 - (BOOL)isNotAllowedToChangeInternetAccess {
+  // TODO: should be a SOGoUser method
   AgenorUserManager *um;
   WOContext         *ctx;
   NSString          *uid;
@@ -190,6 +191,7 @@ static NSArray *internetAccessStates = nil;
 }
 
 - (BOOL)isVacationMessageEnabledForInternet {
+  // TODO: should be a SOGoUser method
   AgenorUserManager *um;
   NSString          *uid;
 
@@ -199,6 +201,7 @@ static NSArray *internetAccessStates = nil;
 }
 
 - (BOOL)isVacationMessageEnabledForIntranet {
+  // TODO: should be a SOGoUser method
   AgenorUserManager *um;
   NSString          *uid;
   
diff --git a/SOGo/Main/Version b/SOGo/Main/Version
index e5b894f7..376a1ba7 100644
--- a/SOGo/Main/Version
+++ b/SOGo/Main/Version
@@ -1,6 +1,6 @@
 # Version file
 
-SUBMINOR_VERSION:=32
+SUBMINOR_VERSION:=33
 
 # v0.9.32 requires libSOGo         v0.9.57
 # v0.9.24 requires libWEExtensions v4.5.67
diff --git a/SOGo/SoObjects/SOGo/ChangeLog b/SOGo/SoObjects/SOGo/ChangeLog
index 2037499e..e992cfe4 100644
--- a/SOGo/SoObjects/SOGo/ChangeLog
+++ b/SOGo/SoObjects/SOGo/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-14  Helge Hess  <helge.hess@opengroupware.org>
+
+	* moved in SOGoUser and SOGoAuthenticator from Main (v0.9.58)
+
 2005-07-14  Marcus Mueller  <znek@mulle-kybernetik.com>
 
 	* AgenorUserManager.[hm]: added accessors and cache for the
diff --git a/SOGo/SoObjects/SOGo/GNUmakefile b/SOGo/SoObjects/SOGo/GNUmakefile
index 0e7bfe73..e9aeebd2 100644
--- a/SOGo/SoObjects/SOGo/GNUmakefile
+++ b/SOGo/SoObjects/SOGo/GNUmakefile
@@ -33,6 +33,9 @@ libSOGo_HEADER_FILES = \
 	NSString+iCal.h			\
 	NSObject+AptComparison.h	\
 	WOContext+Agenor.h		\
+	\
+	SOGoAuthenticator.h		\
+	SOGoUser.h			\
 
 libSOGo_OBJC_FILES = \
 	SOGoObject.m			\
@@ -50,6 +53,9 @@ libSOGo_OBJC_FILES = \
 	NSObject+AptComparison.m	\
 	WOContext+Agenor.m		\
 	AgenorUserDefaults.m		\
+	\
+	SOGoAuthenticator.m		\
+	SOGoUser.m			\
 
 # tools
 
diff --git a/SOGo/Main/SOGoAuthenticator.h b/SOGo/SoObjects/SOGo/SOGoAuthenticator.h
similarity index 100%
rename from SOGo/Main/SOGoAuthenticator.h
rename to SOGo/SoObjects/SOGo/SOGoAuthenticator.h
diff --git a/SOGo/Main/SOGoAuthenticator.m b/SOGo/SoObjects/SOGo/SOGoAuthenticator.m
similarity index 100%
rename from SOGo/Main/SOGoAuthenticator.m
rename to SOGo/SoObjects/SOGo/SOGoAuthenticator.m
diff --git a/SOGo/Main/SOGoUser.h b/SOGo/SoObjects/SOGo/SOGoUser.h
similarity index 100%
rename from SOGo/Main/SOGoUser.h
rename to SOGo/SoObjects/SOGo/SOGoUser.h
diff --git a/SOGo/Main/SOGoUser.m b/SOGo/SoObjects/SOGo/SOGoUser.m
similarity index 100%
rename from SOGo/Main/SOGoUser.m
rename to SOGo/SoObjects/SOGo/SOGoUser.m
diff --git a/SOGo/SoObjects/SOGo/Version b/SOGo/SoObjects/SOGo/Version
index 0b3dc209..82e7cdef 100644
--- a/SOGo/SoObjects/SOGo/Version
+++ b/SOGo/SoObjects/SOGo/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=57
+SUBMINOR_VERSION:=58
 
 # v0.9.50 requires libGDLContentStore v4.5.30
 # v0.9.34 requires libGDLContentStore v4.5.26