From 73ff981d4fe5a77c3859de8ecaef43dfb52c463c Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Thu, 29 Nov 2012 15:49:32 -0500
Subject: [PATCH] Fixed the method that returns the current-user-principal.

---
 SoObjects/Appointments/SOGoUserFolder+Appointments.h | 1 +
 SoObjects/SOGo/SOGoObject.m                          | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/SoObjects/Appointments/SOGoUserFolder+Appointments.h b/SoObjects/Appointments/SOGoUserFolder+Appointments.h
index 89af6b687..9342de19a 100644
--- a/SoObjects/Appointments/SOGoUserFolder+Appointments.h
+++ b/SoObjects/Appointments/SOGoUserFolder+Appointments.h
@@ -32,6 +32,7 @@
 
 - (NSArray *) davCalendarUserAddressSet;
 - (NSArray *) davCalendarHomeSet;
+- (NSArray *) davCalendarScheduleInboxURL;
 - (NSArray *) davCalendarScheduleOutboxURL;
 
 @end
diff --git a/SoObjects/SOGo/SOGoObject.m b/SoObjects/SOGo/SOGoObject.m
index 8a0f0e24d..90df71afe 100644
--- a/SoObjects/SOGo/SOGoObject.m
+++ b/SoObjects/SOGo/SOGoObject.m
@@ -1236,7 +1236,7 @@
 - (SOGoWebDAVValue *) davCurrentUserPrincipal
 {
   NSDictionary *userHREF;
-  NSString *login;
+  NSString *login, *s;
   SOGoUser *activeUser;
   SOGoWebDAVValue *davCurrentUserPrincipal;
 
@@ -1246,7 +1246,8 @@
     davCurrentUserPrincipal = nil;
   else
     {
-      userHREF = davElementWithContent (@"href", XMLNS_WEBDAV, [self davURLAsString]);
+      s = [NSString stringWithFormat: @"/SOGo/dav/%@", login];
+      userHREF = davElementWithContent (@"href", XMLNS_WEBDAV, s);
       davCurrentUserPrincipal
         = [davElementWithContent (@"current-user-principal",
                                   XMLNS_WEBDAV,