From: David Woodhouse <dwmw2@infradead.org>
Date: Wed, 21 Jul 2010 12:30:08 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.infradead.org/home/dwmw2/public_git/ews-sync
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=7027ecfcf6276867b0e607c9e99cb3dffa1e1d0d;p=users%2Fdwmw2%2Fews-sync.git

Merge branch 'master' of ssh://git.infradead.org/home/dwmw2/public_git/ews-sync

Conflicts:
	ews_syncfolder.c
---

7027ecfcf6276867b0e607c9e99cb3dffa1e1d0d
diff --cc ews_syncfolder.c
index 7c21cc7,46bf831..e448393
--- a/ews_syncfolder.c
+++ b/ews_syncfolder.c
@@@ -138,10 -134,10 +138,10 @@@ int main(int argc, char **argv
  		exit(1);
  	}
  
 -	doc = xmlReadMemory (msg->response_body->data, msg->response_body->length,
 +	doc = xmlReadMemory (SOUP_MESSAGE(msg)->response_body->data, SOUP_MESSAGE(msg)->response_body->length,
  			     "syncresponse.xml", NULL, 0);
  	if (!doc) {
- 		fprintf(stderr, "Failed to parse autodiscover response XML\n");
+ 		fprintf(stderr, "Failed to parse SyncFolderItems response XML\n");
  		exit(1);
  	}
  	node = xmlDocGetRootElement(doc);