X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;ds=sidebyside;f=source%2Fobjects%2FCalDAV%2FCalDAV.cpp;h=38c5bdb5fc1330c5951c290753fb947198b1837a;hb=6db84a2ded5a6d8f10b341965e303f329588f293;hp=a94640f8949e4a17b74365e873dc66a6bc07bb72;hpb=b21ea336e08289c984eccd4baeefdb67e5901281;p=xestiacalendar%2F.git

diff --git a/source/objects/CalDAV/CalDAV.cpp b/source/objects/CalDAV/CalDAV.cpp
index a94640f..38c5bdb 100644
--- a/source/objects/CalDAV/CalDAV.cpp
+++ b/source/objects/CalDAV/CalDAV.cpp
@@ -476,6 +476,7 @@ CalDAVCalendarList CalDAV::GetCalendars(){
 	" <d:prop>\n"
         "  <d:resourcetype />\n"
 	"  <d:displayname />\n"
+	"  <d:sync-token />\n"
 	"  <x0:calendar-color />\n"
 	"  <x0:calendar-order />\n"
 	"  <cs:getctag />\n"
@@ -546,6 +547,16 @@ CalDAVCalendarList CalDAV::GetCalendars(){
 
 CalDAVServerResult CalDAV::AddCalendar(string CalendarName){
 	
+	CalDAVServerResult ServerResult;
+	
+	AddCalendar(&CalendarName, nullptr);
+	
+	return ServerResult;
+	
+}
+
+CalDAVServerResult CalDAV::AddCalendar(string *CalendarName, string *CalendarShortName){
+	
 	CalDAVServerResult ServerResult;
 	CalDAVSendData CalendarAddSendData;
 	
@@ -565,9 +576,19 @@ CalDAVServerResult CalDAV::AddCalendar(string CalendarName){
 	
 	// Generate the UUID.
 	
-	string UUIDValue = GenerateUUID();
-	UUIDValue.erase(UUIDValue.end()-1);
+	string UUIDValue = "";
+	
+	if (CalendarShortName == nullptr){
+	
+		UUIDValue = GenerateUUID();
+		UUIDValue.erase(UUIDValue.end()-1);
+
+	} else {
 	
+		UUIDValue = *CalendarShortName;
+		
+	}
+		
 	string CalendarHomeURL = CalendarHomeURI;
 	CalendarHomeURL.append(UUIDValue);
 	CalendarHomeURL.append("/");
@@ -581,7 +602,7 @@ CalDAVServerResult CalDAV::AddCalendar(string CalendarName){
 	" <d:set>\n"
 	"  <d:prop>\n"
 	"   <d:displayname>";
-	CalendarAddRequest += CalendarName;
+	CalendarAddRequest += *CalendarName;
 	CalendarAddRequest += "</d:displayname>\n"
 	"   <c:supported-calendar-component-set>\n"
 	"    <c:comp name=\"VTODO\"/>\n"