[evolution/webkit] EWebView: Fix icon retrieval when showing EAlerts.



commit d4679501e958e99bba06bbe689836153719fc51c
Author: Matthew Barnes <mbarnes redhat com>
Date:   Wed Apr 13 12:07:53 2011 -0400

    EWebView: Fix icon retrieval when showing EAlerts.
    
    Need to convert the icon filename to a URI for use in <img> tags.

 widgets/misc/e-web-view.c |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)
---
diff --git a/widgets/misc/e-web-view.c b/widgets/misc/e-web-view.c
index 2a3d691..75fbebb 100644
--- a/widgets/misc/e-web-view.c
+++ b/widgets/misc/e-web-view.c
@@ -1123,8 +1123,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);
 
@@ -1160,6 +1163,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 (
@@ -1191,7 +1202,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));
 
@@ -1209,6 +1220,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



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