[evolution/webkit: 36/57] Fix compilation error in EMFormat and EMFormatHTMLDisplay

[Dan VrÃtil <dvratil src gnome org>]

commit 18f6295d0f8556a48a09df9fd96c14f425805344
Author: Dan VrÃtil <dvratil redhat com>
Date:   Fri Sep 9 11:36:05 2011 +0200

    Fix compilation error in EMFormat and EMFormatHTMLDisplay

 em-format/em-format-quote.c   |    2 +-
 mail/em-format-html-display.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/em-format/em-format-quote.c b/em-format/em-format-quote.c
index 07a793c..89e4ed7 100644
--- a/em-format/em-format-quote.c
+++ b/em-format/em-format-quote.c
@@ -592,7 +592,7 @@ emfq_format_headers (EMFormatQuote *emfq,
 
 static void
 emfq_write_message_prefix (EMFormat *emf,
-			   EMFormatPURI *puri
+			   EMFormatPURI *puri,
 			   CamelStream *stream,
 			   GCancellable *cancellable)
 {
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index 58c4c55..802c838 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -370,7 +370,7 @@ static void
 efhd_parse (EMFormat *emf,
 	    CamelMimeMessage *msg,
 	    CamelFolder *folder,
-	    Cancellable *cancellable)
+	    GCancellable *cancellable)
 {
 	EMFormatHTMLDisplay *efhd;