[pan: 12/21] Fix merge conflict.

[Dominique Dumont <ddumont src gnome org>]

commit 0f36c31de04c279cea967489fe7e5960713ba95c
Merge: 3b35d8b a5c8e42
Author: FoxMcCloud45 <foxmccloud45 hotmail com>
Date:   Wed Jul 7 09:15:51 2021 +0200

    Fix merge conflict.

 pan/data-impl/headers.cc         |  1 +
 pan/data-impl/profiles.cc        |  2 ++
 pan/data-impl/xover.cc           |  2 +-
 pan/data/article-cache.cc        |  2 ++
 pan/data/data.h                  |  1 +
 pan/data/encode-cache.cc         |  3 +++
 pan/general/e-util.cc            |  3 +++
 pan/general/file-util.cc         |  2 ++
 pan/general/text-match.cc        |  3 +++
 pan/general/utf8-utils.cc        |  2 --
 pan/gui/body-pane.cc             |  2 +-
 pan/gui/group-pane.cc            |  2 +-
 pan/gui/gui.cc                   |  2 +-
 pan/gui/header-pane.cc           |  1 +
 pan/gui/log-ui.cc                |  2 +-
 pan/gui/pan-file-entry.cc        |  2 +-
 pan/gui/pan.cc                   |  2 +-
 pan/gui/post-ui.cc               | 28 +++++++++++++++++++++++++++-
 pan/gui/post-ui.h                |  3 +++
 pan/gui/prefs-ui.cc              |  7 +++++++
 pan/gui/profiles-dialog.cc       | 12 ++++++++++--
 pan/gui/profiles-dialog.h        |  1 +
 pan/tasks/decoder.cc             |  2 +-
 pan/tasks/encoder.cc             |  2 +-
 pan/tasks/socket-impl-gio.cc     |  2 +-
 pan/tasks/socket-impl-openssl.cc |  2 +-
 pan/tasks/task-article.cc        |  5 +----
 pan/tasks/task-groups.cc         |  1 -
 pan/tasks/task-xover.cc          |  1 +
 pan/tasks/task-xoverinfo.cc      |  3 +++
 pan/usenet-utils/gnksa.cc        |  3 ++-
 pan/usenet-utils/gpg.cc          |  2 +-
 pan/usenet-utils/mime-utils.cc   |  6 +++++-
 pan/usenet-utils/scorefile.cc    |  4 +---
 34 files changed, 91 insertions(+), 27 deletions(-)
---
diff --cc pan/general/e-util.cc
index 62879ee,22a8894..d4c8a8b
--- a/pan/general/e-util.cc
+++ b/pan/general/e-util.cc
@@@ -24,11 -24,14 +24,14 @@@
  #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 --cc pan/general/text-match.cc
index d390de0,91c70e8..b8dfd0b
--- a/pan/general/text-match.cc
+++ b/pan/general/text-match.cc
@@@ -18,11 -18,14 +18,14 @@@
   */
  
  #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"
  #include "text-match.h"
diff --cc pan/gui/header-pane.cc
index a4a9952,8f6cf12..c170695
--- a/pan/gui/header-pane.cc
+++ b/pan/gui/header-pane.cc
@@@ -17,11 -17,12 +17,12 @@@
   *
   */
  
+ #include <glib/gi18n.h>
  extern "C" {
    #include <config.h>
 -  #include "gtk-compat.h"
 -  #include "gtk-compat.h"
  }
 +#include "gtk-compat.h"
 +#include <glib/gi18n.h>
  #include <cctype>
  #include <cmath>
  #include <algorithm>
diff --cc pan/gui/post-ui.cc
index eb21384,2a081cc..ba604fa
--- a/pan/gui/post-ui.cc
+++ b/pan/gui/post-ui.cc
@@@ -1756,14 -1652,45 +1756,40 @@@ PostUI :: new_message_from_ui (Mode mod
    // 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): 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())
    {
      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
      g_mime_object_set_header ((GMimeObject *) msg, "X-Face", f.c_str());
 -#endif
    }
  
    // add the 'hidden headers'
diff --cc pan/gui/prefs-ui.cc
index aac9ec1,32e7a1a..8452f5f
--- a/pan/gui/prefs-ui.cc
+++ b/pan/gui/prefs-ui.cc
@@@ -18,8 -18,10 +18,15 @@@
   */
  
  #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>
diff --cc pan/usenet-utils/mime-utils.cc
index 1a3f95f,49342fb..cfef002
--- a/pan/usenet-utils/mime-utils.cc
+++ b/pan/usenet-utils/mime-utils.cc
@@@ -1749,7 -1749,7 +1749,11 @@@ namespace pa
  #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