[git] GpgOL - branch, master, updated. gpgol-2.0.1-9-g74cf5f1

[by Andre Heinecke]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG extension for MS Outlook".

The branch, master has been updated
       via  74cf5f10861c8a6acc3abab4e5b0befc6a8ef791 (commit)
      from  c499ce50aa9f1e9fe85549e82d0e799aa7de0134 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 74cf5f10861c8a6acc3abab4e5b0befc6a8ef791
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Nov 15 14:05:28 2017 +0100

    Return correct charset for html
    
    * src/parsecontroller.cpp (get_html_charset): Do it.
    
    --
    No comment.
    
    GnuPG-Bug-Id: T3455

diff --git a/src/parsecontroller.cpp b/src/parsecontroller.cpp
index c93c173..3754001 100644
--- a/src/parsecontroller.cpp
+++ b/src/parsecontroller.cpp
@@ -418,7 +418,7 @@ ParseController::get_html_charset() const
 {
   if (m_outputprovider)
     {
-      return m_outputprovider->get_body_charset();
+      return m_outputprovider->get_html_charset();
     }
   else
     {

-----------------------------------------------------------------------

Summary of changes:
 src/parsecontroller.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
GnuPG extension for MS Outlook
http://git.gnupg.org