[evolution/wip-webkit2] Pass Web Extension to DOM bindings method in EMailPart



commit 3df2e6010783ffb77ab7a4005d7de3c0a26d0676
Author: Tomas Popela <tpopela redhat com>
Date:   Wed Oct 30 09:20:00 2013 +0100

    Pass Web Extension to DOM bindings method in EMailPart

 em-format/e-mail-part-headers.c           |    6 +-----
 em-format/e-mail-part.c                   |    4 +++-
 em-format/e-mail-part.h                   |    1 +
 mail/e-mail-display.c                     |    2 +-
 modules/itip-formatter/e-mail-part-itip.c |    1 +
 5 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/em-format/e-mail-part-headers.c b/em-format/e-mail-part-headers.c
index 005e4ec..0d33d08 100644
--- a/em-format/e-mail-part-headers.c
+++ b/em-format/e-mail-part-headers.c
@@ -215,12 +215,9 @@ mail_part_headers_constructed (GObject *object)
 
 static void
 mail_part_headers_bind_dom_element (EMailPart *part,
+                                    GDBusProxy *web_extension,
                                     const gchar *element_id)
 {
-       /*FIXME XXX Get the proxy here
-       GDBusProxy *web_extension;
-
-       web_extension = e_web_view_get_web_extension_proxy (web_view);
        if (web_extension) {
                GVariant *result;
 
@@ -240,7 +237,6 @@ mail_part_headers_bind_dom_element (EMailPart *part,
                if (result)
                        g_variant_unref (result);
        }
-       */
 }
 
 static void
diff --git a/em-format/e-mail-part.c b/em-format/e-mail-part.c
index fef4504..f6e02ff 100644
--- a/em-format/e-mail-part.c
+++ b/em-format/e-mail-part.c
@@ -488,17 +488,19 @@ e_mail_part_set_is_attachment (EMailPart *part,
 
 void
 e_mail_part_bind_dom_element (EMailPart *part,
+                              GDBusProxy *web_extension,
                               const gchar *element_id)
 {
        EMailPartClass *class;
 
        g_return_if_fail (E_IS_MAIL_PART (part));
+       g_return_if_fail (web_extension);
        g_return_if_fail (element_id && *element_id);
 
        class = E_MAIL_PART_GET_CLASS (part);
 
        if (class->bind_dom_element != NULL)
-               class->bind_dom_element (part, element_id);
+               class->bind_dom_element (part, web_extension, element_id);
 }
 
 static EMailPartValidityPair *
diff --git a/em-format/e-mail-part.h b/em-format/e-mail-part.h
index 2325fec..b306b48 100644
--- a/em-format/e-mail-part.h
+++ b/em-format/e-mail-part.h
@@ -87,6 +87,7 @@ struct _EMailPartClass {
        GObjectClass parent_class;
 
        void            (*bind_dom_element)     (EMailPart *part,
+                                                GDBusProxy *web_extension,
                                                 const gchar *element_id);
 };
 
diff --git a/mail/e-mail-display.c b/mail/e-mail-display.c
index 3f05ec4..6720f1f 100644
--- a/mail/e-mail-display.c
+++ b/mail/e-mail-display.c
@@ -905,7 +905,7 @@ mail_parts_bind_dom (WebKitWebView *web_view,
                }
 
                if (element_exists)
-                       e_mail_part_bind_dom_element (part, part_id);
+                       e_mail_part_bind_dom_element (part, web_extension, part_id);
        }
 
        while (!g_queue_is_empty (&queue))
diff --git a/modules/itip-formatter/e-mail-part-itip.c b/modules/itip-formatter/e-mail-part-itip.c
index cd58929..cc070fb 100644
--- a/modules/itip-formatter/e-mail-part-itip.c
+++ b/modules/itip-formatter/e-mail-part-itip.c
@@ -77,6 +77,7 @@ mail_part_itip_finalize (GObject *object)
 
 static void
 mail_part_itip_bind_dom_element (EMailPart *part,
+                                 GDBusProxy *evolution_web_extension,
                                  const gchar *element_id)
 {
        ItipView *view;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]