mirror of
git://slackware.nl/current.git
synced 2024-12-31 10:28:29 +01:00
8b5c0b991d
l/SDL2-2.0.10-x86_64-1.txz: Upgraded. l/gmime-3.2.3-x86_64-1.txz: Upgraded. Shared library .so-version bump. n/NetworkManager-1.18.2-x86_64-1.txz: Upgraded. n/dhcpcd-8.0.1-x86_64-1.txz: Upgraded. n/openldap-client-2.4.48-x86_64-1.txz: Upgraded. xap/pan-0.145-x86_64-2.txz: Rebuilt. Recompiled against gmime-3.2.3.
33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
Diff
From ddcd5761075a6fb3ef7b768f004fa1e6663cb65e Mon Sep 17 00:00:00 2001
|
|
From: Detlef Graef <detlef.graef@yahoo.de>
|
|
Date: Fri, 26 Apr 2019 20:50:09 +0200
|
|
Subject: [PATCH] Revert "Attempt to fix issue #77; segfault when build with
|
|
gmime-3"
|
|
|
|
This reverts commit 50f6c43a698dcc0ba6b490c086a73eeedbdd8a80.
|
|
---
|
|
pan/general/utf8-utils.cc | 5 +----
|
|
1 file changed, 1 insertion(+), 4 deletions(-)
|
|
|
|
diff --git a/pan/general/utf8-utils.cc b/pan/general/utf8-utils.cc
|
|
index 58565cf..be79a13 100644
|
|
--- a/pan/general/utf8-utils.cc
|
|
+++ b/pan/general/utf8-utils.cc
|
|
@@ -135,16 +135,13 @@ pan :: header_to_utf8 (const StringView & header,
|
|
const char * fallback_charset1,
|
|
const char * fallback_charset2)
|
|
{
|
|
-
|
|
- GMimeParserOptions *gmpo = g_mime_parser_options_new();
|
|
std::string s = content_to_utf8 (header, fallback_charset1, fallback_charset2);
|
|
if (header.strstr ("=?")) {
|
|
- char * decoded (g_mime_utils_header_decode_text (gmpo, s.c_str()));
|
|
+ char * decoded (g_mime_utils_header_decode_text (NULL, s.c_str()));
|
|
s = clean_utf8 (decoded);
|
|
g_free (decoded);
|
|
}
|
|
return s;
|
|
- g_mime_parser_options_free (gmpo);
|
|
}
|
|
|
|
#else
|