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

Conflicts:
	ews_syncfolder.c

diff --cc ews_syncfolder.c
index 7c21cc717e95d6013ce11ec085bbb8cc5be36d1a,46bf8312a76c4b8c26814425f5a6d5969cbb33b4..e448393a87a1ca0366499a03f30edfd7ae773bae
--- 1/ews_syncfolder.c
--- 2/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);