From e1de83b8d88421cbfbd2fe547fef6930ec03e3d5 Mon Sep 17 00:00:00 2001
From: "mozilla%kewis.ch"
 <mozilla%kewis.ch@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 7 Jun 2007 10:12:49 +0000
Subject: [PATCH] Fix bug 381853 and bug 381852. r=dbo

git-svn-id: svn://10.0.0.236/trunk@227637 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../providers/gdata/components/calGoogleCalendar.js        | 7 +++----
 .../providers/gdata/components/calGoogleSession.js         | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/mozilla/calendar/providers/gdata/components/calGoogleCalendar.js b/mozilla/calendar/providers/gdata/components/calGoogleCalendar.js
index ef485010fe8..189e6545bb3 100644
--- a/mozilla/calendar/providers/gdata/components/calGoogleCalendar.js
+++ b/mozilla/calendar/providers/gdata/components/calGoogleCalendar.js
@@ -341,7 +341,7 @@ calGoogleCalendar.prototype = {
             // to google. This saves network traffic.
             if (relevantFieldsMatch(aOldItem, aNewItem)) {
                 LOG("Not requesting item modification for " + aOldItem.id +
-                "(" + aOldItem.title + "), relevant fields match");
+                    "(" + aOldItem.title + "), relevant fields match");
 
                 if (aListener != null) {
                     aListener.onOperationComplete(this,
@@ -555,8 +555,7 @@ calGoogleCalendar.prototype = {
         var item = this.general_response(Ci.calIOperationListener.MODIFY,
                                          aResult,
                                          aStatus,
-                                         aRequest.extraData.listener,
-                                         aRequest);
+                                         aRequest.extraData.listener);
         // Notify Observers
         if (item) {
             this.notifyObservers("onModifyItem",
@@ -630,7 +629,7 @@ calGoogleCalendar.prototype = {
         this.general_response(Ci.calIOperationListener.GET,
                               aResult,
                               aStatus,
-                              aRequest.extraData.listener);
+                              aRequest.extraData);
     },
 
     /**
diff --git a/mozilla/calendar/providers/gdata/components/calGoogleSession.js b/mozilla/calendar/providers/gdata/components/calGoogleSession.js
index 156283a8eaf..3e23e66d266 100644
--- a/mozilla/calendar/providers/gdata/components/calGoogleSession.js
+++ b/mozilla/calendar/providers/gdata/components/calGoogleSession.js
@@ -449,7 +449,7 @@ calGoogleSession.prototype = {
                                       this.googleFullName);
 
         request.type = request.MODIFY;
-        request.uri = getItemEditURI(aNewItem);
+        request.uri = getItemEditURI(aOldItem);
         request.setUploadData("application/atom+xml; charset=UTF-8", xmlEntry);
         request.setResponseListener(aCalendar, aResponseListener);
         request.extraData = aExtraData;