20857N/A

20857N/A# HG changeset patch

20857N/A# User Philipp Kewisch <mozilla@kewis.ch>

20857N/A# Date 1313582520 -7200

20857N/A# Node ID 8a69d7c008eb14a33501bcba0a102d1af09e63cc

20857N/A# Parent 06fdb5abb9bd3a2e56f6a1ddf13c43f99091e75d

20857N/AFix bug 679669 - Update calendar for nsIUnicharStreamLoader changes. r=mmecca,a=philipp

20857N/A

20857N/Adiff --git a/calendar/base/content/calendar-dnd-listener.js b/calendar/base/content/calendar-dnd-listener.js

20857N/A--- a/calendar/base/content/calendar-dnd-listener.js

20857N/A+++ b/calendar/base/content/calendar-dnd-listener.js

20857N/A@@ -325,28 +325,21 @@ calDNDBaseObserver.prototype = {

20857N/A charset = channel.contentCharset;

20857N/A }

20857N/A if (!charset || charset.length == 0) {

20857N/A charset = "UTF-8";

20857N/A }

20857N/A return charset;

20857N/A },

20857N/A

20857N/A- onStreamComplete: function(loader, context, status, unicharData) {

20857N/A- if (unicharData) {

20857N/A- var str = "";

20857N/A- var str_ = {};

20857N/A- while (unicharData.readString(-1, str_)) {

20857N/A- str += str_.value;

20857N/A- }

20857N/A- var parser = Components.classes["@mozilla.org/calendar/ics-parser;1"]

20857N/A- .createInstance(Components.interfaces.calIIcsParser);

20857N/A- parser.parseString(str);

20857N/A- self.onDropItems(parser.getItems({}).concat(parser.getParentlessItems({})));

20857N/A- }

20857N/A+ onStreamComplete: function(loader, context, status, unicharString) {

20857N/A+ var parser = Components.classes["@mozilla.org/calendar/ics-parser;1"]

20857N/A+ .createInstance(Components.interfaces.calIIcsParser);

20857N/A+ parser.parseString(unicharString);

20857N/A+ self.onDropItems(parser.getItems({}).concat(parser.getParentlessItems({})));

20857N/A }

20857N/A };

20857N/A

20857N/A try {

20857N/A loader.init(listener, Components.interfaces.nsIUnicharStreamLoader.DEFAULT_SEGMENT_SIZE);

20857N/A channel.asyncOpen(loader, null);

20857N/A } catch(e) {

20857N/A Components.utils.reportError(e)

20857N/Adiff --git a/calendar/providers/wcap/calWcapRequest.js b/calendar/providers/wcap/calWcapRequest.js

20857N/A--- a/calendar/providers/wcap/calWcapRequest.js

20857N/A+++ b/calendar/providers/wcap/calWcapRequest.js

20857N/A@@ -306,55 +306,43 @@ calWcapNetworkRequest.prototype = {

20857N/A },

20857N/A

20857N/A /**

20857N/A * @see nsIUnicharStreamLoaderObserver

20857N/A */

20857N/A onStreamComplete: function calWcapNetworkRequest_onStreamComplete(aLoader,

20857N/A aContext,

20857N/A aStatus,

20857N/A- /* nsIUnicharInputStream */ unicharData) {

20857N/A+ unicharData) {

20857N/A this.m_loader = null;

20857N/A

20857N/A if (LOG_LEVEL > 0 && this.m_bLogging) {

20857N/A log("status: " + errorToString(aStatus), this);

20857N/A }

20857N/A if (aStatus != Components.results.NS_OK) {

20857N/A this.execRespFunc(aStatus);

20857N/A return;

20857N/A }

20857N/A

20857N/A- var result = "";

20857N/A- try {

20857N/A- if (unicharData) {

20857N/A- var str_ = {};

20857N/A- while (unicharData.readString(-1, str_)) {

20857N/A- result += str_.value;

20857N/A- }

20857N/A- }

20857N/A- if (LOG_LEVEL > 2 && this.m_bLogging) {

20857N/A- log("contentCharset = " + aLoader.charset + "\nrequest result:\n" + result, this);

20857N/A- }

20857N/A- } catch (exc) {

20857N/A- this.execRespFunc(exc);

20857N/A- return;

20857N/A+ if (LOG_LEVEL > 2 && this.m_bLogging) {

20857N/A+ log("contentCharset = " + aLoader.charset + "\nrequest result:\n" + unicharData, this);

20857N/A }

20857N/A

20857N/A var httpChannel = aLoader.channel.QueryInterface(Components.interfaces.nsIHttpChannel);

20857N/A switch (httpChannel.responseStatus / 100) {

20857N/A case 2: /* 2xx codes */

20857N/A // Everything worked out, we are done

20857N/A- this.execRespFunc(aStatus, result);

20857N/A+ this.execRespFunc(aStatus, unicharData);

20857N/A break;

20857N/A default: {

20857N/A // Something else went wrong

20857N/A var error = ("A request Error Occurred. Status Code: " +

20857N/A httpChannel.responseStatus + " " +

20857N/A httpChannel.responseStatusText + " Body: " +

20857N/A- result);

20857N/A+ unicharData);

20857N/A this.execRespFunc(Components.Exception(error, NS_BINDING_FAILED));

20857N/A break;

20857N/A }

20857N/A }

20857N/A },

20857N/A

20857N/A toString: function calWcapNetworkRequest_toString() {

20857N/A var ret = ("calWcapNetworkRequest id=" + this.id +

20857N/A