[evolution/evolution-3-12] Images in contact preview are not shown with webkitgtk3 2.4.x

[Tomas Popela <tpopela src gnome org>]

commit 0b384c96c55fa15f37735802f3598834d6f4f3c9
Author: Tomas Popela <tpopela redhat com>
Date:   Wed Jul 16 13:14:10 2014 +0200

    Images in contact preview are not shown with webkitgtk3 2.4.x
    
    We have to unescape the image uri when running with webkitgtk3 2.4.x and
    not just in versions prior to 2.2.x

 addressbook/gui/widgets/eab-contact-formatter.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/addressbook/gui/widgets/eab-contact-formatter.c b/addressbook/gui/widgets/eab-contact-formatter.c
index f4b24a2..d25a1db 100644
--- a/addressbook/gui/widgets/eab-contact-formatter.c
+++ b/addressbook/gui/widgets/eab-contact-formatter.c
@@ -398,15 +398,15 @@ render_title_block (EABContactFormatter *formatter,
        } else if (photo && photo->type == E_CONTACT_PHOTO_TYPE_URI && photo->data.uri && *photo->data.uri) {
                gboolean is_local = g_str_has_prefix (photo->data.uri, "file://");
                const gchar *uri = photo->data.uri;
-               /* WebKit 2.2 doesn't re-escape URIs, thus do this only for versions before this */
-               #if !WEBKIT_CHECK_VERSION(2,2,0)
+               /* WebKit 2.2.x doesn't re-escape URIs, thus do this for versions before and after this */
+               #if !(WEBKIT_MAJOR_VERSION == 2 && WEBKIT_MINOR_VERSION == 2)
                gchar *unescaped = g_uri_unescape_string (photo->data.uri, NULL);
                uri = unescaped;
                #endif
                g_string_append_printf (
                        buffer, "<img border=\"1\" src=\"%s%s\">",
                        is_local ? "evo-" : "", uri);
-               #if !WEBKIT_CHECK_VERSION(2,2,0)
+               #if !(WEBKIT_MAJOR_VERSION == 2 && WEBKIT_MINOR_VERSION == 2)
                g_free (unescaped);
                #endif
        }
@@ -879,8 +879,8 @@ render_compact (EABContactFormatter *formatter,
                        photo->data.uri && *photo->data.uri) {
                        gboolean is_local = g_str_has_prefix (photo->data.uri, "file://");
                        const gchar *uri = photo->data.uri;
-                       /* WebKit 2.2 doesn't re-escape URIs, thus do this only for versions before this */
-                       #if !WEBKIT_CHECK_VERSION(2,2,0)
+                       /* WebKit 2.2.x doesn't re-escape URIs, thus do this for versions before and after 
this */
+                       #if !(WEBKIT_MAJOR_VERSION == 2 && WEBKIT_MINOR_VERSION == 2)
                        gchar *unescaped = g_uri_unescape_string (photo->data.uri, NULL);
                        uri = unescaped;
                        #endif
@@ -889,7 +889,7 @@ render_compact (EABContactFormatter *formatter,
                                "<img width=\"%d\" height=\"%d\" src=\"%s%s\">",
                                calced_width, calced_height,
                                is_local ? "evo-" : "", uri);
-                       #if !WEBKIT_CHECK_VERSION(2,2,0)
+                       #if !(WEBKIT_MAJOR_VERSION == 2 && WEBKIT_MINOR_VERSION == 2)
                        g_free (unescaped);
                        #endif
                } else {