aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Vrátil <dvratil@redhat.com>2012-05-03 17:58:14 +0800
committerDan Vrátil <dvratil@redhat.com>2012-05-03 17:58:49 +0800
commit55a83bbbaa1e78363f3c631f9f92b86c87ed80b5 (patch)
treec163538dd54ad53db1a989afb48b5b5590db7899
parenta59e6b170897945a4f73a827de6e8fb1cfc987e0 (diff)
downloadgsoc2013-evolution-55a83bbbaa1e78363f3c631f9f92b86c87ed80b5.tar
gsoc2013-evolution-55a83bbbaa1e78363f3c631f9f92b86c87ed80b5.tar.gz
gsoc2013-evolution-55a83bbbaa1e78363f3c631f9f92b86c87ed80b5.tar.bz2
gsoc2013-evolution-55a83bbbaa1e78363f3c631f9f92b86c87ed80b5.tar.lz
gsoc2013-evolution-55a83bbbaa1e78363f3c631f9f92b86c87ed80b5.tar.xz
gsoc2013-evolution-55a83bbbaa1e78363f3c631f9f92b86c87ed80b5.tar.zst
gsoc2013-evolution-55a83bbbaa1e78363f3c631f9f92b86c87ed80b5.zip
Bug #675347 - No 'Retrieving message...' in preview panel
-rw-r--r--mail/e-mail-reader.c1
-rw-r--r--widgets/misc/e-web-view.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index 58aaa307ef..9106e4f9ab 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -2813,6 +2813,7 @@ mail_reader_message_selected_timeout_cb (EMailReader *reader)
gchar *string;
string = g_strdup_printf (_("Retrieving message '%s'"), cursor_uid);
+ e_mail_display_set_formatter (display, NULL);
e_mail_display_set_status (display, string);
g_free (string);
diff --git a/widgets/misc/e-web-view.c b/widgets/misc/e-web-view.c
index 55d4bd96e0..2c92a39274 100644
--- a/widgets/misc/e-web-view.c
+++ b/widgets/misc/e-web-view.c
@@ -1132,7 +1132,7 @@ web_view_load_string (EWebView *web_view,
webkit_web_view_load_string (
WEBKIT_WEB_VIEW (web_view),
- string, "text/html", "UTF-8", "file://");
+ string, "text/html", "UTF-8", "evo-file:///");
}
static void
@@ -1162,7 +1162,7 @@ web_view_frame_load_string (EWebView *web_view,
if (frame)
webkit_web_frame_load_string (
- frame, string, "text/html", "UTF-8", "file://");
+ frame, string, "text/html", "UTF-8", "evo-file:///");
}
}