[evolution] Distinguish "attachment-wrapper" elements from attachments.

[Matthew Barnes <mbarnes src gnome org>]

commit 2d251a9597311d4eaaa73556c2c72af5fe62a86e
Author: Matthew Barnes <mbarnes redhat com>
Date:   Wed May 29 06:57:14 2013 -0400

    Distinguish "attachment-wrapper" elements from attachments.
    
    The HTML for attachments always has the following form:
    
    <div class="attachment-wrapper" id="something" style="display: block;">
      <actual attachment element>
    </div>
    
    The <div> element controls attachment visibility through its "display"
    style attribute, which is either "block" or "none".
    
    Problem is the <actual attachment element> was getting the same ID as
    its parent <div> element.  So when either element was requested by ID,
    in certain cases the wrong element was returned and caused misbehavior
    and console warnings.
    
    Solve this by adding a "wrapper" suffix to the <div> element ID.  So in
    the example above, id="something" gets the <actual attachment element>,
    whereas id="something.wrapper" gets the <div> element.

 em-format/e-mail-formatter-attachment.c |    8 +++++++-
 mail/e-mail-display.c                   |   28 ++++++++++++++++------------
 2 files changed, 23 insertions(+), 13 deletions(-)
---
diff --git a/em-format/e-mail-formatter-attachment.c b/em-format/e-mail-formatter-attachment.c
index 50fbe84..9e44901 100644
--- a/em-format/e-mail-formatter-attachment.c
+++ b/em-format/e-mail-formatter-attachment.c
@@ -316,10 +316,15 @@ emfe_attachment_format (EMailFormatterExtension *extension,
                }
 
                if (success) {
+                       gchar *wrapper_element_id;
+
+                       wrapper_element_id = g_strconcat (
+                               attachment_part_id, ".wrapper", NULL);
+
                        str = g_strdup_printf (
                                "<tr><td colspan=\"2\">"
                                "<div class=\"attachment-wrapper\" id=\"%s\">",
-                               attachment_part_id);
+                               wrapper_element_id);
 
                        camel_stream_write_string (
                                stream, str, cancellable, NULL);
@@ -333,6 +338,7 @@ emfe_attachment_format (EMailFormatterExtension *extension,
                        camel_stream_write_string (
                                stream, "</div></td></tr>", cancellable, NULL);
 
+                       g_free (wrapper_element_id);
                        g_free (str);
                }
 
diff --git a/mail/e-mail-display.c b/mail/e-mail-display.c
index a809d23..ac9eda0 100644
--- a/mail/e-mail-display.c
+++ b/mail/e-mail-display.c
@@ -702,8 +702,9 @@ attachment_button_expanded (GObject *object,
        WebKitDOMDocument *document;
        WebKitDOMElement *element;
        WebKitDOMCSSStyleDeclaration *css;
+       const gchar *attachment_part_id;
+       gchar *element_id;
        gboolean expanded;
-       gchar *id;
 
        d (
                printf ("Attachment button %s has been %s!\n",
@@ -715,8 +716,11 @@ attachment_button_expanded (GObject *object,
                gtk_widget_get_visible (GTK_WIDGET (button));
 
        document = webkit_web_view_get_dom_document (WEBKIT_WEB_VIEW (display));
-       element = find_element_by_id (
-               document, g_object_get_data (object, "attachment_id"));
+       attachment_part_id = g_object_get_data (object, "attachment_id");
+
+       element_id = g_strconcat (attachment_part_id, ".wrapper", NULL);
+       element = find_element_by_id (document, element_id);
+       g_free (element_id);
 
        if (!WEBKIT_DOM_IS_ELEMENT (element)) {
                d (
@@ -731,16 +735,12 @@ attachment_button_expanded (GObject *object,
        webkit_dom_css_style_declaration_set_property (
                css, "display", expanded ? "block" : "none", "", NULL);
 
-       id = g_strconcat (
-               g_object_get_data (object, "attachment_id"),
-               ".iframe", NULL);
-       element = find_element_by_id (document, id);
-       g_free (id);
+       element_id = g_strconcat (attachment_part_id, ".iframe", NULL);
+       element = find_element_by_id (document, element_id);
+       g_free (element_id);
 
        if (!WEBKIT_DOM_IS_HTML_IFRAME_ELEMENT (element)) {
-               d (
-                       printf ("%s: No <iframe> found\n",
-                       (gchar *) g_object_get_data (object, "attachment_id")));
+               d (printf ("%s: No <iframe> found\n", attachment_part_id));
                return;
        }
        bind_iframe_content_visibility (element, display, button);
@@ -924,6 +924,7 @@ mail_display_plugin_widget_requested (WebKitWebView *web_view,
                WebKitDOMDocument *document;
                EMailPartAttachment *empa = (EMailPartAttachment *) part;
                gchar *attachment_part_id;
+               gchar *wrapper_element_id;
 
                if (empa->attachment_view_part_id)
                        attachment_part_id = empa->attachment_view_part_id;
@@ -934,7 +935,10 @@ mail_display_plugin_widget_requested (WebKitWebView *web_view,
                 * the content of the attachment (iframe). */
                document = webkit_web_view_get_dom_document (
                        WEBKIT_WEB_VIEW (display));
-               attachment = find_element_by_id (document, attachment_part_id);
+               wrapper_element_id = g_strconcat (
+                       attachment_part_id, ".wrapper", NULL);
+               attachment = find_element_by_id (document, wrapper_element_id);
+               g_free (wrapper_element_id);
 
                /* None found? Attachment cannot be expanded */
                if (attachment == NULL) {