GNOME.org
 

[pan: 9/21] Header fix for Arch Linux compilation.


commit ad830b072675ea856f98829c0481859347de5476
Author: FoxMcCloud45 <foxmccloud45 hotmail com>
Date:   Wed Jul 7 00:02:22 2021 +0200

    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>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]