Index: pan/pan/data-impl/data-impl.cc
===================================================================
--- pan.orig/pan/data-impl/data-impl.cc 2012-03-17 15:48:48.208082919 +0100
+++ pan/pan/data-impl/data-impl.cc 2012-04-02 12:40:24.994079185 +0200
@@ -24,7 +24,7 @@
#include <config.h>
extern "C" {
#include <glib/gi18n.h>
- #include <glib/gfileutils.h> // for g_build_filename
+ #include <glib.h> // for g_build_filename
}
#include <pan/general/debug.h>
#include <pan/general/file-util.h>
Index: pan/pan/data/article-cache.h
===================================================================
--- pan.orig/pan/data/article-cache.h 2012-03-17 15:48:48.212082934 +0100
+++ pan/pan/data/article-cache.h 2012-04-02 12:40:22.086098203 +0200
@@ -23,7 +23,7 @@
#include <map>
#include <vector>
extern "C" {
- #include <glib/gtypes.h> // for guint64
+ #include <glib.h> // for guint64
}
#include <pan/general/string-view.h>
#include <pan/general/quark.h>
Index: pan/pan/general/file-util.h
===================================================================
--- pan.orig/pan/general/file-util.h 2012-03-17 15:48:48.216082958 +0100
+++ pan/pan/general/file-util.h 2012-04-02 12:40:22.466095717 +0200
@@ -25,7 +25,7 @@
extern "C" {
#include <stddef.h>
#include <stdio.h>
- #include <glib/gtypes.h>
+ #include <glib.h>
#include <glib/gstdio.h>
}
#include <pan/general/string-view.h>
Index: pan/pan/general/locking.h
===================================================================
--- pan.orig/pan/general/locking.h 2012-03-17 15:48:48.216082958 +0100
+++ pan/pan/general/locking.h 2012-04-02 12:40:22.930092681 +0200
@@ -22,7 +22,7 @@
#ifndef _Mutex_h_
#define _Mutex_h_
-#include <glib/gthread.h>
+#include <glib.h>
namespace pan
{
Index: pan/pan/general/macros.h
===================================================================
--- pan.orig/pan/general/macros.h 2012-03-17 15:48:48.216082958 +0100
+++ pan/pan/general/macros.h 2012-04-02 12:40:22.746093886 +0200
@@ -62,14 +62,11 @@
extern "C"
{
- #include <glibconfig.h> // get the version
- #include <glib/gutils.h> // get GLIB_CHECK_VERSION
+ #include <glib.h> // get the version
// pick up g_assert()
#if GLIB_CHECK_VERSION(2,16,0)
- #include <glib/gtestutils.h>
#else
- #include <glib/gmessages.h>
#endif
}
Index: pan/pan/general/time-elapsed.h
===================================================================
--- pan.orig/pan/general/time-elapsed.h 2012-03-17 15:48:48.216082958 +0100
+++ pan/pan/general/time-elapsed.h 2012-04-02 12:40:22.370096345 +0200
@@ -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.h> // for GTimeVal
namespace pan
{
Index: pan/pan/general/worker-pool.cc
===================================================================
--- pan.orig/pan/general/worker-pool.cc 2012-03-17 15:48:48.216082958 +0100
+++ pan/pan/general/worker-pool.cc 2012-04-02 12:40:22.842093258 +0200
@@ -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.h> // for g_idle_add
#include <pan/general/debug.h>
#include <pan/general/macros.h>
#include "worker-pool.h"
Index: pan/pan/general/worker-pool.h
===================================================================
--- pan.orig/pan/general/worker-pool.h 2012-03-17 15:48:48.216082958 +0100
+++ pan/pan/general/worker-pool.h 2012-04-02 12:40:23.210090850 +0200
@@ -24,8 +24,7 @@
#define _Worker_Pool_H_
#include <set>
-#include <glib/gtypes.h>
-#include <glib/gthreadpool.h>
+#include <glib.h>
namespace pan
{
Index: pan/pan/gui/render-bytes.cc
===================================================================
--- pan.orig/pan/gui/render-bytes.cc 2012-03-17 15:48:48.224082981 +0100
+++ pan/pan/gui/render-bytes.cc 2012-04-02 12:40:25.646074925 +0200
@@ -1,4 +1,4 @@
-#include <glib/gutils.h> // g_snprintf
+#include <glib.h> // g_snprintf
#include "render-bytes.h"
namespace pan
Index: pan/pan/gui/render-bytes.h
===================================================================
--- pan.orig/pan/gui/render-bytes.h 2012-03-17 15:48:48.224082981 +0100
+++ pan/pan/gui/render-bytes.h 2012-04-02 12:40:26.370070196 +0200
@@ -1,6 +1,6 @@
#ifndef RENDER_BYTES_H
#define RENDER_BYTES_H
-#include <glib/gtypes.h>
+#include <glib.h>
namespace pan {
extern char* render_bytes (guint64);
}
Index: pan/pan/tasks/socket-impl-gio.h
===================================================================
--- pan.orig/pan/tasks/socket-impl-gio.h 2012-03-17 15:48:48.228082997 +0100
+++ pan/pan/tasks/socket-impl-gio.h 2012-04-02 12:40:23.898086351 +0200
@@ -21,8 +21,7 @@
#define __SocketGIO_h__
#include <string>
-#include <glib/giochannel.h>
-#include <glib/gstring.h>
+#include <glib.h>
#include <pan/tasks/socket.h>
namespace pan
Index: pan/pan/usenet-utils/mime-utils.h
===================================================================
--- pan.orig/pan/usenet-utils/mime-utils.h 2012-03-17 15:48:48.232083020 +0100
+++ pan/pan/usenet-utils/mime-utils.h 2012-04-02 12:40:23.798087005 +0200
@@ -21,7 +21,7 @@
#define _UtilMime_h_
#include <vector>
-#include <glib/gtypes.h>
+#include <glib.h>
#include <gmime/gmime-filter.h>
#include <gmime/gmime-stream.h>
#include <gmime/gmime-message.h>
Index: pan/pan/usenet-utils/text-massager.cc
===================================================================
--- pan.orig/pan/usenet-utils/text-massager.cc 2012-03-17 15:48:48.232083020 +0100
+++ pan/pan/usenet-utils/text-massager.cc 2012-04-02 12:40:23.706087607 +0200
@@ -25,7 +25,6 @@
extern "C" {
#include <glib/gi18n.h>
}
-#include <glib/gunicode.h>
#include "text-massager.h"
#include <pan/general/log.h>
using namespace pan;