callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

EABContactFormatter: Remove obsolete WebKitGTK code

Browse Source 
The URI unescape is not needed to be done now (with WebKitGTK 2.28 and 2.30),
just the opposite, it breaks image rendering in some cases, thus remove
the code.
This commit is contained in:
Milan Crha
2021-01-07 12:30:23 +01:00
parent a457b9f06a
commit 2158bc3783
1 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/addressbook/gui/widgets/eab-contact-formatter.c
View File

@ -558,17 +558,10 @@ render_title_block (EABContactFormatter *formatter,
} else if (photo && photo->type == E_CONTACT_PHOTO_TYPE_URI && photo->data.uri && *photo->data.uri) { } 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://"); gboolean is_local = g_str_has_prefix (photo->data.uri, "file://");
const gchar *uri = photo->data.uri; const gchar *uri = photo->data.uri;
/* 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 (uri, NULL);
uri = unescaped;
#endif
g_string_append_printf ( g_string_append_printf (
buffer, "<img id=\"__evo-contact-photo\" border=\"1\" src=\"%s%s\">", buffer, "<img id=\"__evo-contact-photo\" border=\"1\" src=\"%s%s\">",
is_local ? "evo-" : "", uri); is_local ? "evo-" : "", uri);
#if !(WEBKIT_MAJOR_VERSION == 2 && WEBKIT_MINOR_VERSION == 2)
g_free (unescaped);
#endif
} }
if (photo) if (photo)
@ -1242,19 +1235,12 @@ render_compact (EABContactFormatter *formatter,
photo->data.uri && *photo->data.uri) { photo->data.uri && *photo->data.uri) {
gboolean is_local = g_str_has_prefix (photo->data.uri, "file://"); gboolean is_local = g_str_has_prefix (photo->data.uri, "file://");
const gchar *uri = photo->data.uri; const gchar *uri = photo->data.uri;
/* 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 (uri, NULL);
uri = unescaped;
#endif
g_string_append_printf ( g_string_append_printf (
buffer, buffer,
"<img id=\"__evo-contact-photo\" width=\"%dpx\" height=\"%dpx\" src=\"%s%s\">", "<img id=\"__evo-contact-photo\" width=\"%dpx\" height=\"%dpx\" src=\"%s%s\">",
calced_width, calced_height, calced_width, calced_height,
is_local ? "evo-" : "", uri); is_local ? "evo-" : "", uri);
#if !(WEBKIT_MAJOR_VERSION == 2 && WEBKIT_MINOR_VERSION == 2)
g_free (unescaped);
#endif
} else { } else {
gchar *photo_data; gchar *photo_data;