[evolution/wip-webkit2] Fix e_mail_display_get_selection_plain_text_sync

[Tomas Popela <tpopela src gnome org>]

commit 08819344fda268ecd937188650150365fbec63f4
Author: Tomas Popela <tpopela redhat com>
Date:   Fri Oct 18 13:58:32 2013 +0200

    Fix e_mail_display_get_selection_plain_text_sync

 mail/e-mail-display.c |   12 +++++++-----
 mail/e-mail-display.h |    6 ++++--
 2 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/mail/e-mail-display.c b/mail/e-mail-display.c
index 179477b..3e63c77 100644
--- a/mail/e-mail-display.c
+++ b/mail/e-mail-display.c
@@ -1925,15 +1925,17 @@ e_mail_display_set_status (EMailDisplay *display,
 }
 
 gchar *
-e_mail_display_get_selection_plain_text_sync (EMailDisplay *display)
+e_mail_display_get_selection_plain_text_sync (EMailDisplay *display,
+                                              GCancellable *cancellable,
+                                              GError **error)
 {
        GDBusProxy *web_extension;
 
-       g_return_if_fail (E_IS_MAIL_DISPLAY (display));
-
+       g_return_val_if_fail (E_IS_MAIL_DISPLAY (display), NULL);
+/* FIXME XXX
        if (!webkit_web_view_has_selection (WEBKIT_WEB_VIEW (display)))
                return NULL;
-
+*/
        web_extension = e_web_view_get_web_extension_proxy (E_WEB_VIEW (display));
        if (web_extension) {
                GVariant *result;
@@ -1945,7 +1947,7 @@ e_mail_display_get_selection_plain_text_sync (EMailDisplay *display)
                                g_variant_new (
                                        "(t)",
                                        webkit_web_view_get_page_id (
-                                               WEBKIT_WEB_VIEW (web_view))),
+                                               WEBKIT_WEB_VIEW (display))),
                                G_DBUS_CALL_FLAGS_NONE,
                                -1,
                                cancellable,
diff --git a/mail/e-mail-display.h b/mail/e-mail-display.h
index 9bd488e..4e39ba6 100644
--- a/mail/e-mail-display.h
+++ b/mail/e-mail-display.h
@@ -89,8 +89,10 @@ GtkAction *  e_mail_display_get_action       (EMailDisplay *display,
                                                 const gchar *action_name);
 void           e_mail_display_set_status       (EMailDisplay *display,
                                                 const gchar *status);
-gchar *                e_mail_display_get_selection_plain_text
-                                               (EMailDisplay *display);
+gchar *                e_mail_display_get_selection_plain_text_sync
+                                               (EMailDisplay *display,
+                                                GCancellable *cancellable,
+                                                GError *error);
 void           e_mail_display_load_images      (EMailDisplay *display);
 void           e_mail_display_set_force_load_images
                                                (EMailDisplay *display,