[evolution] I#847 - Make it easier to load remote content

[Milan Crha <mcrha src gnome org>]

commit cf4788c6a33eb63a6aa63f6a8c356e6738544c4d
Author: Milan Crha <mcrha redhat com>
Date:   Fri Sep 11 08:51:15 2020 +0200

    I#847 - Make it easier to load remote content
    
    Closes https://gitlab.gnome.org/GNOME/evolution/-/issues/847

 data/ui/evolution-mail-reader.ui         | 3 ++-
 src/em-format/e-mail-formatter-headers.c | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/data/ui/evolution-mail-reader.ui b/data/ui/evolution-mail-reader.ui
index 063f934335..a057c05cbb 100644
--- a/data/ui/evolution-mail-reader.ui
+++ b/data/ui/evolution-mail-reader.ui
@@ -1,4 +1,4 @@
-<ui evolution-ui-version="1.0">
+<ui evolution-ui-version="1.1">
   <accelerator action='mail-smart-backward'/>
   <accelerator action='mail-smart-forward'/>
 
@@ -159,6 +159,7 @@
       <toolitem action='mail-mark-junk'/>
       <toolitem action='mail-mark-notjunk'/>
       <toolitem action='mail-archive'/>
+      <toolitem action='mail-load-images'/>
     </placeholder>
     <separator/>
     <placeholder name='mail-toolbar-navigation'>
diff --git a/src/em-format/e-mail-formatter-headers.c b/src/em-format/e-mail-formatter-headers.c
index 31adc0e2a0..480597514d 100644
--- a/src/em-format/e-mail-formatter-headers.c
+++ b/src/em-format/e-mail-formatter-headers.c
@@ -144,7 +144,7 @@ format_short_headers (EMailFormatter *formatter,
 
        g_string_append (buffer, "<td align=\"right\" valign=\"top\">");
        g_string_append_printf (buffer,
-               "<img src=\"gtk-stock://dialog-information/?size=%d\" width=\"%dpx\" height=\"%dpx\""
+               "<img src=\"gtk-stock://image-x-generic/?size=%d\" width=\"%dpx\" height=\"%dpx\""
                " id=\"__evo-remote-content-img-small\" class=\"__evo-remote-content-img\" title=\"%s\" 
style=\"cursor:pointer;\" hidden/>",
                GTK_ICON_SIZE_MENU, icon_width, icon_height,
                _("Remote content download had been blocked for this message."));
@@ -508,7 +508,7 @@ format_full_headers (EMailFormatter *formatter,
 
        g_string_append (buffer, "<td align=\"right\" valign=\"top\">");
        g_string_append_printf (buffer,
-               "<img src=\"gtk-stock://dialog-information/?size=%d\" width=\"%dpx\" height=\"%dpx\""
+               "<img src=\"gtk-stock://image-x-generic/?size=%d\" width=\"%dpx\" height=\"%dpx\""
                " id=\"__evo-remote-content-img-large\" class=\"__evo-remote-content-img\" title=\"%s\" 
style=\"cursor:pointer;\" hidden/>",
                GTK_ICON_SIZE_LARGE_TOOLBAR, icon_width, icon_height,
                _("Remote content download had been blocked for this message."));