summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--news/pan/Makefile4
-rw-r--r--news/pan/PLIST5
-rw-r--r--news/pan/distinfo9
-rw-r--r--news/pan/patches/patch-aa719
4 files changed, 10 insertions, 727 deletions
diff --git a/news/pan/Makefile b/news/pan/Makefile
index 8217944e80d..d4567a859c9 100644
--- a/news/pan/Makefile
+++ b/news/pan/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.53 2008/07/14 12:56:11 joerg Exp $
+# $NetBSD: Makefile,v 1.54 2009/02/24 12:24:48 wiz Exp $
#
-DISTNAME= pan-0.132
+DISTNAME= pan-0.133
CATEGORIES= news
MASTER_SITES= http://pan.rebelbase.com/download/releases/${DISTNAME:C/pan-//}/source/
EXTRACT_SUFX= .tar.bz2
diff --git a/news/pan/PLIST b/news/pan/PLIST
index 9cf25fcf598..581e0600d0e 100644
--- a/news/pan/PLIST
+++ b/news/pan/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2008/06/22 08:12:24 wiz Exp $
+@comment $NetBSD: PLIST,v 1.10 2009/02/24 12:24:48 wiz Exp $
bin/pan
share/applications/pan.desktop
share/locale/am/LC_MESSAGES/pan.mo
@@ -29,6 +29,7 @@ share/locale/lv/LC_MESSAGES/pan.mo
share/locale/ms/LC_MESSAGES/pan.mo
share/locale/nb/LC_MESSAGES/pan.mo
share/locale/nl/LC_MESSAGES/pan.mo
+share/locale/oc/LC_MESSAGES/pan.mo
share/locale/pl/LC_MESSAGES/pan.mo
share/locale/pt/LC_MESSAGES/pan.mo
share/locale/pt_BR/LC_MESSAGES/pan.mo
@@ -46,3 +47,5 @@ share/locale/vi/LC_MESSAGES/pan.mo
share/locale/zh_CN/LC_MESSAGES/pan.mo
share/locale/zh_TW/LC_MESSAGES/pan.mo
share/pixmaps/pan.png
+@comment in xdg-dirs: @dirrm share/pixmaps
+@comment in xdg-dirs: @dirrm share/applications
diff --git a/news/pan/distinfo b/news/pan/distinfo
index 36cc9287c61..8f772142489 100644
--- a/news/pan/distinfo
+++ b/news/pan/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.17 2008/06/22 08:12:24 wiz Exp $
+$NetBSD: distinfo,v 1.18 2009/02/24 12:24:48 wiz Exp $
-SHA1 (pan-0.132.tar.bz2) = dc0bf586145b9d617039f49101874fbc76a9dc18
-RMD160 (pan-0.132.tar.bz2) = 8e9bd2b2851cf1794b975ed31317e9ce837a2851
-Size (pan-0.132.tar.bz2) = 1466359 bytes
-SHA1 (patch-aa) = f39b227b0d097f4acf6cb679aef3c6090b30f463
+SHA1 (pan-0.133.tar.bz2) = a0bd98ea1ba174800896611e3305a6b6d8dbde2f
+RMD160 (pan-0.133.tar.bz2) = cfa84e32d6d82731df582e1336f9deffc97aaabd
+Size (pan-0.133.tar.bz2) = 1452883 bytes
diff --git a/news/pan/patches/patch-aa b/news/pan/patches/patch-aa
deleted file mode 100644
index 8fc12c6a46b..00000000000
--- a/news/pan/patches/patch-aa
+++ /dev/null
@@ -1,719 +0,0 @@
-$NetBSD: patch-aa,v 1.11 2008/06/22 08:12:24 wiz Exp $
-
-Upstream patch to work with latest glib (and also older versions).
-
---- pan/data/article-cache.cc 2007-08-01 19:00:01.000000000 +0200
-+++ pan/data/article-cache.cc 2008-03-29 10:28:09.175341212 +0100
-@@ -27,8 +27,7 @@
- #include <unistd.h>
- #include <dirent.h>
-
-- #include <glib.h>
-- #include <glib/gi18n.h>
-+ #include <pan/general/glib-compat.h>
- #include <gmime/gmime.h>
- }
-
---- pan/data/article-cache.h 2007-08-01 19:00:01.000000000 +0200
-+++ pan/data/article-cache.h 2008-03-29 10:28:44.560580324 +0100
-@@ -23,7 +23,7 @@
- #include <map>
- #include <vector>
- extern "C" {
-- #include <glib/gtypes.h> // for guint64
-+ #include <pan/general/glib-compat.h>
- }
- #include <pan/general/string-view.h>
- #include <pan/general/quark.h>
---- pan/data-impl/data-impl.cc 2007-08-01 19:00:00.000000000 +0200
-+++ pan/data-impl/data-impl.cc 2008-03-29 10:29:13.585596767 +0100
-@@ -23,7 +23,7 @@
-
- #include <config.h>
- extern "C" {
-- #include <glib/gi18n.h>
-+ #include <pan/general/glib-compat.h>
- }
- #include <pan/general/debug.h>
- #include <pan/general/file-util.h>
---- pan/data-impl/data-io.cc 2007-08-01 19:00:00.000000000 +0200
-+++ pan/data-impl/data-io.cc 2008-03-29 10:29:37.454432677 +0100
-@@ -27,8 +27,7 @@
- #include <sys/types.h> // for chmod
- #include <sys/stat.h> // for chmod
- #include <unistd.h>
-- #include <glib.h>
-- #include <glib/gi18n.h>
-+ #include <pan/general/glib-compat.h>
- }
- #include <pan/general/debug.h>
- #include <pan/general/file-util.h>
---- pan/data-impl/groups.cc 2007-08-01 19:00:00.000000000 +0200
-+++ pan/data-impl/groups.cc 2008-03-29 10:30:03.735353098 +0100
-@@ -30,7 +30,7 @@
-
- extern "C" {
- #include <unistd.h>
-- #include <glib/gi18n.h>
-+ #include <pan/general/glib-compat.h>
- }
-
- #include <pan/general/debug.h>
---- pan/data-impl/headers.cc 2007-08-01 19:00:00.000000000 +0200
-+++ pan/data-impl/headers.cc 2008-03-29 10:30:31.508325815 +0100
-@@ -27,8 +27,7 @@
- extern "C" {
- #include <sys/types.h> // for chmod
- #include <sys/stat.h> // for chmod
-- #include <glib/gi18n.h>
-- #include <glib/gmessages.h> // for g_assert
-+ #include <pan/general/glib-compat.h>
- }
- #include <pan/general/debug.h>
- #include <pan/general/foreach.h>
---- pan/data-impl/my-tree.cc 2007-08-01 19:00:00.000000000 +0200
-+++ pan/data-impl/my-tree.cc 2008-03-29 10:31:02.341402615 +0100
-@@ -19,7 +19,7 @@
-
- #include <config.h>
- #include <cassert>
--#include <glib/gmessages.h> // for g_assert
-+#include <pan/general/glib-compat.h>
- #include <pan/general/debug.h>
- #include <pan/general/foreach.h>
- #include <pan/general/quark.h>
---- pan/data-impl/profiles.cc 2007-08-01 19:26:18.000000000 +0200
-+++ pan/data-impl/profiles.cc 2008-03-29 10:31:28.674315169 +0100
-@@ -26,8 +26,7 @@
- extern "C" {
- #include <sys/types.h> // for chmod
- #include <sys/stat.h> // for chmod
-- #include <glib.h>
-- #include <glib/gi18n.h>
-+ #include <pan/general/glib-compat.h>
- }
- #include <pan/general/debug.h>
- #include <pan/general/string-view.h>
---- pan/data-impl/server.cc 2007-08-01 19:00:00.000000000 +0200
-+++ pan/data-impl/server.cc 2008-03-29 10:32:01.547454646 +0100
-@@ -26,8 +26,7 @@
- #include <set>
- #include <vector>
- extern "C" {
-- #include <glib.h> // for GMarkup
-- #include <glib/gi18n.h>
-+ #include <pan/general/glib-compat.h>
- }
- #include <pan/general/debug.h>
- #include <pan/general/file-util.h>
---- pan/data-impl/xover.cc 2007-08-01 19:00:00.000000000 +0200
-+++ pan/data-impl/xover.cc 2008-03-29 10:32:27.016337677 +0100
-@@ -21,7 +21,7 @@
- #include <cmath>
- #include <fstream>
- extern "C" {
-- #include <glib/gi18n.h>
-+ #include <pan/general/glib-compat.h>
- #include <gmime/gmime.h>
- }
- #include <pan/general/debug.h>
---- pan/general/e-util.cc 2007-08-01 19:00:01.000000000 +0200
-+++ pan/general/e-util.cc 2008-03-29 10:24:37.099916303 +0100
-@@ -28,8 +28,7 @@
- #include <ctime>
- extern "C" {
- #include <ctype.h>
-- #include <glib.h>
-- #include <glib/gi18n.h>
-+ #include "glib-compat.h"
- }
- #include "debug.h"
- #include "e-util.h"
---- pan/general/file-util.cc 2007-08-01 19:00:01.000000000 +0200
-+++ pan/general/file-util.cc 2008-03-29 10:24:53.672496427 +0100
-@@ -29,8 +29,7 @@
- #include <sys/stat.h>
- #include <sys/types.h>
-
-- #include <glib.h>
-- #include <glib/gi18n.h>
-+ #include "glib-compat.h"
- }
-
- #include "debug.h"
---- pan/general/file-util.h 2008-03-29 11:48:19.034385493 +0100
-+++ pan/general/file-util.h 2008-03-29 11:56:50.316234274 +0100
-@@ -28,26 +28,10 @@
- extern "C" {
- #include <stddef.h>
- #include <stdio.h>
-- #include <glib/gtypes.h>
-- #include <glib.h>
-+ #include "glib-compat.h"
- }
- #include <pan/general/string-view.h>
-
--#if GLIB_CHECK_VERSION(2,6,0)
--extern "C" {
-- #include <glib/gstdio.h>
--}
--#define g_freopen freopen
--#define g_fopen fopen
--#define g_rmdir rmdir
--#define g_remove remove
--#define g_unlink unlink
--#define g_lstat lstat
--#define g_stat stat
--#define g_rename rename
--#define g_open open
--#endif
--
- namespace pan
- {
- /**
---- pan/general/glib-compat.h 1970-01-01 01:00:00.000000000 +0100
-+++ pan/general/glib-compat.h 2008-04-07 10:24:10.502546064 +0200
-@@ -0,0 +1,45 @@
-+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-+/*
-+ * Pan - A Newsreader for Gtk+
-+ * Copyright (C) 2002-2008 Charles Kerr <charles@rebelbase.com>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; version 2 of the License.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ */
-+
-+#ifndef __G_LIB_H__
-+#include <glib.h>
-+#endif
-+
-+#include <glib/gmessages.h>
-+#include <glib/gi18n.h>
-+#include <glib/gtypes.h>
-+#include <glib/gunicode.h>
-+#include <glib/gtypes.h>
-+#include <glib/gmain.h>
-+#include <glib/gtimer.h>
-+#include <glib/gthread.h>
-+#include <glib/gthreadpool.h>
-+
-+#if GLIB_CHECK_VERSION(2,6,0)
-+ #include <glib/gstdio.h>
-+ #define g_freopen freopen
-+ #define g_fopen fopen
-+ #define g_rmdir rmdir
-+ #define g_remove remove
-+ #define g_unlink unlink
-+ #define g_lstat lstat
-+ #define g_stat stat
-+ #define g_rename rename
-+ #define g_open open
-+#endif
---- pan/general/line-reader.cc 2007-08-01 19:00:01.000000000 +0200
-+++ pan/general/line-reader.cc 2008-03-29 10:25:24.401572142 +0100
-@@ -1,7 +1,7 @@
- #include <config.h>
- #include <cstdio>
- extern "C"{
-- #include <glib/gi18n.h>
-+ #include "glib-compat.h"
- }
- #include <cerrno>
- #include "file-util.h"
---- pan/general/locking.h 2007-08-01 19:00:01.000000000 +0200
-+++ pan/general/locking.h 2008-03-29 10:25:38.774075290 +0100
-@@ -22,7 +22,7 @@
- #ifndef _Mutex_h_
- #define _Mutex_h_
-
--#include <glib/gthread.h>
-+#include "glib-compat.h"
-
- namespace pan
- {
---- pan/general/text-match.cc 2007-08-01 19:00:01.000000000 +0200
-+++ pan/general/text-match.cc 2008-03-29 10:25:55.638665696 +0100
-@@ -21,8 +21,7 @@
- extern "C" {
- #include <ctype.h>
- #include <pcre.h>
-- #include <glib.h>
-- #include <glib/gi18n.h>
-+ #include "glib-compat.h"
- }
- #include "debug.h"
- #include "log.h"
---- pan/general/time-elapsed.h 2007-08-01 19:00:01.000000000 +0200
-+++ pan/general/time-elapsed.h 2008-03-29 10:26:11.999238473 +0100
-@@ -1,9 +1,7 @@
- #ifndef __Time_Elapsed_h__
- #define __Time_Elapsed_h__
-
--#include <glib/gtypes.h> // for GTimeVal
--#include <glib/gmain.h> // for g_get_current_time
--#include <glib/gtimer.h> // for GUSEC_PER_SEC
-+#include "glib-compat.h"
-
- namespace pan
- {
---- pan/general/utf8-utils.cc 2007-08-01 19:00:01.000000000 +0200
-+++ pan/general/utf8-utils.cc 2008-03-29 10:26:32.335950476 +0100
-@@ -23,7 +23,7 @@
- #include <string.h>
- #include <glib.h>
- extern "C" {
--#include <glib/gi18n.h>
-+#include "glib-compat.h"
- }
- #include <locale.h>
- #include <gmime/gmime.h>
---- pan/general/worker-pool.cc 2007-08-01 19:00:01.000000000 +0200
-+++ pan/general/worker-pool.cc 2008-03-29 10:26:49.336545697 +0100
-@@ -21,7 +21,7 @@
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
- #include <cassert>
--#include <glib/gmain.h> // for g_idle_add
-+#include "glib-compat.h"
- #include <pan/general/foreach.h>
- #include "worker-pool.h"
-
---- pan/general/worker-pool.h 2007-08-01 19:00:01.000000000 +0200
-+++ pan/general/worker-pool.h 2008-03-29 10:27:08.833228330 +0100
-@@ -24,8 +24,7 @@
- #define _Worker_Pool_H_
-
- #include <set>
--#include <glib/gtypes.h>
--#include <glib/gthreadpool.h>
-+#include "glib-compat.h"
-
- namespace pan
- {
---- pan/gui/actions.cc 2007-08-01 19:00:00.000000000 +0200
-+++ pan/gui/actions.cc 2008-03-29 10:33:13.569952196 +0100
-@@ -19,7 +19,7 @@
-
- #include <config.h>
- extern "C" {
-- #include <glib/gi18n.h>
-+ #include <pan/general/glib-compat.h>
- #include <gtk/gtk.h>
- }
- #include <pan/general/debug.h>
---- pan/gui/body-pane.cc 2007-08-01 19:00:00.000000000 +0200
-+++ pan/gui/body-pane.cc 2008-03-29 10:33:57.167464724 +0100
-@@ -22,7 +22,7 @@
- #include <cmath>
- #include <iostream>
- extern "C" {
-- #include <glib/gi18n.h>
-+ #include <pan/general/glib-compat.h>
- #include <gtk/gtk.h>
- #include <gdk/gdkkeysyms.h>
- #include <gmime/gmime.h>
---- pan/gui/dl-headers-ui.cc 2007-08-01 19:00:00.000000000 +0200
-+++ pan/gui/dl-headers-ui.cc 2008-03-29 10:34:25.684454334 +0100
-@@ -19,8 +19,7 @@
-
- #include <config.h>
- extern "C" {
-- #include <glib.h>
-- #include <glib/gi18n.h>
-+ #include <pan/general/glib-compat.h>
- #include <gtk/gtk.h>
- }
- #include <pan/general/foreach.h>
---- pan/gui/e-charset-picker.c 2007-08-01 19:00:00.000000000 +0200
-+++ pan/gui/e-charset-picker.c 2008-03-29 11:40:38.814395583 +0100
-@@ -37,7 +37,7 @@
- #include <gtk/gtksignal.h>
- #include <gtk/gtkmessagedialog.h>
-
--#include <glib/gi18n.h>
-+#include <pan/general/glib-compat.h>
-
- typedef enum {
- E_CHARSET_UNKNOWN,
---- pan/gui/group-pane.cc 2007-08-01 19:00:00.000000000 +0200
-+++ pan/gui/group-pane.cc 2008-03-29 10:34:50.621319878 +0100
-@@ -21,7 +21,7 @@
- #include <cassert>
- #include <deque>
- extern "C" {
-- #include <glib/gi18n.h>
-+ #include <pan/general/glib-compat.h>
- #include <gtk/gtk.h>
- }
- #include <pan/general/debug.h>
---- pan/gui/group-prefs-dialog.cc 2007-08-01 19:00:00.000000000 +0200
-+++ pan/gui/group-prefs-dialog.cc 2008-03-29 10:35:20.810367936 +0100
-@@ -19,7 +19,7 @@
-
- #include <config.h>
- extern "C" {
-- #include <glib/gi18n.h>
-+ #include <pan/general/glib-compat.h>
- #include <gtk/gtk.h>
- }
- #include <pan/general/debug.h>
---- pan/gui/gui.cc 2007-08-01 19:00:00.000000000 +0200
-+++ pan/gui/gui.cc 2008-03-29 10:35:39.707024080 +0100
-@@ -24,7 +24,7 @@
- extern "C" {
- #include <sys/types.h> // for chmod
- #include <sys/stat.h> // for chmod
-- #include <glib/gi18n.h>
-+ #include <pan/general/glib-compat.h>
- }
- #include <pan/general/debug.h>
- #include <pan/general/e-util.h>
---- pan/gui/header-pane.cc 2007-08-01 19:00:00.000000000 +0200
-+++ pan/gui/header-pane.cc 2008-03-29 10:35:58.419673922 +0100
-@@ -19,7 +19,7 @@
-
- extern "C" {
- #include <config.h>
-- #include <glib/gi18n.h>
-+ #include <pan/general/glib-compat.h>
- #include <gtk/gtk.h>
- }
- #include <cctype>
---- pan/gui/log-ui.cc 2007-08-01 19:00:00.000000000 +0200
-+++ pan/gui/log-ui.cc 2008-03-29 10:36:20.216430978 +0100
-@@ -21,7 +21,7 @@
- #include <ostream>
- #include <fstream>
- extern "C" {
-- #include <glib/gi18n.h>
-+ #include <pan/general/glib-compat.h>
- #include <gtk/gtk.h>
- }
- #include <pan/general/foreach.h>
---- pan/gui/pan.cc 2007-08-01 19:00:00.000000000 +0200
-+++ pan/gui/pan.cc 2008-03-29 10:36:38.817077115 +0100
-@@ -20,7 +20,7 @@
- #include <config.h>
- #include <signal.h>
- extern "C" {
-- #include <glib/gi18n.h>
-+ #include <pan/general/glib-compat.h>
- #include <gtk/gtk.h>
- #include <gmime/gmime.h>
- }
---- pan/gui/pan-file-entry.cc 2007-08-01 19:00:00.000000000 +0200
-+++ pan/gui/pan-file-entry.cc 2008-03-29 11:38:02.264968572 +0100
-@@ -20,7 +20,7 @@
- #include <config.h>
- #include <string>
- extern "C" {
-- #include <glib/gi18n.h>
-+ #include <pan/general/glib-compat.h>
- #include <gtk/gtk.h>
- }
- #include <pan/general/file-util.h>
---- pan/gui/post-ui.cc 2007-08-01 19:27:37.000000000 +0200
-+++ pan/gui/post-ui.cc 2008-03-29 10:37:20.826536722 +0100
-@@ -23,7 +23,7 @@
- #include <sstream>
- extern "C" {
- #include <gmime/gmime.h>
-- #include <glib/gi18n.h>
-+ #include <pan/general/glib-compat.h>
- #include <gtk/gtk.h>
- #ifdef HAVE_GTKSPELL
- #include <gtkspell/gtkspell.h>
---- pan/gui/prefs.cc 2007-08-01 19:00:00.000000000 +0200
-+++ pan/gui/prefs.cc 2008-03-29 10:37:40.143208016 +0100
-@@ -23,8 +23,7 @@
- #include <sstream>
- #include <string>
- extern "C" {
-- #include <glib.h>
-- #include <glib/gi18n.h>
-+ #include <pan/general/glib-compat.h>
- }
- #include <pan/general/debug.h>
- #include <pan/general/foreach.h>
---- pan/gui/prefs-ui.cc 2007-08-01 19:00:00.000000000 +0200
-+++ pan/gui/prefs-ui.cc 2008-03-29 10:38:00.299908596 +0100
-@@ -19,7 +19,7 @@
-
- #include <config.h>
- extern "C" {
-- #include <glib/gi18n.h>
-+ #include <pan/general/glib-compat.h>
- #include <gtk/gtk.h>
- }
- #include <pan/general/debug.h>
---- pan/gui/profiles-dialog.cc 2007-08-01 19:00:00.000000000 +0200
-+++ pan/gui/profiles-dialog.cc 2008-03-29 10:38:21.064630409 +0100
-@@ -24,7 +24,7 @@
- #include <config.h>
- #include <iostream>
- extern "C" {
-- #include <glib/gi18n.h>
-+ #include <pan/general/glib-compat.h>
- #include <gtk/gtk.h>
- }
- #include <pan/general/debug.h>
---- pan/gui/render-bytes.cc 2007-08-01 19:00:00.000000000 +0200
-+++ pan/gui/render-bytes.cc 2008-03-29 10:38:44.165433544 +0100
-@@ -1,4 +1,4 @@
--#include <glib/gutils.h> // g_snprintf
-+#include <pan/general/glib-compat.h>
- #include "render-bytes.h"
-
- namespace pan
---- pan/gui/render-bytes.h 2007-08-01 19:00:00.000000000 +0200
-+++ pan/gui/render-bytes.h 2008-03-29 10:41:52.299965125 +0100
-@@ -1,6 +1,6 @@
- #ifndef RENDER_BYTES_H
- #define RENDER_BYTES_H
--#include <glib/gtypes.h>
-+#include <pan/general/glib-compat.h>
- namespace pan {
- extern char* render_bytes (guint64);
- }
---- pan/gui/save-ui.cc 2007-08-01 19:00:00.000000000 +0200
-+++ pan/gui/save-ui.cc 2008-03-29 10:39:04.934155706 +0100
-@@ -19,7 +19,7 @@
-
- #include <config.h>
- extern "C" {
-- #include <glib/gi18n.h>
-+ #include <pan/general/glib-compat.h>
- #include <gtk/gtk.h>
- }
- #include <pan/general/debug.h>
---- pan/gui/score-add-ui.cc 2007-08-01 19:00:00.000000000 +0200
-+++ pan/gui/score-add-ui.cc 2008-03-29 10:39:24.446834281 +0100
-@@ -20,7 +20,7 @@
- #include <config.h>
- #include <cassert>
- extern "C" {
-- #include <glib/gi18n.h>
-+ #include <pan/general/glib-compat.h>
- }
- #include <pan/general/debug.h>
- #include <pan/general/text-match.h>
---- pan/gui/score-view-ui.cc 2007-08-01 19:00:00.000000000 +0200
-+++ pan/gui/score-view-ui.cc 2008-03-29 10:39:43.603498787 +0100
-@@ -19,7 +19,7 @@
-
- #include <config.h>
- extern "C" {
-- #include <glib/gi18n.h>
-+ #include <pan/general/glib-compat.h>
- #include <gtk/gtk.h>
- }
- #include <pan/general/debug.h>
---- pan/gui/server-ui.cc 2007-08-01 19:00:00.000000000 +0200
-+++ pan/gui/server-ui.cc 2008-03-29 10:40:05.944273805 +0100
-@@ -21,8 +21,7 @@
- #include <cstdlib>
- #include <cstring>
- extern "C" {
-- #include <glib.h>
-- #include <glib/gi18n.h>
-+ #include <pan/general/glib-compat.h>
- #include <gtk/gtk.h>
- }
- #include <pan/general/foreach.h>
---- pan/gui/task-pane.cc 2007-08-01 19:00:00.000000000 +0200
-+++ pan/gui/task-pane.cc 2008-03-29 10:40:30.369121269 +0100
-@@ -19,8 +19,7 @@
-
- #include <config.h>
- extern "C" {
-- #include <glib.h>
-- #include <glib/gi18n.h>
-+ #include <pan/general/glib-compat.h>
- #include <gtk/gtk.h>
- }
- #include <pan/general/debug.h>
---- pan/gui/url.cc 2007-08-01 19:00:00.000000000 +0200
-+++ pan/gui/url.cc 2008-03-29 10:40:57.562064958 +0100
-@@ -21,8 +21,7 @@
- #include <iostream>
- #include <string>
- extern "C" {
-- #include <glib.h>
-- #include <glib/gi18n.h>
-+ #include <pan/general/glib-compat.h>
- };
- #include <pan/general/log.h>
- #include "url.h"
---- pan/tasks/decoder.cc 2007-08-01 19:00:00.000000000 +0200
-+++ pan/tasks/decoder.cc 2008-03-29 10:42:47.169870620 +0100
-@@ -27,9 +27,9 @@
- #include <ostream>
- #include <fstream>
- extern "C" {
--# define PROTOTYPES
--# include <uulib/uudeview.h>
--# include <glib/gi18n.h>
-+ #define PROTOTYPES
-+ #include <uulib/uudeview.h>
-+ #include <pan/general/glib-compat.h>
- };
- #include <pan/general/debug.h>
- #include <pan/general/file-util.h>
---- pan/tasks/nntp.cc 2007-08-01 19:00:00.000000000 +0200
-+++ pan/tasks/nntp.cc 2008-03-29 10:43:05.866520075 +0100
-@@ -21,8 +21,7 @@
- #include <cassert>
- #include <cstdarg>
- extern "C" {
-- #include <glib.h>
-- #include <glib/gi18n.h>
-+ #include <pan/general/glib-compat.h>
- }
- #include <pan/general/debug.h>
- #include <pan/general/log.h>
---- pan/tasks/nntp-pool.cc 2007-08-01 19:00:00.000000000 +0200
-+++ pan/tasks/nntp-pool.cc 2008-03-29 10:43:46.291920677 +0100
-@@ -19,7 +19,7 @@
-
- #include <config.h>
- #include <ctime>
--#include <glib/gi18n.h>
-+#include <pan/general/glib-compat.h>
- #include <pan/general/debug.h>
- #include <pan/general/foreach.h>
- #include <pan/general/log.h>
---- pan/tasks/socket-impl-gio.cc 2007-08-01 19:00:00.000000000 +0200
-+++ pan/tasks/socket-impl-gio.cc 2008-03-29 10:44:17.172975084 +0100
-@@ -31,8 +31,7 @@
-
- extern "C" {
- #include <unistd.h>
-- #include <glib.h>
-- #include <glib/gi18n.h>
-+ #include <pan/general/glib-compat.h>
- }
-
- #include <pan/general/file-util.h>
---- pan/tasks/task-article.cc 2007-08-01 19:00:00.000000000 +0200
-+++ pan/tasks/task-article.cc 2008-03-29 10:44:38.725711567 +0100
-@@ -25,7 +25,7 @@
- #include <algorithm>
- #include <cassert>
- extern "C" {
--#include <glib/gi18n.h>
-+#include <pan/general/glib-compat.h>
- }
- #include <pan/general/debug.h>
- #include <pan/general/file-util.h>
---- pan/tasks/task-groups.cc 2007-08-01 19:00:00.000000000 +0200
-+++ pan/tasks/task-groups.cc 2008-03-29 10:44:59.634426490 +0100
-@@ -20,7 +20,7 @@
- #include <config.h>
- #include <cassert>
- extern "C" {
-- #include <glib/gi18n.h>
-+ #include <pan/general/glib-compat.h>
- }
- #include <pan/general/debug.h>
- #include <pan/general/foreach.h>
---- pan/tasks/task-post.cc 2007-08-01 19:00:00.000000000 +0200
-+++ pan/tasks/task-post.cc 2008-03-29 10:45:21.387170729 +0100
-@@ -19,7 +19,7 @@
-
- #include <config.h>
- extern "C" {
-- #include <glib/gi18n.h>
-+ #include <pan/general/glib-compat.h>
- }
- #include "task-post.h"
- #include <pan/general/debug.h>
---- pan/tasks/task-xover.cc 2007-08-01 19:00:00.000000000 +0200
-+++ pan/tasks/task-xover.cc 2008-03-29 10:45:47.616068719 +0100
-@@ -21,7 +21,7 @@
- #include <cassert>
- #include <cerrno>
- extern "C" {
-- #include <glib/gi18n.h>
-+ #include <pan/general/glib-compat.h>
- #include <gmime/gmime-utils.h>
- }
- #include <pan/general/debug.h>
---- pan/usenet-utils/filter-info.cc 2007-08-01 18:59:59.000000000 +0200
-+++ pan/usenet-utils/filter-info.cc 2008-03-29 10:46:25.993383793 +0100
-@@ -19,8 +19,7 @@
-
- #include <config.h>
- extern "C" {
-- #include <glib.h>
-- #include <glib/gi18n.h>
-+ #include <pan/general/glib-compat.h>
- }
- #include <pan/general/foreach.h>
- #include "filter-info.h"
---- pan/usenet-utils/gnksa.cc 2007-08-01 18:59:59.000000000 +0200
-+++ pan/usenet-utils/gnksa.cc 2008-03-29 10:46:59.906547006 +0100
-@@ -36,7 +36,7 @@
- {
- #include <ctype.h>
- #include <unistd.h>
-- #include <glib/gi18n.h>
-+ #include <pan/general/glib-compat.h>
- }
-
- #include <pan/general/debug.h>
---- pan/usenet-utils/message-check.cc 2007-08-01 18:59:59.000000000 +0200
-+++ pan/usenet-utils/message-check.cc 2008-03-29 10:47:20.727261653 +0100
-@@ -22,7 +22,7 @@
- #include <string.h>
- #include <glib.h>
- extern "C" {
--#include <glib/gi18n.h>
-+#include <pan/general/glib-compat.h>
- }
- #include <pan/general/debug.h>
- #include <pan/general/foreach.h>
---- pan/usenet-utils/mime-utils.h 2007-08-01 18:59:59.000000000 +0200
-+++ pan/usenet-utils/mime-utils.h 2008-03-29 10:48:34.309790222 +0100
-@@ -21,7 +21,7 @@
- #define _UtilMime_h_
-
- #include <vector>
--#include <glib/gtypes.h>
-+#include <pan/general/glib-compat.h>
- #include <gmime/gmime-filter.h>
- #include <gmime/gmime-stream.h>
- #include <gmime/gmime-message.h>
---- pan/usenet-utils/scorefile.cc 2007-08-01 18:59:59.000000000 +0200
-+++ pan/usenet-utils/scorefile.cc 2008-03-29 10:47:40.255932291 +0100
-@@ -22,7 +22,7 @@
- #include <sstream>
- #include <string>
- extern "C" {
-- #include <glib/gi18n.h>
-+ #include <pan/general/glib-compat.h>
- }
- #include <pan/general/debug.h>
- #include <pan/general/log.h>
---- pan/usenet-utils/text-massager.cc 2007-08-01 18:59:59.000000000 +0200
-+++ pan/usenet-utils/text-massager.cc 2008-03-29 10:48:11.144993711 +0100
-@@ -20,9 +20,8 @@
- #include <config.h>
- #include <vector>
- extern "C" {
--#include <glib/gi18n.h>
-+#include <pan/general/glib-compat.h>
- }
--#include <glib/gunicode.h>
- #include "text-massager.h"
-
- using namespace pan;