summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/chrome/content/synckolab/calendar.js6
-rw-r--r--src/chrome/content/synckolab/tools.js2
2 files changed, 5 insertions, 3 deletions
diff --git a/src/chrome/content/synckolab/calendar.js b/src/chrome/content/synckolab/calendar.js
index f55376a..070bb27 100644
--- a/src/chrome/content/synckolab/calendar.js
+++ b/src/chrome/content/synckolab/calendar.js
@@ -626,7 +626,7 @@ synckolab.Calendar = {
var calComp;
if (this.gConfig.type !== "task" && newEvent.startDate) {
- info += " (" + newEvent.startDate + ")";
+ info += " (" + newEvent.startDate.dateTime + ")";
}
this.curItemInListContent.setAttribute("label", info);
@@ -645,7 +645,7 @@ synckolab.Calendar = {
// get event from calendar based on the uid - and convert to json
foundEvent = synckolab.calendarTools.event2json(this.calTools.findEvent(this.gCalDB, newEvent.uid), this.gConfig.type === "task");
- synckolab.tools.logMessage("findevent returned :" + foundEvent + "(" + (foundEvent === null ? 'null' : foundEvent.uid) + ") for " + newEvent.uid + " caching " + this.gCalDB.length() + " events", synckolab.global.LOG_CAL + synckolab.global.LOG_DEBUG);
+ synckolab.tools.logMessage("findevent returned :" + newEvent.uid + "(" + (foundEvent === null ? 'null' : foundEvent.uid) + ") for " + newEvent.uid + " caching " + this.gCalDB.length() + " events", synckolab.global.LOG_CAL + synckolab.global.LOG_DEBUG);
// get the dbfile from the local disk
var idxEntry = synckolab.tools.file.getSyncDbFile(this.gConfig, newEvent.uid);
@@ -678,7 +678,7 @@ synckolab.Calendar = {
// add the new event
try {
- synckolab.tools.logMessage("adding obj with startdate:" + tmpEventObj.startDate, synckolab.global.LOG_CAL + synckolab.global.LOG_INFO);
+ synckolab.tools.logMessage("adding obj with startdate:" + tmpEventObj.startDate.dateTime, synckolab.global.LOG_CAL + synckolab.global.LOG_INFO);
this.gConfig.calendar.addItem(tmpEventObj, this.gEvents);
// also add to the hash-database
diff --git a/src/chrome/content/synckolab/tools.js b/src/chrome/content/synckolab/tools.js
index a27c7ea..9925cd3 100644
--- a/src/chrome/content/synckolab/tools.js
+++ b/src/chrome/content/synckolab/tools.js
@@ -124,6 +124,8 @@ scrollToBottom : function (itemList)
parseXml: function(content) {
var parser = Components.classes["@mozilla.org/xmlextras/domparser;1"].getService(Components.interfaces.nsIDOMParser);
+ // decode utf-8
+ content = synckolab.tools.text.utf8.decode(content);
return parser.parseFromString(content, "text/xml");
},