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

EWebView: Fix icon retrieval when showing EAlerts.

Browse Source 
Need to convert the icon filename to a URI for use in <img> tags.
This commit is contained in:
Matthew Barnes
2011-04-13 12:07:53 -04:00
parent 230d74c464
commit ae436d4fdc
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
widgets/misc/e-web-view.c
View File

@ -1064,8 +1064,11 @@ web_view_submit_alert (EAlertSink *alert_sink,
GtkWidget *dialog;
GString *buffer;
const gchar *icon_name = NULL;
const gchar *filename;
gpointer parent;
gchar *icon_uri;
gint size = 0;
GError *error = NULL;
web_view = E_WEB_VIEW (alert_sink);
@ -1101,6 +1104,14 @@ web_view_submit_alert (EAlertSink *alert_sink,
icon_name, size, GTK_ICON_LOOKUP_NO_SVG);
g_return_if_fail (icon_info != NULL);
filename = gtk_icon_info_get_filename (icon_info);
icon_uri = g_filename_to_uri (filename, NULL, &error);
if (error != NULL) {
g_warning ("%s", error->message);
g_clear_error (&error);
}
buffer = g_string_sized_new (512);
g_string_append (
@ -1132,7 +1143,7 @@ web_view_submit_alert (EAlertSink *alert_sink,
"%s"
"</td>"
"</tr>",
gtk_icon_info_get_filename (icon_info),
icon_uri,
e_alert_get_primary_text (alert),
e_alert_get_secondary_text (alert));
@ -1150,6 +1161,7 @@ web_view_submit_alert (EAlertSink *alert_sink,
g_string_free (buffer, TRUE);
gtk_icon_info_free (icon_info);
g_free (icon_uri);
}
static void