[evolution/wip/webkit-composer: 966/966] Fix webkit-composer after rebase

[Tomas Popela <tpopela src gnome org>]

commit 6c68207d96635edfe913b04fbdd3783238d59733
Author: Tomas Popela <tpopela redhat com>
Date:   Wed Apr 23 12:01:55 2014 +0200

    Fix webkit-composer after rebase

 e-util/e-html-editor-replace-dialog.c        |    3 +--
 e-util/e-html-editor-selection.c             |    3 ++-
 em-format/e-mail-formatter-quote-text-html.c |    2 ++
 em-format/e-mail-formatter-quote.c           |    4 +++-
 mail/em-utils.c                              |    3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/e-util/e-html-editor-replace-dialog.c b/e-util/e-html-editor-replace-dialog.c
index 4e1ec65..7addcdf 100644
--- a/e-util/e-html-editor-replace-dialog.c
+++ b/e-util/e-html-editor-replace-dialog.c
@@ -49,7 +49,7 @@ struct _EHTMLEditorReplaceDialogPrivate {
        GtkWidget *replace_button;
        GtkWidget *replace_all_button;
 
-       EEditor *editor;
+       EHTMLEditor *editor;
 };
 
 enum {
@@ -180,7 +180,6 @@ html_editor_replace_dialog_show (GtkWidget *widget)
 static void
 e_html_editor_replace_dialog_class_init (EHTMLEditorReplaceDialogClass *class)
 {
-       GObjectClass *object_class;
        GtkWidgetClass *widget_class;
 
        g_type_class_add_private (class, sizeof (EHTMLEditorReplaceDialogPrivate));
diff --git a/e-util/e-html-editor-selection.c b/e-util/e-html-editor-selection.c
index f8ecbf2..fc6b6a9 100644
--- a/e-util/e-html-editor-selection.c
+++ b/e-util/e-html-editor-selection.c
@@ -1002,7 +1002,7 @@ e_html_editor_selection_get_string (EHTMLEditorSelection *selection)
                return NULL;
 
        g_free (selection->priv->text);
-       selection->priv->text = webkit_dom_range_get_text (selection->priv->range);
+       selection->priv->text = webkit_dom_range_get_text (range);
 
        return selection->priv->text;
 }
@@ -1152,6 +1152,7 @@ const gchar *
 e_html_editor_selection_get_background_color (EHTMLEditorSelection *selection)
 {
        WebKitDOMNode *ancestor;
+       WebKitDOMRange *range;
        WebKitDOMCSSStyleDeclaration *css;
 
        g_return_val_if_fail (E_IS_HTML_EDITOR_SELECTION (selection), NULL);
diff --git a/em-format/e-mail-formatter-quote-text-html.c b/em-format/e-mail-formatter-quote-text-html.c
index 0c6d2ac..8c6433c 100644
--- a/em-format/e-mail-formatter-quote-text-html.c
+++ b/em-format/e-mail-formatter-quote-text-html.c
@@ -63,6 +63,8 @@ emqfe_text_html_format (EMailFormatterExtension *extension,
        g_output_stream_write_all (
                stream, string, strlen (string), NULL, cancellable, NULL);
 
+       filtered_stream = g_object_ref (stream);
+
        if ((qf_context->qf_flags & E_MAIL_FORMATTER_QUOTE_FLAG_KEEP_SIG) == 0) {
                CamelMimeFilter *filter;
                GOutputStream *temp_stream;
diff --git a/em-format/e-mail-formatter-quote.c b/em-format/e-mail-formatter-quote.c
index dc4abc6..be3124e 100644
--- a/em-format/e-mail-formatter-quote.c
+++ b/em-format/e-mail-formatter-quote.c
@@ -123,7 +123,9 @@ mail_formatter_quote_run (EMailFormatter *formatter,
        if (qf->priv->credits && *qf->priv->credits) {
                gchar *credits = g_strdup_printf (
                        "<span class=\"-x-evo-to-body\"><pre>%s</pre></span>", qf->priv->credits);
-               camel_stream_write_string (stream, credits, cancellable, NULL);
+               g_output_stream_write_all (
+                       stream, credits, strlen (credits),
+                       NULL, cancellable, NULL);
                g_free (credits);
        }
 
diff --git a/mail/em-utils.c b/mail/em-utils.c
index 44556b9..f1f23d3 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -1267,7 +1267,8 @@ em_utils_message_to_html (CamelSession *session,
                *validity_found = is_validity_found;
 
        if (prepend != NULL && *prepend != '\0')
-             camel_stream_write_string (mem, prepend, NULL, NULL);
+               g_output_stream_write_all (
+                       stream, prepend, strlen (prepend), NULL, NULL, NULL);
 
        e_mail_formatter_format_sync (
                formatter, parts_list, stream, 0,