From 495bfb2eb9228b5b5cef8b50e11af577e4b473f8 Mon Sep 17 00:00:00 2001
From: Detlef Graef <detlef.graef@yahoo.de>
Date: Sun, 5 Jul 2020 08:47:54 +0200
Subject: [PATCH 01/14] Fix for GMime3 build (Posting error). Issues #103 and
 #114

---
 pan/gui/post-ui.cc | 176 ++++++++++++++++++++++++++++++++-------------
 1 file changed, 126 insertions(+), 50 deletions(-)

diff --git a/pan/gui/post-ui.cc b/pan/gui/post-ui.cc
index 8769ec5..eb21384 100644
--- a/pan/gui/post-ui.cc
+++ b/pan/gui/post-ui.cc
@@ -1598,86 +1598,178 @@ namespace
 GMimeMessage*
 PostUI :: new_message_from_ui (Mode mode, bool copy_body)
 {
+#ifdef HAVE_GMIME_30
 
   GMimeMessage * msg(0);
-  msg = g_mime_message_new (false);
+  msg = g_mime_message_new (true);
+  const char * charset_cstr = _charset.c_str();
 
   // headers from the ui: From
   const Profile profile (get_current_profile ());
   std::string s;
   profile.get_from_header (s);
-#ifdef HAVE_GMIME_30
-  g_mime_message_add_mailbox (msg, GMIME_ADDRESS_TYPE_SENDER, NULL, s.c_str());
+  g_mime_message_add_mailbox (msg, GMIME_ADDRESS_TYPE_FROM, profile.username.c_str(), profile.address.c_str());
+
+  // headers from the ui: Subject
+  const char * cpch (gtk_entry_get_text (GTK_ENTRY(_subject_entry)));
+  if (cpch) {
+    g_mime_message_set_subject (msg, cpch, charset_cstr);
+  }
+
+  // headers from the ui: To
+  const StringView to (gtk_entry_get_text (GTK_ENTRY(_to_entry)));
+  if (!to.empty())
+    pan_g_mime_message_add_recipients_from_string (msg, GMIME_ADDRESS_TYPE_TO, to.str);
+
+  // headers from the ui: Newsgroups
+  const StringView groups (gtk_entry_get_text (GTK_ENTRY(_groups_entry)));
+  if (!groups.empty())
+    g_mime_object_set_header ((GMimeObject *) msg, "Newsgroups", groups.str, charset_cstr);
+
+  // headers from the ui: Followup-To
+  const StringView followupto (gtk_entry_get_text (GTK_ENTRY(_followupto_entry)));
+  if (!followupto.empty())
+    g_mime_object_set_header ((GMimeObject *) msg, "Followup-To", followupto.str, charset_cstr);
+
+  // headers from the ui: Reply-To
+  const StringView replyto (gtk_entry_get_text (GTK_ENTRY(_replyto_entry)));
+  if (!replyto.empty())
+    g_mime_object_set_header ((GMimeObject *) msg, "Reply-To", replyto.str, charset_cstr);
+
+  // headers from posting profile(via prefs): X-Face
+  if (!profile.xface.empty())
+  {
+    std::string f;
+    f += " " + profile.xface;
+    g_mime_object_set_header ((GMimeObject *) msg, "X-Face", f.c_str(), charset_cstr);
+  }
+
+  // add the 'hidden headers' (references)
+  const gchar * h_key_str;
+  foreach_const (str2str_t, _hidden_headers, it)
+    if ((mode==DRAFTING) || (it->first.find ("X-Draft-")!=0))
+    {
+      h_key_str = it->first.c_str();
+      if ( g_ascii_strncasecmp (h_key_str, "Content", 7) )
+      {
+        g_mime_object_set_header ((GMimeObject *) msg, it->first.c_str(), it->second.c_str(), charset_cstr);
+      }
+    }  
+
+  // build headers from the 'more headers' entry field
+  std::map<std::string,std::string> headers;
+  GtkTextBuffer * buf (_headers_buf);
+  GtkTextIter start, end;
+  gtk_text_buffer_get_bounds (buf, &start, &end);
+  char * pch = gtk_text_buffer_get_text (buf, &start, &end, false);
+  StringView key, val, v(pch);
+  v.trim ();
+  while (v.pop_token (val, '\n') && val.pop_token(key,':')) {
+    key.trim ();
+    val.eat_chars (1);
+    val.trim ();
+    std::string key_str (key.to_string());
+    if (extra_header_is_editable (key, val))
+      g_mime_object_set_header ((GMimeObject *) msg, key.to_string().c_str(),
+                                val.to_string().c_str(), charset_cstr);
+  }
+  g_free (pch);
+
+  // User-Agent
+  if ((mode==POSTING || mode == UPLOADING) && _prefs.get_flag (USER_AGENT_PREFS_KEY, true))
+    g_mime_object_set_header ((GMimeObject *) msg, "User-Agent", get_user_agent(), charset_cstr);
+
+  // Message-ID for single text-only posts
+  if (mode==DRAFTING || ((mode==POSTING || mode==UPLOADING) && _prefs.get_flag (MESSAGE_ID_PREFS_KEY, false))) {
+    const std::string message_id = generate_message_id(profile);
+    pan_g_mime_message_set_message_id (msg, message_id.c_str());
+  }
+
+  // body & charset
+  {
+    std::string body;
+    if (copy_body) body = get_body();
+
+    GMimeStream *  stream =  g_mime_stream_mem_new_with_buffer (body.c_str(), body.size());
+
+    const std::string charset ((mode==POSTING && !_charset.empty()) ? _charset : "UTF-8");
+    if (charset != "UTF-8") {
+      // add a wrapper to convert from UTF-8 to $charset
+      GMimeStream * tmp = g_mime_stream_filter_new (stream);
+      g_object_unref (stream);
+      GMimeFilter * filter = g_mime_filter_charset_new ("UTF-8", charset.c_str());
+      g_mime_stream_filter_add (GMIME_STREAM_FILTER(tmp), filter);
+      g_object_unref (filter);
+      stream = tmp;
+    }
+    GMimeDataWrapper * content_object = g_mime_data_wrapper_new_with_stream (stream, GMIME_CONTENT_ENCODING_DEFAULT);
+    g_object_unref (stream);
+    GMimePart * part = g_mime_part_new ();
+    g_mime_part_set_content (part, content_object);
+
+    pch = g_strdup_printf ("text/plain; charset=%s", charset.c_str());
+    GMimeContentType * type = g_mime_content_type_parse (NULL, pch);
+    g_free (pch);
+    g_mime_object_set_content_type ((GMimeObject *) part, type); // part owns type now. type isn't refcounted.
+
+    if (mode != UPLOADING) g_mime_part_set_content_encoding (part, _enc);
+
+    g_object_unref (content_object);
+    g_mime_message_set_mime_part (msg, GMIME_OBJECT(part));
+    g_object_unref (part);
+  }
+
+  return msg;
+
 #else
+
+  GMimeMessage * msg(0);
+  msg = g_mime_message_new (false);
+
+  // headers from the ui: From
+  const Profile profile (get_current_profile ());
+  std::string s;
+  profile.get_from_header (s);
   g_mime_message_set_sender (msg, s.c_str());
-#endif
 
   // headers from the ui: Subject
   const char * cpch (gtk_entry_get_text (GTK_ENTRY(_subject_entry)));
   if (cpch) {
-#ifdef HAVE_GMIME_30
-    g_mime_message_set_subject (msg, cpch, NULL);
-#else
     g_mime_message_set_subject (msg, cpch);
-#endif
   }
 
   // headers from the ui: To
   const StringView to (gtk_entry_get_text (GTK_ENTRY(_to_entry)));
   if (!to.empty())
-#ifdef HAVE_GMIME_30
-    pan_g_mime_message_add_recipients_from_string (msg, GMIME_ADDRESS_TYPE_TO, to.str);
-#else
     pan_g_mime_message_add_recipients_from_string (msg, GMIME_RECIPIENT_TYPE_TO, to.str);
-#endif
 
   // headers from the ui: Newsgroups
   const StringView groups (gtk_entry_get_text (GTK_ENTRY(_groups_entry)));
   if (!groups.empty())
-#ifdef HAVE_GMIME_30
-    g_mime_object_set_header ((GMimeObject *) msg, "Newsgroups", groups.str, NULL);
-#else
     g_mime_object_set_header ((GMimeObject *) msg, "Newsgroups", groups.str);
-#endif
 
   // headers from the ui: Followup-To
   const StringView followupto (gtk_entry_get_text (GTK_ENTRY(_followupto_entry)));
   if (!followupto.empty())
-#ifdef HAVE_GMIME_30
-    g_mime_object_set_header ((GMimeObject *) msg, "Followup-To", followupto.str, NULL);
-#else
     g_mime_object_set_header ((GMimeObject *) msg, "Followup-To", followupto.str);
-#endif
 
   // headers from the ui: Reply-To
   const StringView replyto (gtk_entry_get_text (GTK_ENTRY(_replyto_entry)));
   if (!replyto.empty())
-#ifdef HAVE_GMIME_30
-    g_mime_object_set_header ((GMimeObject *) msg, "Reply-To", replyto.str, NULL);
-#else
     g_mime_object_set_header ((GMimeObject *) msg, "Reply-To", replyto.str);
-#endif
 
   // headers from posting profile(via prefs): X-Face
   if (!profile.xface.empty())
   {
     std::string f;
     f += " " + profile.xface;
-#ifdef HAVE_GMIME_30
-    g_mime_object_set_header ((GMimeObject *) msg, "X-Face", f.c_str(), NULL);
-#else
     g_mime_object_set_header ((GMimeObject *) msg, "X-Face", f.c_str());
-#endif
   }
 
   // add the 'hidden headers'
   foreach_const (str2str_t, _hidden_headers, it)
     if ((mode==DRAFTING) || (it->first.find ("X-Draft-")!=0))
-#ifdef HAVE_GMIME_30
-      g_mime_object_set_header ((GMimeObject *) msg, it->first.c_str(), it->second.c_str(), NULL);
-#else
       g_mime_object_set_header ((GMimeObject *) msg, it->first.c_str(), it->second.c_str());
-#endif
 
   // build headers from the 'more headers' entry field
   std::map<std::string,std::string> headers;
@@ -1693,23 +1785,14 @@ PostUI :: new_message_from_ui (Mode mode, bool copy_body)
     val.trim ();
     std::string key_str (key.to_string());
     if (extra_header_is_editable (key, val))
-#ifdef HAVE_GMIME_30
-      g_mime_object_set_header ((GMimeObject *) msg, key.to_string().c_str(),
-                                val.to_string().c_str(), NULL);
-#else
       g_mime_object_set_header ((GMimeObject *) msg, key.to_string().c_str(),
                                 val.to_string().c_str());
-#endif
   }
   g_free (pch);
 
   // User-Agent
   if ((mode==POSTING || mode == UPLOADING) && _prefs.get_flag (USER_AGENT_PREFS_KEY, true))
-#ifdef HAVE_GMIME_30
-    g_mime_object_set_header ((GMimeObject *) msg, "User-Agent", get_user_agent(), NULL);
-#else
     g_mime_object_set_header ((GMimeObject *) msg, "User-Agent", get_user_agent());
-#endif
 
   // Message-ID for single text-only posts
   if (mode==DRAFTING || ((mode==POSTING || mode==UPLOADING) && _prefs.get_flag (MESSAGE_ID_PREFS_KEY, false))) {
@@ -1738,19 +1821,10 @@ PostUI :: new_message_from_ui (Mode mode, bool copy_body)
     g_object_unref (stream);
     GMimePart * part = g_mime_part_new ();
     pch = g_strdup_printf ("text/plain; charset=%s", charset.c_str());
-
-#ifdef HAVE_GMIME_30
-    GMimeContentType * type = g_mime_content_type_parse (NULL, pch);
-#else
     GMimeContentType * type = g_mime_content_type_new_from_string (pch);
-#endif
     g_free (pch);
     g_mime_object_set_content_type ((GMimeObject *) part, type); // part owns type now. type isn't refcounted.
-#ifdef HAVE_GMIME_30
-    g_mime_part_set_content(part, content_object);
-#else
     g_mime_part_set_content_object (part, content_object);
-#endif
     if (mode != UPLOADING) g_mime_part_set_content_encoding (part, _enc);
     g_object_unref (content_object);
     g_mime_message_set_mime_part (msg, GMIME_OBJECT(part));
@@ -1758,6 +1832,8 @@ PostUI :: new_message_from_ui (Mode mode, bool copy_body)
   }
 
   return msg;
+  
+#endif
 }
 
 void
-- 
GitLab


From 0d775547f0e7cf7529538704814469e1db5496f2 Mon Sep 17 00:00:00 2001
From: Detlef Graef <detlef.graef@yahoo.de>
Date: Sun, 5 Jul 2020 08:54:35 +0200
Subject: [PATCH 02/14] Remove empty line from file posting.xml

---
 pan/data-impl/profiles.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pan/data-impl/profiles.cc b/pan/data-impl/profiles.cc
index e999fda..4053cae 100644
--- a/pan/data-impl/profiles.cc
+++ b/pan/data-impl/profiles.cc
@@ -240,7 +240,7 @@ ProfilesImpl :: serialize (std::ostream& out) const
     }
     out << indent(--depth) << "</profile>\n";
   }
-  out << indent(--depth) << "</profiles>\n\n";
+  out << indent(--depth) << "</profiles>\n";
   out << indent(--depth) << "</posting>\n";
 }
 
-- 
GitLab


From 39ba1ad39b6912a342a99e3a949149348a9c4148 Mon Sep 17 00:00:00 2001
From: Olaf Seibert <rhialto@falu.nl>
Date: Mon, 5 Apr 2021 16:11:49 +0200
Subject: [PATCH 03/14] Take <glib.h> out of extern "C"

and do the same for other <glib/*.h> files.
---
 pan/data-impl/article-filter.cc   | 5 +----
 pan/data-impl/data-impl.cc        | 2 +-
 pan/data-impl/data-io.cc          | 4 ++--
 pan/data-impl/groups.cc           | 2 +-
 pan/data-impl/headers.cc          | 2 +-
 pan/data-impl/profiles.cc         | 4 ++--
 pan/data-impl/server.cc           | 6 ++----
 pan/data/article-cache.cc         | 4 ++--
 pan/data/article-cache.h          | 4 +---
 pan/data/cert-store.cc            | 2 --
 pan/data/encode-cache.cc          | 4 ++--
 pan/data/encode-cache.h           | 4 +---
 pan/general/e-util.cc             | 4 ++--
 pan/general/file-util.cc          | 4 ++--
 pan/general/file-util.h           | 4 ++--
 pan/general/macros.h              | 5 +----
 pan/general/text-match.cc         | 4 ++--
 pan/gui/dl-headers-ui.cc          | 4 ++--
 pan/gui/group-prefs-dialog.cc     | 4 ++--
 pan/gui/group-prefs.cc            | 2 +-
 pan/gui/prefs-file.cc             | 2 +-
 pan/gui/prefs.cc                  | 6 ++----
 pan/gui/server-ui.cc              | 4 ++--
 pan/gui/task-pane.cc              | 4 ++--
 pan/gui/url.cc                    | 6 ++----
 pan/tasks/nntp.cc                 | 6 ++----
 pan/tasks/nzb.cc                  | 4 +---
 pan/tasks/socket-impl-main.cc     | 5 +----
 pan/tasks/socket-impl-openssl.h   | 5 +----
 pan/tasks/socket.cc               | 4 +---
 pan/usenet-utils/filter-info.cc   | 6 ++----
 pan/usenet-utils/message-check.cc | 2 --
 pan/usenet-utils/rules-info.cc    | 6 ++----
 pan/usenet-utils/text-massager.cc | 2 --
 34 files changed, 49 insertions(+), 87 deletions(-)

diff --git a/pan/data-impl/article-filter.cc b/pan/data-impl/article-filter.cc
index b06d0c2..f424738 100644
--- a/pan/data-impl/article-filter.cc
+++ b/pan/data-impl/article-filter.cc
@@ -25,10 +25,7 @@
 #include <gmime/gmime.h>
 
 //#include <glib/gprintf.h>
-extern "C"
-{
-  #include <glib.h>
-}
+#include <glib.h>
 
 #include "article-filter.h"
 
diff --git a/pan/data-impl/data-impl.cc b/pan/data-impl/data-impl.cc
index 88012cc..215be61 100644
--- a/pan/data-impl/data-impl.cc
+++ b/pan/data-impl/data-impl.cc
@@ -24,8 +24,8 @@
 #include <config.h>
 extern "C" {
   #include <glib/gi18n.h>
-  #include <glib.h> // for g_build_filename
 }
+#include <glib.h> // for g_build_filename
 #include <pan/general/debug.h>
 #include <pan/general/file-util.h>
 #include <pan/general/log.h>
diff --git a/pan/data-impl/data-io.cc b/pan/data-impl/data-io.cc
index bea1a90..d938634 100644
--- a/pan/data-impl/data-io.cc
+++ b/pan/data-impl/data-io.cc
@@ -27,9 +27,9 @@ extern "C" {
   #include <sys/types.h> // for chmod
   #include <sys/stat.h> // for chmod
   #include <unistd.h>
-  #include <glib.h>
-  #include <glib/gi18n.h>
 }
+#include <glib.h>
+#include <glib/gi18n.h>
 #include <pan/general/debug.h>
 #include <pan/general/file-util.h>
 #include <pan/general/line-reader.h>
diff --git a/pan/data-impl/groups.cc b/pan/data-impl/groups.cc
index 244feb9..da0183a 100644
--- a/pan/data-impl/groups.cc
+++ b/pan/data-impl/groups.cc
@@ -29,9 +29,9 @@
 #include <vector>
 
 #include <glib.h>
+#include <glib/gi18n.h>
 extern "C" {
   #include <unistd.h>
-  #include <glib/gi18n.h>
 }
 
 #include <pan/general/debug.h>
diff --git a/pan/data-impl/headers.cc b/pan/data-impl/headers.cc
index f8c4466..16d5672 100644
--- a/pan/data-impl/headers.cc
+++ b/pan/data-impl/headers.cc
@@ -25,10 +25,10 @@
 #include <string>
 #include <cmath>
 #include <glib.h>
+#include <glib/gi18n.h>
 extern "C" {
   #include <sys/types.h> // for chmod
   #include <sys/stat.h> // for chmod
-  #include <glib/gi18n.h>
 }
 #include <pan/general/debug.h>
 #include <pan/general/log.h>
diff --git a/pan/data-impl/profiles.cc b/pan/data-impl/profiles.cc
index e999fda..a6e6bb5 100644
--- a/pan/data-impl/profiles.cc
+++ b/pan/data-impl/profiles.cc
@@ -26,9 +26,9 @@
 extern "C" {
   #include <sys/types.h> // for chmod
   #include <sys/stat.h> // for chmod
-  #include <glib.h>
-  #include <glib/gi18n.h>
 }
+#include <glib.h>
+#include <glib/gi18n.h>
 #include <pan/general/debug.h>
 #include <pan/general/string-view.h>
 #include <pan/general/file-util.h>
diff --git a/pan/data-impl/server.cc b/pan/data-impl/server.cc
index 9ea55d4..b23782f 100644
--- a/pan/data-impl/server.cc
+++ b/pan/data-impl/server.cc
@@ -25,10 +25,8 @@
 #include <map>
 #include <set>
 #include <vector>
-extern "C" {
-  #include <glib.h> // for GMarkup
-  #include <glib/gi18n.h>
-}
+#include <glib.h> // for GMarkup
+#include <glib/gi18n.h>
 #include <pan/general/debug.h>
 #include <pan/general/file-util.h>
 #include <pan/general/log.h>
diff --git a/pan/data/article-cache.cc b/pan/data/article-cache.cc
index 1855153..2b97344 100644
--- a/pan/data/article-cache.cc
+++ b/pan/data/article-cache.cc
@@ -27,10 +27,10 @@ extern "C"
   #include <unistd.h>
   #include <dirent.h>
 
-  #include <glib.h>
-  #include <glib/gi18n.h>
   #include <gmime/gmime.h>
 }
+#include <glib.h>
+#include <glib/gi18n.h>
 
 #include <pan/general/debug.h>
 #include <pan/general/file-util.h>
diff --git a/pan/data/article-cache.h b/pan/data/article-cache.h
index 2ac722b..1304bfe 100644
--- a/pan/data/article-cache.h
+++ b/pan/data/article-cache.h
@@ -22,9 +22,7 @@
 
 #include <map>
 #include <vector>
-extern "C" {
-  #include <glib.h> // for guint64
-}
+#include <glib.h> // for guint64
 #include <pan/general/string-view.h>
 #include <pan/general/quark.h>
 
diff --git a/pan/data/cert-store.cc b/pan/data/cert-store.cc
index 340fc8b..f6cd46e 100644
--- a/pan/data/cert-store.cc
+++ b/pan/data/cert-store.cc
@@ -34,10 +34,8 @@
 #include <iostream>
 #include <string>
 
-extern "C" {
 #include <glib/gi18n.h>
 #include <glib.h>
-}
 
 #include <pan/general/debug.h>
 #include <pan/general/e-util.h>
diff --git a/pan/data/encode-cache.cc b/pan/data/encode-cache.cc
index 3a82ea9..eecd1d1 100644
--- a/pan/data/encode-cache.cc
+++ b/pan/data/encode-cache.cc
@@ -29,10 +29,10 @@ extern "C"
   #include <unistd.h>
   #include <dirent.h>
 
-  #include <glib.h>
-  #include <glib/gi18n.h>
   #include <gmime/gmime.h>
 }
+#include <glib.h>
+#include <glib/gi18n.h>
 
 #include <pan/general/debug.h>
 #include <pan/general/file-util.h>
diff --git a/pan/data/encode-cache.h b/pan/data/encode-cache.h
index 8bbd530..1affc0c 100644
--- a/pan/data/encode-cache.h
+++ b/pan/data/encode-cache.h
@@ -22,9 +22,7 @@
 
 #include <map>
 #include <vector>
-extern "C" {
-  #include <glib.h> // for guint64
-}
+#include <glib.h> // for guint64
 #include <pan/general/string-view.h>
 #include <pan/general/quark.h>
 
diff --git a/pan/general/e-util.cc b/pan/general/e-util.cc
index af5ccd0..62879ee 100644
--- a/pan/general/e-util.cc
+++ b/pan/general/e-util.cc
@@ -26,9 +26,9 @@
 #include <ctime>
 extern "C" {
   #include <ctype.h>
-  #include <glib.h>
-  #include <glib/gi18n.h>
 }
+#include <glib.h>
+#include <glib/gi18n.h>
 #include "debug.h"
 #include "e-util.h"
 
diff --git a/pan/general/file-util.cc b/pan/general/file-util.cc
index 02e9ed1..9efa269 100644
--- a/pan/general/file-util.cc
+++ b/pan/general/file-util.cc
@@ -27,12 +27,12 @@ extern "C"
   #include <unistd.h>
   #include <sys/stat.h>
   #include <sys/types.h>
-  #include <glib.h>
-  #include <glib/gi18n.h>
   #ifndef G_OS_WIN32
     #include <pwd.h>
   #endif
 }
+#include <glib.h>
+#include <glib/gi18n.h>
 
 #include "debug.h"
 #include "log.h"
diff --git a/pan/general/file-util.h b/pan/general/file-util.h
index c125c8d..8c67639 100644
--- a/pan/general/file-util.h
+++ b/pan/general/file-util.h
@@ -25,9 +25,9 @@
 extern "C" {
   #include <stddef.h>
   #include <stdio.h>
-  #include <glib.h>
-  #include <glib/gstdio.h>
 }
+#include <glib.h>
+#include <glib/gstdio.h>
 #include <pan/general/string-view.h>
 
 #define g_freopen freopen
diff --git a/pan/general/macros.h b/pan/general/macros.h
index 6dcf908..b16230f 100644
--- a/pan/general/macros.h
+++ b/pan/general/macros.h
@@ -63,9 +63,6 @@
 ***  g_assert
 **/
 
-extern "C"
-{
-  #include <glib.h>
-}
+#include <glib.h>
 
 #endif
diff --git a/pan/general/text-match.cc b/pan/general/text-match.cc
index fcacbe2..d390de0 100644
--- a/pan/general/text-match.cc
+++ b/pan/general/text-match.cc
@@ -20,9 +20,9 @@
 #include <config.h>
 extern "C" {
   #include <ctype.h>
-  #include <glib.h>
-  #include <glib/gi18n.h>
 }
+#include <glib.h>
+#include <glib/gi18n.h>
 #include "debug.h"
 #include "log.h"
 #include "text-match.h"
diff --git a/pan/gui/dl-headers-ui.cc b/pan/gui/dl-headers-ui.cc
index 5841651..cfc536d 100644
--- a/pan/gui/dl-headers-ui.cc
+++ b/pan/gui/dl-headers-ui.cc
@@ -18,9 +18,9 @@
  */
 
 #include <config.h>
+#include <glib.h>
+#include <glib/gi18n.h>
 extern "C" {
-  #include <glib.h>
-  #include <glib/gi18n.h>
   #include "gtk-compat.h"
 }
 #include <pan/general/macros.h>
diff --git a/pan/gui/group-prefs-dialog.cc b/pan/gui/group-prefs-dialog.cc
index 677b07a..6983746 100644
--- a/pan/gui/group-prefs-dialog.cc
+++ b/pan/gui/group-prefs-dialog.cc
@@ -18,9 +18,9 @@
  */
 
 #include <config.h>
+#include <glib/gi18n.h>
+#include <glib.h>
 extern "C" {
-  #include <glib/gi18n.h>
-  #include <glib.h>
   #include "gtk-compat.h"
 #ifdef HAVE_GTKSPELL
   #include <enchant/enchant.h>
diff --git a/pan/gui/group-prefs.cc b/pan/gui/group-prefs.cc
index 3e9851b..b06a949 100644
--- a/pan/gui/group-prefs.cc
+++ b/pan/gui/group-prefs.cc
@@ -21,8 +21,8 @@ extern "C" {
   #include <config.h>
   #include <sys/types.h> // chmod
   #include <sys/stat.h> // chmod
-  #include <glib.h>
 }
+#include <glib.h>
 #include <iostream>
 #include <fstream>
 #include <pan/general/file-util.h>
diff --git a/pan/gui/prefs-file.cc b/pan/gui/prefs-file.cc
index bde7ef3..64c540f 100644
--- a/pan/gui/prefs-file.cc
+++ b/pan/gui/prefs-file.cc
@@ -24,8 +24,8 @@
 extern "C" {
   #include <sys/types.h> // for chmod
   #include <sys/stat.h> // for chmod
-  #include <glib.h>
 }
+#include <glib.h>
 #include <pan/general/file-util.h>
 #include "prefs-file.h"
 
diff --git a/pan/gui/prefs.cc b/pan/gui/prefs.cc
index fdbd908..64dd8da 100644
--- a/pan/gui/prefs.cc
+++ b/pan/gui/prefs.cc
@@ -23,10 +23,8 @@
 #include <iostream>
 #include <sstream>
 #include <string>
-extern "C" {
-  #include <glib.h>
-  #include <glib/gi18n.h>
-}
+#include <glib.h>
+#include <glib/gi18n.h>
 #include <pan/general/debug.h>
 #include <pan/general/log.h>
 #include <pan/general/macros.h>
diff --git a/pan/gui/server-ui.cc b/pan/gui/server-ui.cc
index b42bc18..684ea0c 100644
--- a/pan/gui/server-ui.cc
+++ b/pan/gui/server-ui.cc
@@ -21,9 +21,9 @@
 #include <cstdlib>
 #include <cstring>
 #include <climits>
+#include <glib.h>
+#include <glib/gi18n.h>
 extern "C" {
-  #include <glib.h>
-  #include <glib/gi18n.h>
   #include "gtk-compat.h"
 }
 
diff --git a/pan/gui/task-pane.cc b/pan/gui/task-pane.cc
index 4f77922..1c302f9 100644
--- a/pan/gui/task-pane.cc
+++ b/pan/gui/task-pane.cc
@@ -18,9 +18,9 @@
  */
 
 #include <config.h>
+#include <glib.h>
+#include <glib/gi18n.h>
 extern "C" {
-  #include <glib.h>
-  #include <glib/gi18n.h>
   #include "gtk-compat.h"
 }
 #include <pan/general/e-util.h>
diff --git a/pan/gui/url.cc b/pan/gui/url.cc
index e1173ae..94ffb52 100644
--- a/pan/gui/url.cc
+++ b/pan/gui/url.cc
@@ -20,10 +20,8 @@
 #include <config.h>
 #include <iostream>
 #include <string>
-extern "C" {
-  #include <glib.h>
-  #include <glib/gi18n.h>
-};
+#include <glib.h>
+#include <glib/gi18n.h>
 #include <pan/general/log.h>
 #include "url.h"
 
diff --git a/pan/tasks/nntp.cc b/pan/tasks/nntp.cc
index ceb1574..71c5cf1 100644
--- a/pan/tasks/nntp.cc
+++ b/pan/tasks/nntp.cc
@@ -22,10 +22,8 @@
 #include <cstdarg>
 #include <cstdlib> // abort, atoi, strtoul
 #include <cstdio> // snprintf
-extern "C" {
-  #include <glib.h>
-  #include <glib/gi18n.h>
-}
+#include <glib.h>
+#include <glib/gi18n.h>
 #include <pan/general/debug.h>
 #include <pan/general/log.h>
 #include <pan/general/messages.h>
diff --git a/pan/tasks/nzb.cc b/pan/tasks/nzb.cc
index af890e5..14df6f6 100644
--- a/pan/tasks/nzb.cc
+++ b/pan/tasks/nzb.cc
@@ -24,9 +24,7 @@
 #include <sstream>
 #include <string>
 #include <map>
-extern "C" {
-  #include <glib.h>
-}
+#include <glib.h>
 #include <pan/general/debug.h>
 #include <pan/general/file-util.h>
 #include <pan/general/log.h>
diff --git a/pan/tasks/socket-impl-main.cc b/pan/tasks/socket-impl-main.cc
index c33edfd..688183c 100644
--- a/pan/tasks/socket-impl-main.cc
+++ b/pan/tasks/socket-impl-main.cc
@@ -30,10 +30,7 @@
 //#include <glib/giochannel.h>
 //#include <glib/gstring.h>
 
-extern "C"
-{
-  #include <glib.h>
-}
+#include <glib.h>
 
 #include <pan/tasks/socket.h>
 
diff --git a/pan/tasks/socket-impl-openssl.h b/pan/tasks/socket-impl-openssl.h
index e48cbae..eea41d4 100644
--- a/pan/tasks/socket-impl-openssl.h
+++ b/pan/tasks/socket-impl-openssl.h
@@ -27,10 +27,7 @@
 #include <string>
 //#include <glib/giochannel.h>
 //#include <glib/gstring.h>
-extern "C"
-{
-  #include <glib.h>
-}
+#include <glib.h>
 
 #include <pan/general/debug.h>
 #include <pan/general/quark.h>
diff --git a/pan/tasks/socket.cc b/pan/tasks/socket.cc
index 78d53fb..2c7a28d 100644
--- a/pan/tasks/socket.cc
+++ b/pan/tasks/socket.cc
@@ -21,9 +21,7 @@
 #include <cstdarg>
 #include <ctime>
 #include <cmath>
-extern "C" {
-  #include <glib.h>
-}
+#include <glib.h>
 #include <pan/general/debug.h>
 #include <pan/general/string-view.h>
 #include "socket.h"
diff --git a/pan/usenet-utils/filter-info.cc b/pan/usenet-utils/filter-info.cc
index f464428..6b1a5c9 100644
--- a/pan/usenet-utils/filter-info.cc
+++ b/pan/usenet-utils/filter-info.cc
@@ -18,10 +18,8 @@
  */
 
 #include <config.h>
-extern "C" {
-  #include <glib.h>
-  #include <glib/gi18n.h>
-}
+#include <glib.h>
+#include <glib/gi18n.h>
 #include <pan/general/macros.h>
 #include "filter-info.h"
 
diff --git a/pan/usenet-utils/message-check.cc b/pan/usenet-utils/message-check.cc
index a511556..461ce86 100644
--- a/pan/usenet-utils/message-check.cc
+++ b/pan/usenet-utils/message-check.cc
@@ -21,9 +21,7 @@
 #include <ctype.h>
 #include <string.h>
 #include <glib.h>
-extern "C" {
 #include <glib/gi18n.h>
-}
 #include <pan/general/debug.h>
 #include <pan/general/macros.h>
 #include <pan/general/string-view.h>
diff --git a/pan/usenet-utils/rules-info.cc b/pan/usenet-utils/rules-info.cc
index 1c03adc..91e78be 100644
--- a/pan/usenet-utils/rules-info.cc
+++ b/pan/usenet-utils/rules-info.cc
@@ -22,10 +22,8 @@
 
 
 #include <config.h>
-extern "C" {
-  #include <glib.h>
-  #include <glib/gi18n.h>
-}
+#include <glib.h>
+#include <glib/gi18n.h>
 #include <pan/general/macros.h>
 #include "rules-info.h"
 
diff --git a/pan/usenet-utils/text-massager.cc b/pan/usenet-utils/text-massager.cc
index 4fcd8d5..15a818b 100644
--- a/pan/usenet-utils/text-massager.cc
+++ b/pan/usenet-utils/text-massager.cc
@@ -22,9 +22,7 @@
 #include <map>
 #include <cstring>
 #include <glib.h>
-extern "C" {
 #include <glib/gi18n.h>
-}
 #include "text-massager.h"
 #include <pan/general/log.h>
 #include <pan/general/e-util.h>
-- 
GitLab


From af7c6dfb4f97cbc8f95e34abf65fd82f0c76be71 Mon Sep 17 00:00:00 2001
From: Detlef Graef <detlef.graef@gmx.de>
Date: Mon, 14 Jun 2021 17:14:53 +0200
Subject: [PATCH 04/14] Additional fixes for issue #128 when Pan is build with
 some options

---
 pan/data-impl/data-impl.cc  | 4 +---
 pan/data/article-cache.cc   | 4 ++--
 pan/general/line-reader.cc  | 4 +---
 pan/gui/actions.cc          | 7 ++-----
 pan/gui/header-pane.cc      | 5 ++---
 pan/gui/prefs-ui.cc         | 6 ++----
 pan/gui/progress-view.cc    | 4 +---
 pan/gui/save-attach-ui.cc   | 6 ++----
 pan/gui/save-ui.cc          | 6 ++----
 pan/gui/score-add-ui.cc     | 4 +---
 pan/gui/score-view-ui.cc    | 6 ++----
 pan/tasks/task-groups.cc    | 4 +++-
 pan/tasks/task-post.cc      | 4 +---
 pan/tasks/task-xover.cc     | 4 ++--
 pan/tasks/task-xoverinfo.cc | 4 ++--
 15 files changed, 26 insertions(+), 46 deletions(-)

diff --git a/pan/data-impl/data-impl.cc b/pan/data-impl/data-impl.cc
index 215be61..4465966 100644
--- a/pan/data-impl/data-impl.cc
+++ b/pan/data-impl/data-impl.cc
@@ -22,9 +22,7 @@
 **************/
 
 #include <config.h>
-extern "C" {
-  #include <glib/gi18n.h>
-}
+#include <glib/gi18n.h>
 #include <glib.h> // for g_build_filename
 #include <pan/general/debug.h>
 #include <pan/general/file-util.h>
diff --git a/pan/data/article-cache.cc b/pan/data/article-cache.cc
index 2b97344..2130f2d 100644
--- a/pan/data/article-cache.cc
+++ b/pan/data/article-cache.cc
@@ -26,9 +26,9 @@ extern "C"
   #include <sys/stat.h>
   #include <unistd.h>
   #include <dirent.h>
-
-  #include <gmime/gmime.h>
 }
+
+#include <gmime/gmime.h>
 #include <glib.h>
 #include <glib/gi18n.h>
 
diff --git a/pan/general/line-reader.cc b/pan/general/line-reader.cc
index afb9be8..6b80fc4 100644
--- a/pan/general/line-reader.cc
+++ b/pan/general/line-reader.cc
@@ -1,9 +1,7 @@
 #include <config.h>
 #include <cstdio>
 #include <cstdlib>
-extern "C"{ 
-  #include <glib/gi18n.h>
-}
+#include <glib/gi18n.h>
 #include <cerrno>
 #include "file-util.h"
 #include "line-reader.h"
diff --git a/pan/gui/actions.cc b/pan/gui/actions.cc
index 520c08b..706844c 100644
--- a/pan/gui/actions.cc
+++ b/pan/gui/actions.cc
@@ -18,11 +18,8 @@
  */
 
 #include <config.h>
-extern "C" {
-  #include <glib/gi18n.h>
-  #include "gtk-compat.h"
-}
-
+#include <glib/gi18n.h>
+#include "gtk-compat.h"
 #include <pan/general/macros.h>
 #include <pan/general/debug.h>
 #include <pan/data-impl/data-impl.h>
diff --git a/pan/gui/header-pane.cc b/pan/gui/header-pane.cc
index dc65a77..a4a9952 100644
--- a/pan/gui/header-pane.cc
+++ b/pan/gui/header-pane.cc
@@ -19,10 +19,9 @@
 
 extern "C" {
   #include <config.h>
-  #include <glib/gi18n.h>
-  #include "gtk-compat.h"
-  #include "gtk-compat.h"
 }
+#include "gtk-compat.h"
+#include <glib/gi18n.h>
 #include <cctype>
 #include <cmath>
 #include <algorithm>
diff --git a/pan/gui/prefs-ui.cc b/pan/gui/prefs-ui.cc
index f7dc0f0..aac9ec1 100644
--- a/pan/gui/prefs-ui.cc
+++ b/pan/gui/prefs-ui.cc
@@ -18,10 +18,8 @@
  */
 
 #include <config.h>
-extern "C" {
-  #include <glib/gi18n.h>
-  #include "gtk-compat.h"
-}
+#include "gtk-compat.h"
+#include <glib/gi18n.h>
 #include <pan/general/debug.h>
 #include <pan/general/macros.h>
 #include <pan/general/file-util.h>
diff --git a/pan/gui/progress-view.cc b/pan/gui/progress-view.cc
index 241ad1c..43ef4f2 100644
--- a/pan/gui/progress-view.cc
+++ b/pan/gui/progress-view.cc
@@ -18,9 +18,7 @@
  */
 
 #include <config.h>
-extern "C" {
-  #include "gtk-compat.h"
-}
+#include "gtk-compat.h"
 #include <pan/general/string-view.h>
 #include <pan/usenet-utils/mime-utils.h>
 #include "progress-view.h"
diff --git a/pan/gui/save-attach-ui.cc b/pan/gui/save-attach-ui.cc
index 0b08b6f..7082ab8 100644
--- a/pan/gui/save-attach-ui.cc
+++ b/pan/gui/save-attach-ui.cc
@@ -18,10 +18,8 @@
  */
 
 #include <config.h>
-extern "C" {
-  #include <glib/gi18n.h>
-  #include "gtk-compat.h"
-}
+#include <glib/gi18n.h>
+#include "gtk-compat.h"
 #include <pan/general/debug.h>
 #include <pan/general/macros.h>
 #include <pan/icons/pan-pixbufs.h>
diff --git a/pan/gui/save-ui.cc b/pan/gui/save-ui.cc
index 0f034e5..ffa4adb 100644
--- a/pan/gui/save-ui.cc
+++ b/pan/gui/save-ui.cc
@@ -18,10 +18,8 @@
  */
 
 #include <config.h>
-extern "C" {
-  #include <glib/gi18n.h>
-  #include "gtk-compat.h"
-}
+#include <glib/gi18n.h>
+#include "gtk-compat.h"
 #include <pan/general/debug.h>
 #include <pan/general/macros.h>
 #include <pan/icons/pan-pixbufs.h>
diff --git a/pan/gui/score-add-ui.cc b/pan/gui/score-add-ui.cc
index e72bdb5..3b81167 100644
--- a/pan/gui/score-add-ui.cc
+++ b/pan/gui/score-add-ui.cc
@@ -20,9 +20,7 @@
 #include <config.h>
 #include <cassert>
 #include <climits>
-extern "C" {
-  #include <glib/gi18n.h>
-}
+#include <glib/gi18n.h>
 #include <pan/general/debug.h>
 #include <pan/general/text-match.h>
 #include "hig.h"
diff --git a/pan/gui/score-view-ui.cc b/pan/gui/score-view-ui.cc
index d6c81c1..4c8b768 100644
--- a/pan/gui/score-view-ui.cc
+++ b/pan/gui/score-view-ui.cc
@@ -18,10 +18,8 @@
  */
 
 #include <config.h>
-extern "C" {
-  #include <glib/gi18n.h>
-  #include "gtk-compat.h"
-}
+#include <glib/gi18n.h>
+#include "gtk-compat.h"
 #include <pan/general/debug.h>
 #include "pad.h"
 #include "score-add-ui.h"
diff --git a/pan/tasks/task-groups.cc b/pan/tasks/task-groups.cc
index b8618d6..695f27e 100644
--- a/pan/tasks/task-groups.cc
+++ b/pan/tasks/task-groups.cc
@@ -19,10 +19,12 @@
 
 #include <config.h>
 #include <cassert>
+#include <glib/gi18n.h>
+
 extern "C" {
-  #include <glib/gi18n.h>
   #include <stdlib.h>
 }
+
 #include <pan/general/debug.h>
 #include <pan/general/macros.h>
 #include <pan/general/messages.h>
diff --git a/pan/tasks/task-post.cc b/pan/tasks/task-post.cc
index bb80fb9..4ab9c2f 100644
--- a/pan/tasks/task-post.cc
+++ b/pan/tasks/task-post.cc
@@ -18,9 +18,7 @@
  */
 
 #include <config.h>
-extern "C" {
-  #include <glib/gi18n.h>
-}
+#include <glib/gi18n.h>
 #include "task-post.h"
 #include <pan/general/debug.h>
 #include <pan/general/log.h>
diff --git a/pan/tasks/task-xover.cc b/pan/tasks/task-xover.cc
index c3c8260..e905863 100644
--- a/pan/tasks/task-xover.cc
+++ b/pan/tasks/task-xover.cc
@@ -26,10 +26,10 @@ extern "C"
 #define PROTOTYPES
 #include <stdio.h>
 #include <uulib/uudeview.h>
-#include <glib/gi18n.h>
-#include <gmime/gmime-utils.h>
 }
 
+#include <glib/gi18n.h>
+#include <gmime/gmime-utils.h>
 #include <fstream>
 #include <iostream>
 #include <pan/general/debug.h>
diff --git a/pan/tasks/task-xoverinfo.cc b/pan/tasks/task-xoverinfo.cc
index c598bf8..9a9e488 100644
--- a/pan/tasks/task-xoverinfo.cc
+++ b/pan/tasks/task-xoverinfo.cc
@@ -24,10 +24,10 @@ extern "C" {
   #define PROTOTYPES
   #include <stdio.h>
   #include <uulib/uudeview.h>
-  #include <glib/gi18n.h>
-  #include <gmime/gmime-utils.h>
   #include <zlib.h>
 }
+#include <glib/gi18n.h>
+#include <gmime/gmime-utils.h>
 #include <fstream>
 #include <iostream>
 #include <pan/general/debug.h>
-- 
GitLab


From 3b35d8b00702f4a0d57e5ce6a95750d8c0dddb16 Mon Sep 17 00:00:00 2001
From: Detlef Graef <detlef.graef@gmx.de>
Date: Mon, 14 Jun 2021 17:24:19 +0200
Subject: [PATCH 05/14] Fix two compile errors when build with GMime3

---
 pan/usenet-utils/mime-utils.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pan/usenet-utils/mime-utils.cc b/pan/usenet-utils/mime-utils.cc
index 881df7b..1a3f95f 100644
--- a/pan/usenet-utils/mime-utils.cc
+++ b/pan/usenet-utils/mime-utils.cc
@@ -1749,7 +1749,7 @@ namespace pan
 #ifdef HAVE_GMIME_30
     GMimeObject *gmo;
     gmo = g_mime_message_get_mime_part (body);
-    if (g_mime_multipart_signed_sign (gpg_ctx, gmo, uid.c_str(), &err) <0)
+    if (g_mime_multipart_signed_sign (gpg_ctx, gmo, uid.c_str(), &err) != NULL)
 #else
     if (g_mime_multipart_signed_sign (mps, GMIME_OBJECT (part), gpg_ctx, uid.c_str(), GMIME_DIGEST_ALGO_SHA1, &err) <0)
 #endif
@@ -1784,7 +1784,7 @@ namespace pan
 
 #ifdef HAVE_GMIME_30
     if (g_mime_multipart_encrypted_encrypt(gpg_ctx, GMIME_OBJECT (part), sign, uid.c_str(),
-                                           GMIME_ENCRYPT_NONE, rcp, &err) < 0)
+                                           GMIME_ENCRYPT_NONE, rcp, &err) != NULL)
 #else
     if (g_mime_multipart_encrypted_encrypt(mpe, GMIME_OBJECT (part), gpg_ctx, sign,
                                            uid.c_str(), GMIME_DIGEST_ALGO_SHA1, rcp, &err) < 0)
-- 
GitLab


From 552d38380ad2ff09cc3af0690b5589efcbf98429 Mon Sep 17 00:00:00 2001
From: FoxMcCloud45 <foxmccloud45@hotmail.com>
Date: Tue, 6 Jul 2021 23:52:31 +0200
Subject: [PATCH 06/14] X-Face: manual folding for length >72.

---
 pan/gui/post-ui.cc | 8 +++++++-
 pan/gui/post-ui.h  | 3 +++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/pan/gui/post-ui.cc b/pan/gui/post-ui.cc
index 8769ec5..c983f21 100644
--- a/pan/gui/post-ui.cc
+++ b/pan/gui/post-ui.cc
@@ -1662,7 +1662,13 @@ PostUI :: new_message_from_ui (Mode mode, bool copy_body)
   if (!profile.xface.empty())
   {
     std::string f;
-    f += " " + profile.xface;
+    f += profile.xface;
+
+    // GMIME_FOLD_INTERVAL - 8: Accounting for 'X-Face: ' beginning of header
+    for(int i = GMIME_FOLD_INTERVAL - 8; i < f.length(); i += GMIME_FOLD_INTERVAL)
+    {
+      f.insert(i, " ");
+    }
 #ifdef HAVE_GMIME_30
     g_mime_object_set_header ((GMimeObject *) msg, "X-Face", f.c_str(), NULL);
 #else
diff --git a/pan/gui/post-ui.h b/pan/gui/post-ui.h
index c2af707..320b4ea 100644
--- a/pan/gui/post-ui.h
+++ b/pan/gui/post-ui.h
@@ -177,6 +177,9 @@ namespace pan
       virtual void on_queue_task_moved (UploadQueue&, Task&, int new_index, int old_index);
 
     private:
+      /* GMIME: X-Face interval between spaces for proper folding. */
+      enum { GMIME_FOLD_INTERVAL = 72 };
+
       void add_actions (GtkWidget* box);
       void apply_profile_to_body ();
       void apply_profile_to_headers ();
-- 
GitLab


From ad830b072675ea856f98829c0481859347de5476 Mon Sep 17 00:00:00 2001
From: FoxMcCloud45 <foxmccloud45@hotmail.com>
Date: Wed, 7 Jul 2021 00:02:22 +0200
Subject: [PATCH 07/14] Header fix for Arch Linux compilation.

---
 pan/data-impl/article-filter.cc   | 5 +----
 pan/data-impl/data-impl.cc        | 6 ++----
 pan/data-impl/data-io.cc          | 4 ++--
 pan/data-impl/groups.cc           | 2 +-
 pan/data-impl/headers.cc          | 2 +-
 pan/data-impl/profiles.cc         | 4 ++--
 pan/data-impl/server.cc           | 6 ++----
 pan/data-impl/xover.cc            | 2 +-
 pan/data/article-cache.cc         | 4 ++--
 pan/data/cert-store.cc            | 2 --
 pan/data/encode-cache.cc          | 5 +++--
 pan/general/e-util.cc             | 7 +++++--
 pan/general/file-util.cc          | 4 ++--
 pan/general/line-reader.cc        | 4 +---
 pan/general/text-match.cc         | 7 +++++--
 pan/general/utf8-utils.cc         | 2 --
 pan/gui/actions.cc                | 2 +-
 pan/gui/body-pane.cc              | 2 +-
 pan/gui/dl-headers-ui.cc          | 4 ++--
 pan/gui/group-pane.cc             | 2 +-
 pan/gui/group-prefs-dialog.cc     | 4 ++--
 pan/gui/group-prefs.cc            | 2 +-
 pan/gui/gui.cc                    | 2 +-
 pan/gui/header-pane.cc            | 2 +-
 pan/gui/log-ui.cc                 | 2 +-
 pan/gui/pan-file-entry.cc         | 2 +-
 pan/gui/pan.cc                    | 2 +-
 pan/gui/prefs-file.cc             | 2 +-
 pan/gui/prefs-ui.cc               | 2 +-
 pan/gui/prefs.cc                  | 6 ++----
 pan/gui/profiles-dialog.cc        | 2 +-
 pan/gui/progress-view.cc          | 4 +---
 pan/gui/save-attach-ui.cc         | 2 +-
 pan/gui/save-ui.cc                | 2 +-
 pan/gui/score-add-ui.cc           | 4 +---
 pan/gui/score-view-ui.cc          | 2 +-
 pan/gui/server-ui.cc              | 4 ++--
 pan/gui/task-pane.cc              | 4 ++--
 pan/gui/url.cc                    | 6 ++----
 pan/tasks/decoder.cc              | 2 +-
 pan/tasks/encoder.cc              | 2 +-
 pan/tasks/nntp.cc                 | 6 ++----
 pan/tasks/nzb.cc                  | 4 +---
 pan/tasks/socket-impl-gio.cc      | 2 +-
 pan/tasks/socket-impl-main.cc     | 5 +----
 pan/tasks/socket-impl-openssl.cc  | 2 +-
 pan/tasks/socket.cc               | 4 +---
 pan/tasks/task-article.cc         | 5 +----
 pan/tasks/task-groups.cc          | 2 +-
 pan/tasks/task-post.cc            | 4 +---
 pan/tasks/task-xover.cc           | 2 +-
 pan/tasks/task-xoverinfo.cc       | 5 +++--
 pan/usenet-utils/filter-info.cc   | 6 ++----
 pan/usenet-utils/gnksa.cc         | 3 ++-
 pan/usenet-utils/gpg.cc           | 2 +-
 pan/usenet-utils/message-check.cc | 2 --
 pan/usenet-utils/mime-utils.cc    | 6 +++---
 pan/usenet-utils/rules-info.cc    | 6 ++----
 pan/usenet-utils/scorefile.cc     | 4 +---
 pan/usenet-utils/text-massager.cc | 2 --
 60 files changed, 86 insertions(+), 122 deletions(-)

diff --git a/pan/data-impl/article-filter.cc b/pan/data-impl/article-filter.cc
index b06d0c2..f424738 100644
--- a/pan/data-impl/article-filter.cc
+++ b/pan/data-impl/article-filter.cc
@@ -25,10 +25,7 @@
 #include <gmime/gmime.h>
 
 //#include <glib/gprintf.h>
-extern "C"
-{
-  #include <glib.h>
-}
+#include <glib.h>
 
 #include "article-filter.h"
 
diff --git a/pan/data-impl/data-impl.cc b/pan/data-impl/data-impl.cc
index 88012cc..4465966 100644
--- a/pan/data-impl/data-impl.cc
+++ b/pan/data-impl/data-impl.cc
@@ -22,10 +22,8 @@
 **************/
 
 #include <config.h>
-extern "C" {
-  #include <glib/gi18n.h>
-  #include <glib.h> // for g_build_filename
-}
+#include <glib/gi18n.h>
+#include <glib.h> // for g_build_filename
 #include <pan/general/debug.h>
 #include <pan/general/file-util.h>
 #include <pan/general/log.h>
diff --git a/pan/data-impl/data-io.cc b/pan/data-impl/data-io.cc
index bea1a90..d938634 100644
--- a/pan/data-impl/data-io.cc
+++ b/pan/data-impl/data-io.cc
@@ -27,9 +27,9 @@ extern "C" {
   #include <sys/types.h> // for chmod
   #include <sys/stat.h> // for chmod
   #include <unistd.h>
-  #include <glib.h>
-  #include <glib/gi18n.h>
 }
+#include <glib.h>
+#include <glib/gi18n.h>
 #include <pan/general/debug.h>
 #include <pan/general/file-util.h>
 #include <pan/general/line-reader.h>
diff --git a/pan/data-impl/groups.cc b/pan/data-impl/groups.cc
index 244feb9..da0183a 100644
--- a/pan/data-impl/groups.cc
+++ b/pan/data-impl/groups.cc
@@ -29,9 +29,9 @@
 #include <vector>
 
 #include <glib.h>
+#include <glib/gi18n.h>
 extern "C" {
   #include <unistd.h>
-  #include <glib/gi18n.h>
 }
 
 #include <pan/general/debug.h>
diff --git a/pan/data-impl/headers.cc b/pan/data-impl/headers.cc
index f8c4466..4e60f77 100644
--- a/pan/data-impl/headers.cc
+++ b/pan/data-impl/headers.cc
@@ -28,8 +28,8 @@
 extern "C" {
   #include <sys/types.h> // for chmod
   #include <sys/stat.h> // for chmod
-  #include <glib/gi18n.h>
 }
+#include <glib/gi18n.h>
 #include <pan/general/debug.h>
 #include <pan/general/log.h>
 #include <pan/general/macros.h>
diff --git a/pan/data-impl/profiles.cc b/pan/data-impl/profiles.cc
index e999fda..a6e6bb5 100644
--- a/pan/data-impl/profiles.cc
+++ b/pan/data-impl/profiles.cc
@@ -26,9 +26,9 @@
 extern "C" {
   #include <sys/types.h> // for chmod
   #include <sys/stat.h> // for chmod
-  #include <glib.h>
-  #include <glib/gi18n.h>
 }
+#include <glib.h>
+#include <glib/gi18n.h>
 #include <pan/general/debug.h>
 #include <pan/general/string-view.h>
 #include <pan/general/file-util.h>
diff --git a/pan/data-impl/server.cc b/pan/data-impl/server.cc
index 9ea55d4..b23782f 100644
--- a/pan/data-impl/server.cc
+++ b/pan/data-impl/server.cc
@@ -25,10 +25,8 @@
 #include <map>
 #include <set>
 #include <vector>
-extern "C" {
-  #include <glib.h> // for GMarkup
-  #include <glib/gi18n.h>
-}
+#include <glib.h> // for GMarkup
+#include <glib/gi18n.h>
 #include <pan/general/debug.h>
 #include <pan/general/file-util.h>
 #include <pan/general/log.h>
diff --git a/pan/data-impl/xover.cc b/pan/data-impl/xover.cc
index ff8644f..f55a5ee 100644
--- a/pan/data-impl/xover.cc
+++ b/pan/data-impl/xover.cc
@@ -20,8 +20,8 @@
 #include <config.h>
 #include <cmath>
 #include <fstream>
+#include <glib/gi18n.h>
 extern "C" {
-  #include <glib/gi18n.h>
   #include <gmime/gmime.h>
 }
 #include <pan/general/debug.h>
diff --git a/pan/data/article-cache.cc b/pan/data/article-cache.cc
index 1855153..ab1acea 100644
--- a/pan/data/article-cache.cc
+++ b/pan/data/article-cache.cc
@@ -18,6 +18,8 @@
  */
 
 #include <config.h>
+#include <glib.h>
+#include <glib/gi18n.h>
 
 extern "C"
 {
@@ -27,8 +29,6 @@ extern "C"
   #include <unistd.h>
   #include <dirent.h>
 
-  #include <glib.h>
-  #include <glib/gi18n.h>
   #include <gmime/gmime.h>
 }
 
diff --git a/pan/data/cert-store.cc b/pan/data/cert-store.cc
index 340fc8b..f6cd46e 100644
--- a/pan/data/cert-store.cc
+++ b/pan/data/cert-store.cc
@@ -34,10 +34,8 @@
 #include <iostream>
 #include <string>
 
-extern "C" {
 #include <glib/gi18n.h>
 #include <glib.h>
-}
 
 #include <pan/general/debug.h>
 #include <pan/general/e-util.h>
diff --git a/pan/data/encode-cache.cc b/pan/data/encode-cache.cc
index 3a82ea9..3295ace 100644
--- a/pan/data/encode-cache.cc
+++ b/pan/data/encode-cache.cc
@@ -21,6 +21,9 @@
 #include <fstream>
 #include <sstream>
 
+#include <glib.h>
+#include <glib/gi18n.h>
+
 extern "C"
 {
   #include <errno.h>
@@ -29,8 +32,6 @@ extern "C"
   #include <unistd.h>
   #include <dirent.h>
 
-  #include <glib.h>
-  #include <glib/gi18n.h>
   #include <gmime/gmime.h>
 }
 
diff --git a/pan/general/e-util.cc b/pan/general/e-util.cc
index af5ccd0..22a8894 100644
--- a/pan/general/e-util.cc
+++ b/pan/general/e-util.cc
@@ -24,10 +24,13 @@
 #include <cstdlib>
 #include <cstring>
 #include <ctime>
+#include <glib.h>
+#include <glib/gi18n.h>
+
 extern "C" {
   #include <ctype.h>
-  #include <glib.h>
-  #include <glib/gi18n.h>
+//  #include <glib.h>
+//  #include <glib/gi18n.h>
 }
 #include "debug.h"
 #include "e-util.h"
diff --git a/pan/general/file-util.cc b/pan/general/file-util.cc
index 02e9ed1..04609f4 100644
--- a/pan/general/file-util.cc
+++ b/pan/general/file-util.cc
@@ -21,14 +21,14 @@
 #include <cassert>
 #include <cerrno>
 #include <cctype>
+#include <glib.h>
+#include <glib/gi18n.h>
 
 extern "C"
 {
   #include <unistd.h>
   #include <sys/stat.h>
   #include <sys/types.h>
-  #include <glib.h>
-  #include <glib/gi18n.h>
   #ifndef G_OS_WIN32
     #include <pwd.h>
   #endif
diff --git a/pan/general/line-reader.cc b/pan/general/line-reader.cc
index afb9be8..6b80fc4 100644
--- a/pan/general/line-reader.cc
+++ b/pan/general/line-reader.cc
@@ -1,9 +1,7 @@
 #include <config.h>
 #include <cstdio>
 #include <cstdlib>
-extern "C"{ 
-  #include <glib/gi18n.h>
-}
+#include <glib/gi18n.h>
 #include <cerrno>
 #include "file-util.h"
 #include "line-reader.h"
diff --git a/pan/general/text-match.cc b/pan/general/text-match.cc
index fcacbe2..91c70e8 100644
--- a/pan/general/text-match.cc
+++ b/pan/general/text-match.cc
@@ -18,10 +18,13 @@
  */
 
 #include <config.h>
+#include <glib.h>
+#include <glib/gi18n.h>
+
 extern "C" {
   #include <ctype.h>
-  #include <glib.h>
-  #include <glib/gi18n.h>
+//  #include <glib.h>
+//  #include <glib/gi18n.h>
 }
 #include "debug.h"
 #include "log.h"
diff --git a/pan/general/utf8-utils.cc b/pan/general/utf8-utils.cc
index be79a13..fea6100 100644
--- a/pan/general/utf8-utils.cc
+++ b/pan/general/utf8-utils.cc
@@ -21,9 +21,7 @@
 #include <string>
 #include <vector>
 #include <string.h>
-extern "C" {
 #include <glib/gi18n.h>
-}
 #include <locale.h>
 #include <gmime/gmime.h>
 #include <pan/general/debug.h>
diff --git a/pan/gui/actions.cc b/pan/gui/actions.cc
index 520c08b..92c0e92 100644
--- a/pan/gui/actions.cc
+++ b/pan/gui/actions.cc
@@ -18,8 +18,8 @@
  */
 
 #include <config.h>
+#include <glib/gi18n.h>
 extern "C" {
-  #include <glib/gi18n.h>
   #include "gtk-compat.h"
 }
 
diff --git a/pan/gui/body-pane.cc b/pan/gui/body-pane.cc
index 53e9124..21da233 100644
--- a/pan/gui/body-pane.cc
+++ b/pan/gui/body-pane.cc
@@ -22,8 +22,8 @@
 #include <cmath>
 #include <iostream>
 #include <sstream>
+#include <glib/gi18n.h>
 extern "C" {
-  #include <glib/gi18n.h>
   #include "gtk-compat.h"
   #include <gmime/gmime.h>
 }
diff --git a/pan/gui/dl-headers-ui.cc b/pan/gui/dl-headers-ui.cc
index 5841651..cfc536d 100644
--- a/pan/gui/dl-headers-ui.cc
+++ b/pan/gui/dl-headers-ui.cc
@@ -18,9 +18,9 @@
  */
 
 #include <config.h>
+#include <glib.h>
+#include <glib/gi18n.h>
 extern "C" {
-  #include <glib.h>
-  #include <glib/gi18n.h>
   #include "gtk-compat.h"
 }
 #include <pan/general/macros.h>
diff --git a/pan/gui/group-pane.cc b/pan/gui/group-pane.cc
index 28ad581..3d13722 100644
--- a/pan/gui/group-pane.cc
+++ b/pan/gui/group-pane.cc
@@ -20,8 +20,8 @@
 #include <config.h>
 #include <cassert>
 #include <deque>
+#include <glib/gi18n.h>
 extern "C" {
-  #include <glib/gi18n.h>
   #include "gtk-compat.h"
 }
 #include <pan/general/debug.h>
diff --git a/pan/gui/group-prefs-dialog.cc b/pan/gui/group-prefs-dialog.cc
index 677b07a..6983746 100644
--- a/pan/gui/group-prefs-dialog.cc
+++ b/pan/gui/group-prefs-dialog.cc
@@ -18,9 +18,9 @@
  */
 
 #include <config.h>
+#include <glib/gi18n.h>
+#include <glib.h>
 extern "C" {
-  #include <glib/gi18n.h>
-  #include <glib.h>
   #include "gtk-compat.h"
 #ifdef HAVE_GTKSPELL
   #include <enchant/enchant.h>
diff --git a/pan/gui/group-prefs.cc b/pan/gui/group-prefs.cc
index 3e9851b..b06a949 100644
--- a/pan/gui/group-prefs.cc
+++ b/pan/gui/group-prefs.cc
@@ -21,8 +21,8 @@ extern "C" {
   #include <config.h>
   #include <sys/types.h> // chmod
   #include <sys/stat.h> // chmod
-  #include <glib.h>
 }
+#include <glib.h>
 #include <iostream>
 #include <fstream>
 #include <pan/general/file-util.h>
diff --git a/pan/gui/gui.cc b/pan/gui/gui.cc
index f79aa1e..d42bec5 100644
--- a/pan/gui/gui.cc
+++ b/pan/gui/gui.cc
@@ -22,10 +22,10 @@
 #include <string>
 #include <sstream>
 #include <fstream>
+#include <glib/gi18n.h>
 extern "C" {
   #include <sys/types.h> // for chmod
   #include <sys/stat.h> // for chmod
-  #include <glib/gi18n.h>
   #include <dirent.h>
 }
 #include <pan/general/debug.h>
diff --git a/pan/gui/header-pane.cc b/pan/gui/header-pane.cc
index dc65a77..8f6cf12 100644
--- a/pan/gui/header-pane.cc
+++ b/pan/gui/header-pane.cc
@@ -17,9 +17,9 @@
  *
  */
 
+#include <glib/gi18n.h>
 extern "C" {
   #include <config.h>
-  #include <glib/gi18n.h>
   #include "gtk-compat.h"
   #include "gtk-compat.h"
 }
diff --git a/pan/gui/log-ui.cc b/pan/gui/log-ui.cc
index 7b11493..24f4492 100644
--- a/pan/gui/log-ui.cc
+++ b/pan/gui/log-ui.cc
@@ -21,8 +21,8 @@
 #include <ostream>
 #include <fstream>
 #include <iostream>
+#include <glib/gi18n.h>
 extern "C" {
-  #include <glib/gi18n.h>
   #include "gtk-compat.h"
 }
 #include <pan/general/log.h>
diff --git a/pan/gui/pan-file-entry.cc b/pan/gui/pan-file-entry.cc
index 705fc91..ff04d7a 100644
--- a/pan/gui/pan-file-entry.cc
+++ b/pan/gui/pan-file-entry.cc
@@ -19,8 +19,8 @@
 
 #include <config.h>
 #include <string>
+#include <glib/gi18n.h>
 extern "C" {
-  #include <glib/gi18n.h>
   #include "gtk-compat.h"
 }
 #include <pan/general/file-util.h>
diff --git a/pan/gui/pan.cc b/pan/gui/pan.cc
index fb3a696..cb3e1dd 100644
--- a/pan/gui/pan.cc
+++ b/pan/gui/pan.cc
@@ -22,9 +22,9 @@
 #include <fstream>
 #include <config.h>
 #include <signal.h>
+#include <glib/gi18n.h>
 
 extern "C" {
-  #include <glib/gi18n.h>
   #include "gtk-compat.h"
   #include <gmime/gmime.h>
   #include <gio/gio.h>
diff --git a/pan/gui/prefs-file.cc b/pan/gui/prefs-file.cc
index bde7ef3..64c540f 100644
--- a/pan/gui/prefs-file.cc
+++ b/pan/gui/prefs-file.cc
@@ -24,8 +24,8 @@
 extern "C" {
   #include <sys/types.h> // for chmod
   #include <sys/stat.h> // for chmod
-  #include <glib.h>
 }
+#include <glib.h>
 #include <pan/general/file-util.h>
 #include "prefs-file.h"
 
diff --git a/pan/gui/prefs-ui.cc b/pan/gui/prefs-ui.cc
index f7dc0f0..32e7a1a 100644
--- a/pan/gui/prefs-ui.cc
+++ b/pan/gui/prefs-ui.cc
@@ -18,8 +18,8 @@
  */
 
 #include <config.h>
+#include <glib/gi18n.h>
 extern "C" {
-  #include <glib/gi18n.h>
   #include "gtk-compat.h"
 }
 #include <pan/general/debug.h>
diff --git a/pan/gui/prefs.cc b/pan/gui/prefs.cc
index fdbd908..64dd8da 100644
--- a/pan/gui/prefs.cc
+++ b/pan/gui/prefs.cc
@@ -23,10 +23,8 @@
 #include <iostream>
 #include <sstream>
 #include <string>
-extern "C" {
-  #include <glib.h>
-  #include <glib/gi18n.h>
-}
+#include <glib.h>
+#include <glib/gi18n.h>
 #include <pan/general/debug.h>
 #include <pan/general/log.h>
 #include <pan/general/macros.h>
diff --git a/pan/gui/profiles-dialog.cc b/pan/gui/profiles-dialog.cc
index 26ff029..2687337 100644
--- a/pan/gui/profiles-dialog.cc
+++ b/pan/gui/profiles-dialog.cc
@@ -23,8 +23,8 @@
 
 #include <config.h>
 #include <iostream>
+#include <glib/gi18n.h>
 extern "C" {
-  #include <glib/gi18n.h>
   #include "gtk-compat.h"
 }
 #include <pan/general/debug.h>
diff --git a/pan/gui/progress-view.cc b/pan/gui/progress-view.cc
index 241ad1c..43ef4f2 100644
--- a/pan/gui/progress-view.cc
+++ b/pan/gui/progress-view.cc
@@ -18,9 +18,7 @@
  */
 
 #include <config.h>
-extern "C" {
-  #include "gtk-compat.h"
-}
+#include "gtk-compat.h"
 #include <pan/general/string-view.h>
 #include <pan/usenet-utils/mime-utils.h>
 #include "progress-view.h"
diff --git a/pan/gui/save-attach-ui.cc b/pan/gui/save-attach-ui.cc
index 0b08b6f..00aff50 100644
--- a/pan/gui/save-attach-ui.cc
+++ b/pan/gui/save-attach-ui.cc
@@ -18,8 +18,8 @@
  */
 
 #include <config.h>
+#include <glib/gi18n.h>
 extern "C" {
-  #include <glib/gi18n.h>
   #include "gtk-compat.h"
 }
 #include <pan/general/debug.h>
diff --git a/pan/gui/save-ui.cc b/pan/gui/save-ui.cc
index 0f034e5..59310c8 100644
--- a/pan/gui/save-ui.cc
+++ b/pan/gui/save-ui.cc
@@ -18,8 +18,8 @@
  */
 
 #include <config.h>
+#include <glib/gi18n.h>
 extern "C" {
-  #include <glib/gi18n.h>
   #include "gtk-compat.h"
 }
 #include <pan/general/debug.h>
diff --git a/pan/gui/score-add-ui.cc b/pan/gui/score-add-ui.cc
index e72bdb5..3b81167 100644
--- a/pan/gui/score-add-ui.cc
+++ b/pan/gui/score-add-ui.cc
@@ -20,9 +20,7 @@
 #include <config.h>
 #include <cassert>
 #include <climits>
-extern "C" {
-  #include <glib/gi18n.h>
-}
+#include <glib/gi18n.h>
 #include <pan/general/debug.h>
 #include <pan/general/text-match.h>
 #include "hig.h"
diff --git a/pan/gui/score-view-ui.cc b/pan/gui/score-view-ui.cc
index d6c81c1..e2598a5 100644
--- a/pan/gui/score-view-ui.cc
+++ b/pan/gui/score-view-ui.cc
@@ -18,8 +18,8 @@
  */
 
 #include <config.h>
+#include <glib/gi18n.h>
 extern "C" {
-  #include <glib/gi18n.h>
   #include "gtk-compat.h"
 }
 #include <pan/general/debug.h>
diff --git a/pan/gui/server-ui.cc b/pan/gui/server-ui.cc
index b42bc18..684ea0c 100644
--- a/pan/gui/server-ui.cc
+++ b/pan/gui/server-ui.cc
@@ -21,9 +21,9 @@
 #include <cstdlib>
 #include <cstring>
 #include <climits>
+#include <glib.h>
+#include <glib/gi18n.h>
 extern "C" {
-  #include <glib.h>
-  #include <glib/gi18n.h>
   #include "gtk-compat.h"
 }
 
diff --git a/pan/gui/task-pane.cc b/pan/gui/task-pane.cc
index 4f77922..1c302f9 100644
--- a/pan/gui/task-pane.cc
+++ b/pan/gui/task-pane.cc
@@ -18,9 +18,9 @@
  */
 
 #include <config.h>
+#include <glib.h>
+#include <glib/gi18n.h>
 extern "C" {
-  #include <glib.h>
-  #include <glib/gi18n.h>
   #include "gtk-compat.h"
 }
 #include <pan/general/e-util.h>
diff --git a/pan/gui/url.cc b/pan/gui/url.cc
index e1173ae..94ffb52 100644
--- a/pan/gui/url.cc
+++ b/pan/gui/url.cc
@@ -20,10 +20,8 @@
 #include <config.h>
 #include <iostream>
 #include <string>
-extern "C" {
-  #include <glib.h>
-  #include <glib/gi18n.h>
-};
+#include <glib.h>
+#include <glib/gi18n.h>
 #include <pan/general/log.h>
 #include "url.h"
 
diff --git a/pan/tasks/decoder.cc b/pan/tasks/decoder.cc
index b4c21ae..1e57ea2 100644
--- a/pan/tasks/decoder.cc
+++ b/pan/tasks/decoder.cc
@@ -25,10 +25,10 @@
 #include <cerrno>
 #include <ostream>
 #include <fstream>
+#include <glib/gi18n.h>
 extern "C" {
 #  define PROTOTYPES
 #  include <uulib/uudeview.h>
-#  include <glib/gi18n.h>
 };
 #include <pan/general/worker-pool.h>
 #include <pan/general/debug.h>
diff --git a/pan/tasks/encoder.cc b/pan/tasks/encoder.cc
index 7960b84..93389c7 100644
--- a/pan/tasks/encoder.cc
+++ b/pan/tasks/encoder.cc
@@ -27,11 +27,11 @@
 #include <ostream>
 #include <fstream>
 #include <sstream>
+#include <glib/gi18n.h>
 
 extern "C" {
 #define PROTOTYPES
 #include <uulib/uudeview.h>
-#include <glib/gi18n.h>
 #include <sys/time.h>
 };
 
diff --git a/pan/tasks/nntp.cc b/pan/tasks/nntp.cc
index ceb1574..71c5cf1 100644
--- a/pan/tasks/nntp.cc
+++ b/pan/tasks/nntp.cc
@@ -22,10 +22,8 @@
 #include <cstdarg>
 #include <cstdlib> // abort, atoi, strtoul
 #include <cstdio> // snprintf
-extern "C" {
-  #include <glib.h>
-  #include <glib/gi18n.h>
-}
+#include <glib.h>
+#include <glib/gi18n.h>
 #include <pan/general/debug.h>
 #include <pan/general/log.h>
 #include <pan/general/messages.h>
diff --git a/pan/tasks/nzb.cc b/pan/tasks/nzb.cc
index af890e5..14df6f6 100644
--- a/pan/tasks/nzb.cc
+++ b/pan/tasks/nzb.cc
@@ -24,9 +24,7 @@
 #include <sstream>
 #include <string>
 #include <map>
-extern "C" {
-  #include <glib.h>
-}
+#include <glib.h>
 #include <pan/general/debug.h>
 #include <pan/general/file-util.h>
 #include <pan/general/log.h>
diff --git a/pan/tasks/socket-impl-gio.cc b/pan/tasks/socket-impl-gio.cc
index d3339dd..7f493d4 100644
--- a/pan/tasks/socket-impl-gio.cc
+++ b/pan/tasks/socket-impl-gio.cc
@@ -28,10 +28,10 @@
 #include <string>
 #include <cerrno>
 #include <cstring>
+#include <glib/gi18n.h>
 
 extern "C" {
   #include <unistd.h>
-  #include <glib/gi18n.h>
 }
 
 #include <pan/general/file-util.h>
diff --git a/pan/tasks/socket-impl-main.cc b/pan/tasks/socket-impl-main.cc
index c33edfd..688183c 100644
--- a/pan/tasks/socket-impl-main.cc
+++ b/pan/tasks/socket-impl-main.cc
@@ -30,10 +30,7 @@
 //#include <glib/giochannel.h>
 //#include <glib/gstring.h>
 
-extern "C"
-{
-  #include <glib.h>
-}
+#include <glib.h>
 
 #include <pan/tasks/socket.h>
 
diff --git a/pan/tasks/socket-impl-openssl.cc b/pan/tasks/socket-impl-openssl.cc
index b58e074..c723c1f 100644
--- a/pan/tasks/socket-impl-openssl.cc
+++ b/pan/tasks/socket-impl-openssl.cc
@@ -31,10 +31,10 @@
 #include <string>
 #include <cerrno>
 #include <cstring>
+#include <glib/gi18n.h>
 
 extern "C" {
   #include <unistd.h>
-  #include <glib/gi18n.h>
   #include <errno.h>
   #include <fcntl.h>
   #include <sys/time.h>
diff --git a/pan/tasks/socket.cc b/pan/tasks/socket.cc
index 78d53fb..2c7a28d 100644
--- a/pan/tasks/socket.cc
+++ b/pan/tasks/socket.cc
@@ -21,9 +21,7 @@
 #include <cstdarg>
 #include <ctime>
 #include <cmath>
-extern "C" {
-  #include <glib.h>
-}
+#include <glib.h>
 #include <pan/general/debug.h>
 #include <pan/general/string-view.h>
 #include "socket.h"
diff --git a/pan/tasks/task-article.cc b/pan/tasks/task-article.cc
index 9c96b7d..1dc17ba 100644
--- a/pan/tasks/task-article.cc
+++ b/pan/tasks/task-article.cc
@@ -24,10 +24,7 @@
 #include <config.h>
 #include <algorithm>
 #include <cassert>
-extern "C"
-{
-  #include <glib/gi18n.h>
-}
+#include <glib/gi18n.h>
 #include <pan/general/debug.h>
 #include <pan/general/file-util.h>
 #include <pan/general/utf8-utils.h>
diff --git a/pan/tasks/task-groups.cc b/pan/tasks/task-groups.cc
index b8618d6..c455808 100644
--- a/pan/tasks/task-groups.cc
+++ b/pan/tasks/task-groups.cc
@@ -19,8 +19,8 @@
 
 #include <config.h>
 #include <cassert>
+#include <glib/gi18n.h>
 extern "C" {
-  #include <glib/gi18n.h>
   #include <stdlib.h>
 }
 #include <pan/general/debug.h>
diff --git a/pan/tasks/task-post.cc b/pan/tasks/task-post.cc
index bb80fb9..4ab9c2f 100644
--- a/pan/tasks/task-post.cc
+++ b/pan/tasks/task-post.cc
@@ -18,9 +18,7 @@
  */
 
 #include <config.h>
-extern "C" {
-  #include <glib/gi18n.h>
-}
+#include <glib/gi18n.h>
 #include "task-post.h"
 #include <pan/general/debug.h>
 #include <pan/general/log.h>
diff --git a/pan/tasks/task-xover.cc b/pan/tasks/task-xover.cc
index c3c8260..a718a35 100644
--- a/pan/tasks/task-xover.cc
+++ b/pan/tasks/task-xover.cc
@@ -21,12 +21,12 @@
 #include <cassert>
 #include <cerrno>
 
+#include <glib/gi18n.h>
 extern "C"
 {
 #define PROTOTYPES
 #include <stdio.h>
 #include <uulib/uudeview.h>
-#include <glib/gi18n.h>
 #include <gmime/gmime-utils.h>
 }
 
diff --git a/pan/tasks/task-xoverinfo.cc b/pan/tasks/task-xoverinfo.cc
index c598bf8..9a6b0d1 100644
--- a/pan/tasks/task-xoverinfo.cc
+++ b/pan/tasks/task-xoverinfo.cc
@@ -20,12 +20,13 @@
 #include <config.h>
 #include <cassert>
 #include <cerrno>
+#include <glib/gi18n.h>
+#include <gmime/gmime-utils.h>
+
 extern "C" {
   #define PROTOTYPES
   #include <stdio.h>
   #include <uulib/uudeview.h>
-  #include <glib/gi18n.h>
-  #include <gmime/gmime-utils.h>
   #include <zlib.h>
 }
 #include <fstream>
diff --git a/pan/usenet-utils/filter-info.cc b/pan/usenet-utils/filter-info.cc
index f464428..6b1a5c9 100644
--- a/pan/usenet-utils/filter-info.cc
+++ b/pan/usenet-utils/filter-info.cc
@@ -18,10 +18,8 @@
  */
 
 #include <config.h>
-extern "C" {
-  #include <glib.h>
-  #include <glib/gi18n.h>
-}
+#include <glib.h>
+#include <glib/gi18n.h>
 #include <pan/general/macros.h>
 #include "filter-info.h"
 
diff --git a/pan/usenet-utils/gnksa.cc b/pan/usenet-utils/gnksa.cc
index db1f2c4..96d3e2c 100644
--- a/pan/usenet-utils/gnksa.cc
+++ b/pan/usenet-utils/gnksa.cc
@@ -37,10 +37,11 @@ extern "C"
 {
   #include <ctype.h>
   #include <unistd.h>
-  #include <glib/gi18n.h>
+//  #include <glib/gi18n.h>
   #include <sys/time.h>
 }
 
+#include <glib/gi18n.h>
 #include <pan/general/debug.h>
 #include <pan/general/macros.h>
 #include <pan/general/log.h>
diff --git a/pan/usenet-utils/gpg.cc b/pan/usenet-utils/gpg.cc
index 4df4525..a6040a3 100644
--- a/pan/usenet-utils/gpg.cc
+++ b/pan/usenet-utils/gpg.cc
@@ -23,12 +23,12 @@
 #include <pan/general/log.h>
 #include <pan/general/macros.h>
 #include "gpg.h"
+#include <glib/gi18n.h>
 
 extern "C" {
   #include <stdlib.h>
   #include <unistd.h>
   #include <string.h>
-  #include <glib/gi18n.h>
   #include <gmime/gmime.h>
 }
 
diff --git a/pan/usenet-utils/message-check.cc b/pan/usenet-utils/message-check.cc
index a511556..461ce86 100644
--- a/pan/usenet-utils/message-check.cc
+++ b/pan/usenet-utils/message-check.cc
@@ -21,9 +21,7 @@
 #include <ctype.h>
 #include <string.h>
 #include <glib.h>
-extern "C" {
 #include <glib/gi18n.h>
-}
 #include <pan/general/debug.h>
 #include <pan/general/macros.h>
 #include <pan/general/string-view.h>
diff --git a/pan/usenet-utils/mime-utils.cc b/pan/usenet-utils/mime-utils.cc
index 881df7b..49342fb 100644
--- a/pan/usenet-utils/mime-utils.cc
+++ b/pan/usenet-utils/mime-utils.cc
@@ -23,10 +23,10 @@
 #include <cstdlib>
 #include <iostream>
 #include <sstream>
+#include <gmime/gmime.h>
 extern "C"
 {
   #include <unistd.h>
-  #include <gmime/gmime.h>
 }
 #include <pan/general/debug.h>
 #include <pan/general/macros.h>
@@ -1749,7 +1749,7 @@ namespace pan
 #ifdef HAVE_GMIME_30
     GMimeObject *gmo;
     gmo = g_mime_message_get_mime_part (body);
-    if (g_mime_multipart_signed_sign (gpg_ctx, gmo, uid.c_str(), &err) <0)
+    if (g_mime_multipart_signed_sign (gpg_ctx, gmo, uid.c_str(), &err) == NULL)
 #else
     if (g_mime_multipart_signed_sign (mps, GMIME_OBJECT (part), gpg_ctx, uid.c_str(), GMIME_DIGEST_ALGO_SHA1, &err) <0)
 #endif
@@ -1784,7 +1784,7 @@ namespace pan
 
 #ifdef HAVE_GMIME_30
     if (g_mime_multipart_encrypted_encrypt(gpg_ctx, GMIME_OBJECT (part), sign, uid.c_str(),
-                                           GMIME_ENCRYPT_NONE, rcp, &err) < 0)
+                                           GMIME_ENCRYPT_NONE, rcp, &err) == NULL)
 #else
     if (g_mime_multipart_encrypted_encrypt(mpe, GMIME_OBJECT (part), gpg_ctx, sign,
                                            uid.c_str(), GMIME_DIGEST_ALGO_SHA1, rcp, &err) < 0)
diff --git a/pan/usenet-utils/rules-info.cc b/pan/usenet-utils/rules-info.cc
index 1c03adc..91e78be 100644
--- a/pan/usenet-utils/rules-info.cc
+++ b/pan/usenet-utils/rules-info.cc
@@ -22,10 +22,8 @@
 
 
 #include <config.h>
-extern "C" {
-  #include <glib.h>
-  #include <glib/gi18n.h>
-}
+#include <glib.h>
+#include <glib/gi18n.h>
 #include <pan/general/macros.h>
 #include "rules-info.h"
 
diff --git a/pan/usenet-utils/scorefile.cc b/pan/usenet-utils/scorefile.cc
index 8b56a2a..4b151f0 100644
--- a/pan/usenet-utils/scorefile.cc
+++ b/pan/usenet-utils/scorefile.cc
@@ -23,9 +23,7 @@
 #include <iostream>
 #include <sstream>
 #include <string>
-extern "C" {
-  #include <glib/gi18n.h>
-}
+#include <glib/gi18n.h>
 #include <pan/general/debug.h>
 #include <pan/general/log.h>
 #include <pan/general/macros.h>
diff --git a/pan/usenet-utils/text-massager.cc b/pan/usenet-utils/text-massager.cc
index 4fcd8d5..15a818b 100644
--- a/pan/usenet-utils/text-massager.cc
+++ b/pan/usenet-utils/text-massager.cc
@@ -22,9 +22,7 @@
 #include <map>
 #include <cstring>
 #include <glib.h>
-extern "C" {
 #include <glib/gi18n.h>
-}
 #include "text-massager.h"
 #include <pan/general/log.h>
 #include <pan/general/e-util.h>
-- 
GitLab


From a5c8e4258f5b6fe96856ef1e80c297a552bbd732 Mon Sep 17 00:00:00 2001
From: FoxMcCloud45 <foxmccloud45@hotmail.com>
Date: Wed, 7 Jul 2021 01:15:59 +0200
Subject: [PATCH 08/14] Added experimental support for sending Face header.

---
 pan/data-impl/profiles.cc  |  2 ++
 pan/data/data.h            |  1 +
 pan/gui/post-ui.cc         | 17 +++++++++++++++++
 pan/gui/post-ui.h          |  2 +-
 pan/gui/profiles-dialog.cc | 10 +++++++++-
 pan/gui/profiles-dialog.h  |  1 +
 6 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/pan/data-impl/profiles.cc b/pan/data-impl/profiles.cc
index a6e6bb5..ad6a024 100644
--- a/pan/data-impl/profiles.cc
+++ b/pan/data-impl/profiles.cc
@@ -126,6 +126,7 @@ namespace
       else if (element_name == "gpg-signature") p.gpg_sig_uid.assign (t.str, t.len);
       else if (element_name == "attribution") p.attribution.assign (t.str, t.len);
       else if (element_name == "fqdn") p.fqdn.assign (t.str, t.len);
+      else if (element_name == "face") p.face.assign (t.str, t.len);
       else if (element_name == "xface") p.xface.assign (t.str, t.len);
       else if (element_name == "username") p.username.assign (t.str, t.len);
       else if (element_name == "address") p.address.assign (t.str, t.len);
@@ -209,6 +210,7 @@ ProfilesImpl :: serialize (std::ostream& out) const
     out << indent(depth) << "<username>" << escaped(it->second.username) << "</username>\n";
     out << indent(depth) << "<address>" << escaped(it->second.address) << "</address>\n";
     out << indent(depth) << "<server>" << escaped(it->second.posting_server.to_view()) << "</server>\n";
+    out << indent(depth) << "<face>" << escaped(it->second.face) << "</face>\n";
     out << indent(depth) << "<xface>" << escaped(it->second.xface) << "</xface>\n";
     if (!it->second.signature_file.empty() && it->second.sig_type != Profile::GPGSIG) {
       const char * type;
diff --git a/pan/data/data.h b/pan/data/data.h
index b6e180d..e54f223 100644
--- a/pan/data/data.h
+++ b/pan/data/data.h
@@ -109,6 +109,7 @@ namespace pan
     std::string signature_file;
     std::string attribution;
     std::string fqdn;
+    std::string face;
     std::string xface;
     Quark posting_server;
 
diff --git a/pan/gui/post-ui.cc b/pan/gui/post-ui.cc
index c983f21..2a081cc 100644
--- a/pan/gui/post-ui.cc
+++ b/pan/gui/post-ui.cc
@@ -1658,6 +1658,23 @@ PostUI :: new_message_from_ui (Mode mode, bool copy_body)
     g_mime_object_set_header ((GMimeObject *) msg, "Reply-To", replyto.str);
 #endif
 
+  // headers from posting profile (via prefs): Face
+  if (!profile.face.empty())
+  {
+    std::string f;
+    f += profile.face;
+
+    for (int i = GMIME_FOLD_BASE64_INTERVAL; i < f.length(); i += GMIME_FOLD_BASE64_INTERVAL)
+    {
+      f.insert (i, " ");
+    }
+#ifdef HAVE_GMIME_30
+    g_mime_object_set_header ((GMimeObject *) msg, "Face", f.c_str(), NULL);
+#else
+    g_mime_object_set_header ((GMimeObject *) msg, "Face", f.c_str());
+#endif
+  }
+
   // headers from posting profile(via prefs): X-Face
   if (!profile.xface.empty())
   {
diff --git a/pan/gui/post-ui.h b/pan/gui/post-ui.h
index 320b4ea..93e5610 100644
--- a/pan/gui/post-ui.h
+++ b/pan/gui/post-ui.h
@@ -178,7 +178,7 @@ namespace pan
 
     private:
       /* GMIME: X-Face interval between spaces for proper folding. */
-      enum { GMIME_FOLD_INTERVAL = 72 };
+      enum { GMIME_FOLD_INTERVAL = 72, GMIME_FOLD_BASE64_INTERVAL = 64 };
 
       void add_actions (GtkWidget* box);
       void apply_profile_to_body ();
diff --git a/pan/gui/profiles-dialog.cc b/pan/gui/profiles-dialog.cc
index 2687337..2de939d 100644
--- a/pan/gui/profiles-dialog.cc
+++ b/pan/gui/profiles-dialog.cc
@@ -223,7 +223,14 @@ ProfileDialog :: ProfileDialog (const Data         & data,
     HIG :: workarea_add_row (t, &row, "",vbox);
 
   HIG :: workarea_add_section_divider (t, &row);
-  HIG :: workarea_add_section_title (t, &row, _("X-Face (Avatar)"));
+
+  HIG :: workarea_add_section_title (t, &row, _("Avatars"));
+    w = _face_entry = gtk_entry_new ();
+    set_entry (w, profile.face);
+    gtk_widget_set_tooltip_markup (w, _("You can add an avatar icon to your articles with a Base64-encoded PNG.\n"
+                                        "Add the Base64-encoded picture without the trailing <b>“Face:”</b>."));
+    HIG :: workarea_add_row (t, &row, _("_Face:"), w, NULL);
+
     w = _xface_entry = gtk_entry_new ();
     set_entry (w, profile.xface);
     gtk_widget_set_tooltip_markup (w, _("You can add an avatar icon to your articles with a unique X-Face code.\n"
@@ -341,6 +348,7 @@ ProfileDialog :: get_profile (std::string& profile_name, Profile& profile)
   from_entry (_username_entry, profile.username);
   from_entry (_address_entry, profile.address);
   from_entry (_msgid_fqdn_entry, profile.fqdn);
+  from_entry (_face_entry, profile.face);
   from_entry (_xface_entry, profile.xface);
   from_entry (_attribution_entry, profile.attribution);
 
diff --git a/pan/gui/profiles-dialog.h b/pan/gui/profiles-dialog.h
index 8f9cfa3..eca62d8 100644
--- a/pan/gui/profiles-dialog.h
+++ b/pan/gui/profiles-dialog.h
@@ -43,6 +43,7 @@ namespace pan
       GtkWidget * _username_entry;
       GtkWidget * _address_entry;
       GtkWidget * _msgid_fqdn_entry;
+      GtkWidget * _face_entry;
       GtkWidget * _xface_entry;
       GtkWidget * _attribution_entry;
       GtkWidget * _signature_file_check;
-- 
GitLab


From 493de9d11f38a03ab8b32f76dd5dea9ab8937b04 Mon Sep 17 00:00:00 2001
From: FoxMcCloud45 <foxmccloud45@hotmail.com>
Date: Wed, 7 Jul 2021 09:20:37 +0200
Subject: [PATCH 09/14] Fic forgotten conflict.

---
 pan/usenet-utils/mime-utils.cc | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pan/usenet-utils/mime-utils.cc b/pan/usenet-utils/mime-utils.cc
index cfef002..4aeb4d1 100644
--- a/pan/usenet-utils/mime-utils.cc
+++ b/pan/usenet-utils/mime-utils.cc
@@ -1749,11 +1749,7 @@ namespace pan
 #ifdef HAVE_GMIME_30
     GMimeObject *gmo;
     gmo = g_mime_message_get_mime_part (body);
-<<<<<<< HEAD
     if (g_mime_multipart_signed_sign (gpg_ctx, gmo, uid.c_str(), &err) != NULL)
-=======
-    if (g_mime_multipart_signed_sign (gpg_ctx, gmo, uid.c_str(), &err) == NULL)
->>>>>>> face-support
 #else
     if (g_mime_multipart_signed_sign (mps, GMIME_OBJECT (part), gpg_ctx, uid.c_str(), GMIME_DIGEST_ALGO_SHA1, &err) <0)
 #endif
-- 
GitLab


From a91de9d7fa4db3669d3e84f9e169999c28b96977 Mon Sep 17 00:00:00 2001
From: FoxMcCloud45 <foxmccloud45@hotmail.com>
Date: Wed, 7 Jul 2021 10:18:48 +0200
Subject: [PATCH 10/14] Another forgotten conflict fix...

---
 pan/gui/prefs-ui.cc | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pan/gui/prefs-ui.cc b/pan/gui/prefs-ui.cc
index 8452f5f..aac9ec1 100644
--- a/pan/gui/prefs-ui.cc
+++ b/pan/gui/prefs-ui.cc
@@ -18,15 +18,8 @@
  */
 
 #include <config.h>
-<<<<<<< HEAD
 #include "gtk-compat.h"
 #include <glib/gi18n.h>
-=======
-#include <glib/gi18n.h>
-extern "C" {
-  #include "gtk-compat.h"
-}
->>>>>>> face-support
 #include <pan/general/debug.h>
 #include <pan/general/macros.h>
 #include <pan/general/file-util.h>
-- 
GitLab


From 3fc114efb5b573127af9144fbee504810926af65 Mon Sep 17 00:00:00 2001
From: FoxMcCloud45 <foxmccloud45@hotmail.com>
Date: Wed, 7 Jul 2021 10:19:08 +0200
Subject: [PATCH 11/14] Applied Face/X-Face patches to GMIME3 code.

---
 pan/gui/post-ui.cc | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/pan/gui/post-ui.cc b/pan/gui/post-ui.cc
index ba604fa..65a4bdf 100644
--- a/pan/gui/post-ui.cc
+++ b/pan/gui/post-ui.cc
@@ -1636,11 +1636,30 @@ PostUI :: new_message_from_ui (Mode mode, bool copy_body)
   if (!replyto.empty())
     g_mime_object_set_header ((GMimeObject *) msg, "Reply-To", replyto.str, charset_cstr);
 
+  // headers from posting profile (via prefs): Face
+  if (!profile.face.empty())
+  {
+    std::string f;
+    f += profile.face;
+
+    for (int i = GMIME_FOLD_BASE64_INTERVAL; i < f.length(); i += GMIME_FOLD_BASE64_INTERVAL)
+    {
+      f.insert (i, " ");
+    }
+    g_mime_object_set_header ((GMimeObject *) msg, "Face", f.c_str(), charset_cstr);
+  }
+
   // headers from posting profile(via prefs): X-Face
   if (!profile.xface.empty())
   {
     std::string f;
-    f += " " + profile.xface;
+    f += profile.xface;
+
+    // GMIME_FOLD_INTERVAL - 8: Accounting for 'X-Face: ' beginning of header
+    for(int i = GMIME_FOLD_INTERVAL - 8; i < f.length(); i += GMIME_FOLD_INTERVAL)
+    {
+      f.insert(i, " ");
+    }
     g_mime_object_set_header ((GMimeObject *) msg, "X-Face", f.c_str(), charset_cstr);
   }
 
@@ -1768,11 +1787,7 @@ PostUI :: new_message_from_ui (Mode mode, bool copy_body)
     {
       f.insert (i, " ");
     }
-#ifdef HAVE_GMIME_30
-    g_mime_object_set_header ((GMimeObject *) msg, "Face", f.c_str(), NULL);
-#else
     g_mime_object_set_header ((GMimeObject *) msg, "Face", f.c_str());
-#endif
   }
 
   // headers from posting profile(via prefs): X-Face
@@ -1786,9 +1801,6 @@ PostUI :: new_message_from_ui (Mode mode, bool copy_body)
     {
       f.insert(i, " ");
     }
-#ifdef HAVE_GMIME_30
-    g_mime_object_set_header ((GMimeObject *) msg, "X-Face", f.c_str(), NULL);
-#else
     g_mime_object_set_header ((GMimeObject *) msg, "X-Face", f.c_str());
   }
 
-- 
GitLab


From 682888d85796c92ec17235025a11adf41720db7a Mon Sep 17 00:00:00 2001
From: FoxMcCloud45 <foxmccloud45@hotmail.com>
Date: Fri, 9 Jul 2021 20:06:23 +0200
Subject: [PATCH 12/14] Supposed fix for posting icons.

---
 pan/gui/post-ui.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pan/gui/post-ui.cc b/pan/gui/post-ui.cc
index 65a4bdf..14b436f 100644
--- a/pan/gui/post-ui.cc
+++ b/pan/gui/post-ui.cc
@@ -532,7 +532,7 @@ namespace
   void add_widget (GtkUIManager*, GtkWidget* widget, gpointer vbox)
   {
     if (GTK_IS_TOOLBAR (widget)) {
-      GtkWidget * handle_box = gtk_handle_box_new ();
+      GtkWidget * handle_box = gtk_handle_box_new (GTK_ORIENTATION_HORIZONTAL, PAD_SMALL);
       gtk_widget_show (handle_box);
       gtk_container_add (GTK_CONTAINER (handle_box), widget);
       g_signal_connect_swapped (widget, "destroy", G_CALLBACK (gtk_widget_destroy), handle_box);
-- 
GitLab


From a04993bd244353acaf2cc9c82e8aead2505314c9 Mon Sep 17 00:00:00 2001
From: FoxMcCloud45 <foxmccloud45@hotmail.com>
Date: Fri, 9 Jul 2021 20:24:33 +0200
Subject: [PATCH 13/14] Compile fix: gtk_handle_box_new() to gtk_box_new()

---
 pan/gui/post-ui.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pan/gui/post-ui.cc b/pan/gui/post-ui.cc
index 14b436f..083a3c7 100644
--- a/pan/gui/post-ui.cc
+++ b/pan/gui/post-ui.cc
@@ -532,7 +532,7 @@ namespace
   void add_widget (GtkUIManager*, GtkWidget* widget, gpointer vbox)
   {
     if (GTK_IS_TOOLBAR (widget)) {
-      GtkWidget * handle_box = gtk_handle_box_new (GTK_ORIENTATION_HORIZONTAL, PAD_SMALL);
+      GtkWidget * handle_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, PAD_SMALL);
       gtk_widget_show (handle_box);
       gtk_container_add (GTK_CONTAINER (handle_box), widget);
       g_signal_connect_swapped (widget, "destroy", G_CALLBACK (gtk_widget_destroy), handle_box);
-- 
GitLab


From fa5f1f6fbd3a8995f7e1cc92359411330d43b8e5 Mon Sep 17 00:00:00 2001
From: FoxMcCloud45 <foxmccloud45@hotmail.com>
Date: Wed, 8 Dec 2021 21:44:54 +0100
Subject: [PATCH 14/14] Removed #include duplicates.

---
 pan/data-impl/headers.cc         | 1 -
 pan/data/article-cache.cc        | 2 --
 pan/data/encode-cache.cc         | 5 -----
 pan/general/e-util.cc            | 3 ---
 pan/general/file-util.cc         | 2 --
 pan/general/text-match.cc        | 2 --
 pan/gui/gui.cc                   | 1 -
 pan/tasks/encoder.cc             | 1 -
 pan/tasks/socket-impl-gio.cc     | 1 -
 pan/tasks/socket-impl-openssl.cc | 1 -
 pan/tasks/task-groups.cc         | 1 -
 pan/tasks/task-xover.cc          | 2 --
 pan/tasks/task-xoverinfo.cc      | 3 ---
 pan/usenet-utils/gpg.cc          | 1 -
 pan/usenet-utils/mime-utils.cc   | 1 -
 15 files changed, 27 deletions(-)

diff --git a/pan/data-impl/headers.cc b/pan/data-impl/headers.cc
index fcd2c22..9906122 100644
--- a/pan/data-impl/headers.cc
+++ b/pan/data-impl/headers.cc
@@ -30,7 +30,6 @@ extern "C" {
   #include <sys/types.h> // for chmod
   #include <sys/stat.h> // for chmod
 }
-#include <glib/gi18n.h>
 #include <pan/general/debug.h>
 #include <pan/general/log.h>
 #include <pan/general/macros.h>
diff --git a/pan/data/article-cache.cc b/pan/data/article-cache.cc
index 3d0e014..bb61f82 100644
--- a/pan/data/article-cache.cc
+++ b/pan/data/article-cache.cc
@@ -18,8 +18,6 @@
  */
 
 #include <config.h>
-#include <glib.h>
-#include <glib/gi18n.h>
 
 extern "C"
 {
diff --git a/pan/data/encode-cache.cc b/pan/data/encode-cache.cc
index e8813e1..0377cec 100644
--- a/pan/data/encode-cache.cc
+++ b/pan/data/encode-cache.cc
@@ -21,9 +21,6 @@
 #include <fstream>
 #include <sstream>
 
-#include <glib.h>
-#include <glib/gi18n.h>
-
 extern "C"
 {
   #include <errno.h>
@@ -32,8 +29,6 @@ extern "C"
   #include <unistd.h>
   #include <dirent.h>
 }
-#include <glib.h>
-#include <glib/gi18n.h>
 
 #include <gmime/gmime.h>
 #include <glib.h>
diff --git a/pan/general/e-util.cc b/pan/general/e-util.cc
index a8cd5c1..b21ca1b 100644
--- a/pan/general/e-util.cc
+++ b/pan/general/e-util.cc
@@ -24,9 +24,6 @@
 #include <cstdlib>
 #include <cstring>
 #include <ctime>
-#include <glib.h>
-#include <glib/gi18n.h>
-
 extern "C" {
   #include <ctype.h>
 }
diff --git a/pan/general/file-util.cc b/pan/general/file-util.cc
index 25ec407..45c3a23 100644
--- a/pan/general/file-util.cc
+++ b/pan/general/file-util.cc
@@ -21,8 +21,6 @@
 #include <cassert>
 #include <cerrno>
 #include <cctype>
-#include <glib.h>
-#include <glib/gi18n.h>
 
 extern "C"
 {
diff --git a/pan/general/text-match.cc b/pan/general/text-match.cc
index f88f128..8486b17 100644
--- a/pan/general/text-match.cc
+++ b/pan/general/text-match.cc
@@ -18,8 +18,6 @@
  */
 
 #include <config.h>
-#include <glib.h>
-#include <glib/gi18n.h>
 
 extern "C" {
   #include <ctype.h>
diff --git a/pan/gui/gui.cc b/pan/gui/gui.cc
index 8c097b2..7dca1e7 100644
--- a/pan/gui/gui.cc
+++ b/pan/gui/gui.cc
@@ -22,7 +22,6 @@
 #include <string>
 #include <sstream>
 #include <fstream>
-#include <glib/gi18n.h>
 extern "C" {
   #include <sys/types.h> // for chmod
   #include <sys/stat.h> // for chmod
diff --git a/pan/tasks/encoder.cc b/pan/tasks/encoder.cc
index 9a4dcc9..fad9a63 100644
--- a/pan/tasks/encoder.cc
+++ b/pan/tasks/encoder.cc
@@ -27,7 +27,6 @@
 #include <ostream>
 #include <fstream>
 #include <sstream>
-#include <glib/gi18n.h>
 
 #define PROTOTYPES
 #include <uulib/uudeview.h>
diff --git a/pan/tasks/socket-impl-gio.cc b/pan/tasks/socket-impl-gio.cc
index b4309e1..b9c44cd 100644
--- a/pan/tasks/socket-impl-gio.cc
+++ b/pan/tasks/socket-impl-gio.cc
@@ -28,7 +28,6 @@
 #include <string>
 #include <cerrno>
 #include <cstring>
-#include <glib/gi18n.h>
 
 extern "C" {
   #include <unistd.h>
diff --git a/pan/tasks/socket-impl-openssl.cc b/pan/tasks/socket-impl-openssl.cc
index 30d43bb..72518d6 100644
--- a/pan/tasks/socket-impl-openssl.cc
+++ b/pan/tasks/socket-impl-openssl.cc
@@ -31,7 +31,6 @@
 #include <string>
 #include <cerrno>
 #include <cstring>
-#include <glib/gi18n.h>
 
 extern "C" {
   #include <unistd.h>
diff --git a/pan/tasks/task-groups.cc b/pan/tasks/task-groups.cc
index 471925f..ad42a3a 100644
--- a/pan/tasks/task-groups.cc
+++ b/pan/tasks/task-groups.cc
@@ -23,7 +23,6 @@
 extern "C" {
   #include <stdlib.h>
 }
-
 #include <pan/general/debug.h>
 #include <pan/general/macros.h>
 #include <pan/general/messages.h>
diff --git a/pan/tasks/task-xover.cc b/pan/tasks/task-xover.cc
index cbd9577..021f099 100644
--- a/pan/tasks/task-xover.cc
+++ b/pan/tasks/task-xover.cc
@@ -29,8 +29,6 @@ extern "C" {
 #include <glib/gi18n.h>
 #include <gmime/gmime-utils.h>
 
-#include <glib/gi18n.h>
-#include <gmime/gmime-utils.h>
 #include <fstream>
 #include <iostream>
 #include <pan/general/debug.h>
diff --git a/pan/tasks/task-xoverinfo.cc b/pan/tasks/task-xoverinfo.cc
index b5ad57f..0cd4147 100644
--- a/pan/tasks/task-xoverinfo.cc
+++ b/pan/tasks/task-xoverinfo.cc
@@ -20,9 +20,6 @@
 #include <config.h>
 #include <cassert>
 #include <cerrno>
-#include <glib/gi18n.h>
-#include <gmime/gmime-utils.h>
-
 extern "C" {
   #include <stdio.h>
 }
diff --git a/pan/usenet-utils/gpg.cc b/pan/usenet-utils/gpg.cc
index f44f60d..0c3ae14 100644
--- a/pan/usenet-utils/gpg.cc
+++ b/pan/usenet-utils/gpg.cc
@@ -23,7 +23,6 @@
 #include <pan/general/log.h>
 #include <pan/general/macros.h>
 #include "gpg.h"
-#include <glib/gi18n.h>
 
 extern "C" {
   #include <stdlib.h>
diff --git a/pan/usenet-utils/mime-utils.cc b/pan/usenet-utils/mime-utils.cc
index 41b3160..f5d7620 100644
--- a/pan/usenet-utils/mime-utils.cc
+++ b/pan/usenet-utils/mime-utils.cc
@@ -23,7 +23,6 @@
 #include <cstdlib>
 #include <iostream>
 #include <sstream>
-#include <gmime/gmime.h>
 extern "C"
 {
   #include <unistd.h>
-- 
GitLab