| 1 |
Index: pan/pan/data-impl/data-impl.cc |
| 2 |
=================================================================== |
| 3 |
--- pan.orig/pan/data-impl/data-impl.cc 2012-03-17 15:48:48.208082919 +0100 |
| 4 |
+++ pan/pan/data-impl/data-impl.cc 2012-04-02 12:40:24.994079185 +0200 |
| 5 |
@@ -24,7 +24,7 @@ |
| 6 |
#include <config.h> |
| 7 |
extern "C" { |
| 8 |
#include <glib/gi18n.h> |
| 9 |
- #include <glib/gfileutils.h> // for g_build_filename |
| 10 |
+ #include <glib.h> // for g_build_filename |
| 11 |
} |
| 12 |
#include <pan/general/debug.h> |
| 13 |
#include <pan/general/file-util.h> |
| 14 |
Index: pan/pan/data/article-cache.h |
| 15 |
=================================================================== |
| 16 |
--- pan.orig/pan/data/article-cache.h 2012-03-17 15:48:48.212082934 +0100 |
| 17 |
+++ pan/pan/data/article-cache.h 2012-04-02 12:40:22.086098203 +0200 |
| 18 |
@@ -23,7 +23,7 @@ |
| 19 |
#include <map> |
| 20 |
#include <vector> |
| 21 |
extern "C" { |
| 22 |
- #include <glib/gtypes.h> // for guint64 |
| 23 |
+ #include <glib.h> // for guint64 |
| 24 |
} |
| 25 |
#include <pan/general/string-view.h> |
| 26 |
#include <pan/general/quark.h> |
| 27 |
Index: pan/pan/general/file-util.h |
| 28 |
=================================================================== |
| 29 |
--- pan.orig/pan/general/file-util.h 2012-03-17 15:48:48.216082958 +0100 |
| 30 |
+++ pan/pan/general/file-util.h 2012-04-02 12:40:22.466095717 +0200 |
| 31 |
@@ -25,7 +25,7 @@ |
| 32 |
extern "C" { |
| 33 |
#include <stddef.h> |
| 34 |
#include <stdio.h> |
| 35 |
- #include <glib/gtypes.h> |
| 36 |
+ #include <glib.h> |
| 37 |
#include <glib/gstdio.h> |
| 38 |
} |
| 39 |
#include <pan/general/string-view.h> |
| 40 |
Index: pan/pan/general/locking.h |
| 41 |
=================================================================== |
| 42 |
--- pan.orig/pan/general/locking.h 2012-03-17 15:48:48.216082958 +0100 |
| 43 |
+++ pan/pan/general/locking.h 2012-04-02 12:40:22.930092681 +0200 |
| 44 |
@@ -22,7 +22,7 @@ |
| 45 |
#ifndef _Mutex_h_ |
| 46 |
#define _Mutex_h_ |
| 47 |
|
| 48 |
-#include <glib/gthread.h> |
| 49 |
+#include <glib.h> |
| 50 |
|
| 51 |
namespace pan |
| 52 |
{ |
| 53 |
Index: pan/pan/general/macros.h |
| 54 |
=================================================================== |
| 55 |
--- pan.orig/pan/general/macros.h 2012-03-17 15:48:48.216082958 +0100 |
| 56 |
+++ pan/pan/general/macros.h 2012-04-02 12:40:22.746093886 +0200 |
| 57 |
@@ -62,14 +62,11 @@ |
| 58 |
|
| 59 |
extern "C" |
| 60 |
{ |
| 61 |
- #include <glibconfig.h> // get the version |
| 62 |
- #include <glib/gutils.h> // get GLIB_CHECK_VERSION |
| 63 |
+ #include <glib.h> // get the version |
| 64 |
|
| 65 |
// pick up g_assert() |
| 66 |
#if GLIB_CHECK_VERSION(2,16,0) |
| 67 |
- #include <glib/gtestutils.h> |
| 68 |
#else |
| 69 |
- #include <glib/gmessages.h> |
| 70 |
#endif |
| 71 |
} |
| 72 |
|
| 73 |
Index: pan/pan/general/time-elapsed.h |
| 74 |
=================================================================== |
| 75 |
--- pan.orig/pan/general/time-elapsed.h 2012-03-17 15:48:48.216082958 +0100 |
| 76 |
+++ pan/pan/general/time-elapsed.h 2012-04-02 12:40:22.370096345 +0200 |
| 77 |
@@ -1,9 +1,7 @@ |
| 78 |
#ifndef __Time_Elapsed_h__ |
| 79 |
#define __Time_Elapsed_h__ |
| 80 |
|
| 81 |
-#include <glib/gtypes.h> // for GTimeVal |
| 82 |
-#include <glib/gmain.h> // for g_get_current_time |
| 83 |
-#include <glib/gtimer.h> // for GUSEC_PER_SEC |
| 84 |
+#include <glib.h> // for GTimeVal |
| 85 |
|
| 86 |
namespace pan |
| 87 |
{ |
| 88 |
Index: pan/pan/general/worker-pool.cc |
| 89 |
=================================================================== |
| 90 |
--- pan.orig/pan/general/worker-pool.cc 2012-03-17 15:48:48.216082958 +0100 |
| 91 |
+++ pan/pan/general/worker-pool.cc 2012-04-02 12:40:22.842093258 +0200 |
| 92 |
@@ -21,7 +21,7 @@ |
| 93 |
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 94 |
*/ |
| 95 |
#include <cassert> |
| 96 |
-#include <glib/gmain.h> // for g_idle_add |
| 97 |
+#include <glib.h> // for g_idle_add |
| 98 |
#include <pan/general/debug.h> |
| 99 |
#include <pan/general/macros.h> |
| 100 |
#include "worker-pool.h" |
| 101 |
Index: pan/pan/general/worker-pool.h |
| 102 |
=================================================================== |
| 103 |
--- pan.orig/pan/general/worker-pool.h 2012-03-17 15:48:48.216082958 +0100 |
| 104 |
+++ pan/pan/general/worker-pool.h 2012-04-02 12:40:23.210090850 +0200 |
| 105 |
@@ -24,8 +24,7 @@ |
| 106 |
#define _Worker_Pool_H_ |
| 107 |
|
| 108 |
#include <set> |
| 109 |
-#include <glib/gtypes.h> |
| 110 |
-#include <glib/gthreadpool.h> |
| 111 |
+#include <glib.h> |
| 112 |
|
| 113 |
namespace pan |
| 114 |
{ |
| 115 |
Index: pan/pan/gui/render-bytes.cc |
| 116 |
=================================================================== |
| 117 |
--- pan.orig/pan/gui/render-bytes.cc 2012-03-17 15:48:48.224082981 +0100 |
| 118 |
+++ pan/pan/gui/render-bytes.cc 2012-04-02 12:40:25.646074925 +0200 |
| 119 |
@@ -1,4 +1,4 @@ |
| 120 |
-#include <glib/gutils.h> // g_snprintf |
| 121 |
+#include <glib.h> // g_snprintf |
| 122 |
#include "render-bytes.h" |
| 123 |
|
| 124 |
namespace pan |
| 125 |
Index: pan/pan/gui/render-bytes.h |
| 126 |
=================================================================== |
| 127 |
--- pan.orig/pan/gui/render-bytes.h 2012-03-17 15:48:48.224082981 +0100 |
| 128 |
+++ pan/pan/gui/render-bytes.h 2012-04-02 12:40:26.370070196 +0200 |
| 129 |
@@ -1,6 +1,6 @@ |
| 130 |
#ifndef RENDER_BYTES_H |
| 131 |
#define RENDER_BYTES_H |
| 132 |
-#include <glib/gtypes.h> |
| 133 |
+#include <glib.h> |
| 134 |
namespace pan { |
| 135 |
extern char* render_bytes (guint64); |
| 136 |
} |
| 137 |
Index: pan/pan/tasks/socket-impl-gio.h |
| 138 |
=================================================================== |
| 139 |
--- pan.orig/pan/tasks/socket-impl-gio.h 2012-03-17 15:48:48.228082997 +0100 |
| 140 |
+++ pan/pan/tasks/socket-impl-gio.h 2012-04-02 12:40:23.898086351 +0200 |
| 141 |
@@ -21,8 +21,7 @@ |
| 142 |
#define __SocketGIO_h__ |
| 143 |
|
| 144 |
#include <string> |
| 145 |
-#include <glib/giochannel.h> |
| 146 |
-#include <glib/gstring.h> |
| 147 |
+#include <glib.h> |
| 148 |
#include <pan/tasks/socket.h> |
| 149 |
|
| 150 |
namespace pan |
| 151 |
Index: pan/pan/usenet-utils/mime-utils.h |
| 152 |
=================================================================== |
| 153 |
--- pan.orig/pan/usenet-utils/mime-utils.h 2012-03-17 15:48:48.232083020 +0100 |
| 154 |
+++ pan/pan/usenet-utils/mime-utils.h 2012-04-02 12:40:23.798087005 +0200 |
| 155 |
@@ -21,7 +21,7 @@ |
| 156 |
#define _UtilMime_h_ |
| 157 |
|
| 158 |
#include <vector> |
| 159 |
-#include <glib/gtypes.h> |
| 160 |
+#include <glib.h> |
| 161 |
#include <gmime/gmime-filter.h> |
| 162 |
#include <gmime/gmime-stream.h> |
| 163 |
#include <gmime/gmime-message.h> |
| 164 |
Index: pan/pan/usenet-utils/text-massager.cc |
| 165 |
=================================================================== |
| 166 |
--- pan.orig/pan/usenet-utils/text-massager.cc 2012-03-17 15:48:48.232083020 +0100 |
| 167 |
+++ pan/pan/usenet-utils/text-massager.cc 2012-04-02 12:40:23.706087607 +0200 |
| 168 |
@@ -25,7 +25,6 @@ |
| 169 |
extern "C" { |
| 170 |
#include <glib/gi18n.h> |
| 171 |
} |
| 172 |
-#include <glib/gunicode.h> |
| 173 |
#include "text-massager.h" |
| 174 |
#include <pan/general/log.h> |
| 175 |
using namespace pan; |