glib232.patch

   1 diff -ur libgda-3.1.5.orig/libgda/dir-blob-op.c libgda-3.1.5/libgda/dir-blob-op.c
   2 --- libgda-3.1.5.orig/libgda/dir-blob-op.c      2008-07-20 11:51:23.000000000 +0200
   3 +++ libgda-3.1.5/libgda/dir-blob-op.c   2012-06-29 12:53:05.243999205 +0200
   4 @@ -28,7 +28,7 @@
   5  #include <sys/types.h>
   6  #include <sys/stat.h>
   7  #include <unistd.h>
   8 -#include <glib/gstdio.h>
   9 +#include <glib.h>
  10
  11  struct _GdaDirBlobOpPrivate {
  12         gchar *complete_filename;
  13 diff -ur libgda-3.1.5.orig/libgda/gda-column.c libgda-3.1.5/libgda/gda-column.c
  14 --- libgda-3.1.5.orig/libgda/gda-column.c       2008-07-20 11:51:23.000000000 +0200
  15 +++ libgda-3.1.5/libgda/gda-column.c    2012-06-29 12:53:05.237332538 +0200
  16 @@ -23,8 +23,7 @@
  17   * Boston, MA 02111-1307, USA.
  18   */
  19
  20 -#include <glib/gmessages.h>
  21 -#include <glib/gstrfuncs.h>
  22 +#include <glib.h>
  23  #include <libgda/gda-column.h>
  24  #include <string.h>
  25  #include "gda-marshal.h"
  26 diff -ur libgda-3.1.5.orig/libgda/gda-column.h libgda-3.1.5/libgda/gda-column.h
  27 --- libgda-3.1.5.orig/libgda/gda-column.h       2008-07-20 11:43:15.000000000 +0200
  28 +++ libgda-3.1.5/libgda/gda-column.h    2012-06-29 12:53:05.237332538 +0200
  29 @@ -28,7 +28,7 @@
  30
  31  #include <glib-object.h>
  32  #include <libgda/gda-value.h>
  33 -#include <glib/gmacros.h>
  34 +#include <glib.h>
  35  #include <libgda/gda-decl.h>
  36
  37  G_BEGIN_DECLS
  38 diff -ur libgda-3.1.5.orig/libgda/gda-command.c libgda-3.1.5/libgda/gda-command.c
  39 --- libgda-3.1.5.orig/libgda/gda-command.c      2008-07-20 11:51:23.000000000 +0200
  40 +++ libgda-3.1.5/libgda/gda-command.c   2012-06-29 12:53:05.243999205 +0200
  41 @@ -21,9 +21,7 @@
  42   * Boston, MA 02111-1307, USA.
  43   */
  44
  45 -#include <glib/gmem.h>
  46 -#include <glib/gmessages.h>
  47 -#include <glib/gstrfuncs.h>
  48 +#include <glib.h>
  49  #include <libgda/gda-command.h>
  50
  51  GType
  52 diff -ur libgda-3.1.5.orig/libgda/gda-command.h libgda-3.1.5/libgda/gda-command.h
  53 --- libgda-3.1.5.orig/libgda/gda-command.h      2008-07-20 11:51:23.000000000 +0200
  54 +++ libgda-3.1.5/libgda/gda-command.h   2012-06-29 12:53:05.243999205 +0200
  55 @@ -25,8 +25,7 @@
  56  #define __GDA_COMMAND_H__
  57
  58  #include <glib-object.h>
  59 -#include <glib/gmacros.h>
  60 -#include <glib/gtypes.h>
  61 +#include <glib.h>
  62
  63  G_BEGIN_DECLS
  64
  65 diff -ur libgda-3.1.5.orig/libgda/gda-config.c libgda-3.1.5/libgda/gda-config.c
  66 --- libgda-3.1.5.orig/libgda/gda-config.c       2008-07-20 11:51:23.000000000 +0200
  67 +++ libgda-3.1.5/libgda/gda-config.c    2012-06-29 12:53:05.240665871 +0200
  68 @@ -38,7 +38,7 @@
  69  #include <sys/stat.h>
  70  #ifdef HAVE_FAM
  71  #include <fam.h>
  72 -#include <glib/giochannel.h>
  73 +#include <glib.h>
  74  #include <sys/types.h>
  75  #include <sys/stat.h>
  76  #include <unistd.h>
  77 diff -ur libgda-3.1.5.orig/libgda/gda-config.h libgda-3.1.5/libgda/gda-config.h
  78 --- libgda-3.1.5.orig/libgda/gda-config.h       2008-07-20 11:51:23.000000000 +0200
  79 +++ libgda-3.1.5/libgda/gda-config.h    2012-06-29 12:53:05.240665871 +0200
  80 @@ -23,7 +23,7 @@
  81  #ifndef __GDA_CONFIG_H__
  82  #define __GDA_CONFIG_H__
  83
  84 -#include <glib/gmacros.h>
  85 +#include <glib.h>
  86  #include <libgda/gda-data-model.h>
  87  #include <libgda/gda-parameter.h>
  88
  89 diff -ur libgda-3.1.5.orig/libgda/gda-data-model-array.c libgda-3.1.5/libgda/gda-data-model-array.c
  90 --- libgda-3.1.5.orig/libgda/gda-data-model-array.c     2008-07-20 11:51:23.000000000 +0200
  91 +++ libgda-3.1.5/libgda/gda-data-model-array.c  2012-06-29 12:53:05.240665871 +0200
  92 @@ -22,7 +22,7 @@
  93   */
  94
  95  #include <string.h>
  96 -#include <glib/garray.h>
  97 +#include <glib.h>
  98  #include <libgda/gda-data-model-array.h>
  99  #include <glib/gi18n-lib.h>
 100  #include <libgda/gda-row.h>
 101 diff -ur libgda-3.1.5.orig/libgda/gda-data-model.c libgda-3.1.5/libgda/gda-data-model.c
 102 --- libgda-3.1.5.orig/libgda/gda-data-model.c   2008-07-20 11:51:23.000000000 +0200
 103 +++ libgda-3.1.5/libgda/gda-data-model.c        2012-06-29 12:53:05.253999204 +0200
 104 @@ -23,7 +23,7 @@
 105   */
 106
 107  #include <glib/gi18n-lib.h>
 108 -#include <glib/gprintf.h>
 109 +#include <glib.h>
 110  #include <libgda/gda-data-model.h>
 111  #include <libgda/gda-data-model-private.h>
 112  #include <libgda/gda-data-model-extra.h>
 113 diff -ur libgda-3.1.5.orig/libgda/gda-data-model-dir.c libgda-3.1.5/libgda/gda-data-model-dir.c
 114 --- libgda-3.1.5.orig/libgda/gda-data-model-dir.c       2008-07-20 11:51:23.000000000 +0200
 115 +++ libgda-3.1.5/libgda/gda-data-model-dir.c    2012-06-29 12:53:05.250665871 +0200
 116 @@ -21,7 +21,7 @@
 117
 118  #include <string.h>
 119  #include <glib/gi18n-lib.h>
 120 -#include <glib/gstdio.h>
 121 +#include <glib.h>
 122  #include <libgda/gda-data-model.h>
 123  #include <libgda/gda-data-model-dir.h>
 124  #include <libgda/gda-data-model-extra.h>
 125 diff -ur libgda-3.1.5.orig/libgda/gda-data-model-filter-sql.c libgda-3.1.5/libgda/gda-data-model-filter-sql.c
 126 --- libgda-3.1.5.orig/libgda/gda-data-model-filter-sql.c        2008-07-20 11:51:23.000000000 +0200
 127 +++ libgda-3.1.5/libgda/gda-data-model-filter-sql.c     2012-06-29 12:53:05.257332538 +0200
 128 @@ -21,7 +21,7 @@
 129   * Boston, MA 02111-1307, USA.
 130   */
 131
 132 -#include <glib/gdataset.h>
 133 +#include <glib.h>
 134  #include <glib-object.h>
 135  #include <libsql/sql_parser.h>
 136  #include <glib/gi18n-lib.h>
 137 diff -ur libgda-3.1.5.orig/libgda/gda-data-model-hash.c libgda-3.1.5/libgda/gda-data-model-hash.c
 138 --- libgda-3.1.5.orig/libgda/gda-data-model-hash.c      2008-07-20 11:51:23.000000000 +0200
 139 +++ libgda-3.1.5/libgda/gda-data-model-hash.c   2012-06-29 12:53:05.250665871 +0200
 140 @@ -23,7 +23,7 @@
 141   * Boston, MA 02111-1307, USA.
 142   */
 143
 144 -#include <glib/ghash.h>
 145 +#include <glib.h>
 146  #include <glib/gi18n-lib.h>
 147  #include <libgda/gda-data-model-hash.h>
 148  #include <libgda/gda-data-model-extra.h>
 149 diff -ur libgda-3.1.5.orig/libgda/gda-dict.c libgda-3.1.5/libgda/gda-dict.c
 150 --- libgda-3.1.5.orig/libgda/gda-dict.c 2008-07-20 11:51:23.000000000 +0200
 151 +++ libgda-3.1.5/libgda/gda-dict.c      2012-06-29 12:53:05.233999205 +0200
 152 @@ -19,7 +19,7 @@
 153
 154  #include <string.h>
 155  #include <glib/gi18n-lib.h>
 156 -#include <glib/gstdio.h>
 157 +#include <glib.h>
 158  #include "gda-dict.h"
 159  #include "gda-dict-private.h"
 160  #include "gda-marshal.h"
 161 diff -ur libgda-3.1.5.orig/libgda/gda-init.c libgda-3.1.5/libgda/gda-init.c
 162 --- libgda-3.1.5.orig/libgda/gda-init.c 2008-07-20 11:51:23.000000000 +0200
 163 +++ libgda-3.1.5/libgda/gda-init.c      2012-06-29 12:53:05.233999205 +0200
 164 @@ -17,7 +17,7 @@
 165   * Boston, MA 02111-1307, USA.
 166   */
 167
 168 -#include <glib/gmain.h>
 169 +#include <glib.h>
 170  #include <gmodule.h>
 171  #include <libgda/libgda.h>
 172  #include <glib/gi18n-lib.h>
 173 diff -ur libgda-3.1.5.orig/libgda/gda-log.c libgda-3.1.5/libgda/gda-log.c
 174 --- libgda-3.1.5.orig/libgda/gda-log.c  2008-07-20 11:43:15.000000000 +0200
 175 +++ libgda-3.1.5/libgda/gda-log.c       2012-06-29 12:53:05.250665871 +0200
 176 @@ -24,10 +24,7 @@
 177  #include <syslog.h>
 178  #endif
 179  #include <time.h>
 180 -#include <glib/gmem.h>
 181 -#include <glib/gmessages.h>
 182 -#include <glib/gstrfuncs.h>
 183 -#include <glib/gutils.h>
 184 +#include <glib.h>
 185  #include <glib/gi18n-lib.h>
 186  #include <libgda/gda-log.h>
 187
 188 diff -ur libgda-3.1.5.orig/libgda/gda-log.h libgda-3.1.5/libgda/gda-log.h
 189 --- libgda-3.1.5.orig/libgda/gda-log.h  2008-07-20 11:43:15.000000000 +0200
 190 +++ libgda-3.1.5/libgda/gda-log.h       2012-06-29 12:53:05.250665871 +0200
 191 @@ -20,8 +20,7 @@
 192  #if !defined(__gda_log_h__)
 193  #  define __gda_log_h__
 194
 195 -#include <glib/gmacros.h>
 196 -#include <glib/gtypes.h>
 197 +#include <glib.h>
 198  #include <time.h>
 199
 200  G_BEGIN_DECLS
 201 diff -ur libgda-3.1.5.orig/libgda/gda-quark-list.c libgda-3.1.5/libgda/gda-quark-list.c
 202 --- libgda-3.1.5.orig/libgda/gda-quark-list.c   2008-07-20 11:51:23.000000000 +0200
 203 +++ libgda-3.1.5/libgda/gda-quark-list.c        2012-06-29 12:53:05.240665871 +0200
 204 @@ -22,10 +22,7 @@
 205   */
 206
 207  #include <libgda/gda-quark-list.h>
 208 -#include <glib/ghash.h>
 209 -#include <glib/gmem.h>
 210 -#include <glib/gmessages.h>
 211 -#include <glib/gstrfuncs.h>
 212 +#include <glib.h>
 213
 214  struct _GdaQuarkList {
 215         GHashTable *hash_table;
 216 diff -ur libgda-3.1.5.orig/libgda/gda-quark-list.h libgda-3.1.5/libgda/gda-quark-list.h
 217 --- libgda-3.1.5.orig/libgda/gda-quark-list.h   2008-07-20 11:43:15.000000000 +0200
 218 +++ libgda-3.1.5/libgda/gda-quark-list.h        2012-06-29 12:53:05.240665871 +0200
 219 @@ -24,8 +24,7 @@
 220  #ifndef __GDA_QUARK_LIST_H__
 221  #define __GDA_QUARK_LIST_H__
 222
 223 -#include <glib/gmacros.h>
 224 -#include <glib/gtypes.h>
 225 +#include <glib.h>
 226  #include <glib-object.h>
 227
 228  G_BEGIN_DECLS
 229 diff -ur libgda-3.1.5.orig/libgda/gda-row.h libgda-3.1.5/libgda/gda-row.h
 230 --- libgda-3.1.5.orig/libgda/gda-row.h  2008-07-20 11:43:15.000000000 +0200
 231 +++ libgda-3.1.5/libgda/gda-row.h       2012-06-29 12:53:05.250665871 +0200
 232 @@ -27,7 +27,7 @@
 233
 234  #include <glib-object.h>
 235  #include <libgda/gda-column.h>
 236 -#include <glib/gmacros.h>
 237 +#include <glib.h>
 238  #include <libgda/gda-decl.h>
 239
 240  G_BEGIN_DECLS
 241 diff -ur libgda-3.1.5.orig/libgda/gda-server-operation.c libgda-3.1.5/libgda/gda-server-operation.c
 242 --- libgda-3.1.5.orig/libgda/gda-server-operation.c     2008-08-04 13:16:26.000000000 +0200
 243 +++ libgda-3.1.5/libgda/gda-server-operation.c  2012-06-29 12:53:05.270665870 +0200
 244 @@ -21,7 +21,7 @@
 245   */
 246
 247  #include <stdlib.h>
 248 -#include <glib/gmessages.h>
 249 +#include <glib.h>
 250  #include <libgda/gda-marshal.h>
 251  #include <libgda/gda-dict.h>
 252  #include <libgda/gda-dict-type.h>
 253 diff -ur libgda-3.1.5.orig/libgda/gda-server-provider.c libgda-3.1.5/libgda/gda-server-provider.c
 254 --- libgda-3.1.5.orig/libgda/gda-server-provider.c      2008-07-20 11:51:23.000000000 +0200
 255 +++ libgda-3.1.5/libgda/gda-server-provider.c   2012-06-29 12:53:05.253999204 +0200
 256 @@ -22,7 +22,7 @@
 257   * Boston, MA 02111-1307, USA.
 258   */
 259
 260 -#include <glib/gmessages.h>
 261 +#include <glib.h>
 262  #include <libgda/gda-server-provider.h>
 263  #include <libgda/gda-server-provider-extra.h>
 264  #include <libgda/gda-server-provider-private.h>
 265 diff -ur libgda-3.1.5.orig/libgda/gda-util.c libgda-3.1.5/libgda/gda-util.c
 266 --- libgda-3.1.5.orig/libgda/gda-util.c 2008-07-20 11:51:23.000000000 +0200
 267 +++ libgda-3.1.5/libgda/gda-util.c      2012-06-29 12:53:05.247332538 +0200
 268 @@ -27,10 +27,7 @@
 269  #include <fcntl.h>
 270  #include <unistd.h>
 271  #include <string.h>
 272 -#include <glib/gfileutils.h>
 273 -#include <glib/gmessages.h>
 274 -#include <glib/gstrfuncs.h>
 275 -#include <glib/gprintf.h>
 276 +#include <glib.h>
 277  #include <libsql/sql_parser.h>
 278  #include <glib/gi18n-lib.h>
 279  #include <libgda/gda-log.h>
 280 diff -ur libgda-3.1.5.orig/libgda/gda-util.h libgda-3.1.5/libgda/gda-util.h
 281 --- libgda-3.1.5.orig/libgda/gda-util.h 2008-07-20 11:51:23.000000000 +0200
 282 +++ libgda-3.1.5/libgda/gda-util.h      2012-06-29 12:53:05.247332538 +0200
 283 @@ -24,8 +24,7 @@
 284  #ifndef __GDA_UTIL_H__
 285  #define __GDA_UTIL_H__
 286
 287 -#include <glib/ghash.h>
 288 -#include <glib/glist.h>
 289 +#include <glib.h>
 290  #include "gda-parameter.h"
 291  #include "gda-row.h"
 292  #include "gda-connection.h"
 293 diff -ur libgda-3.1.5.orig/libgda/gda-value.c libgda-3.1.5/libgda/gda-value.c
 294 --- libgda-3.1.5.orig/libgda/gda-value.c        2008-07-20 11:51:23.000000000 +0200
 295 +++ libgda-3.1.5/libgda/gda-value.c     2012-06-29 12:53:05.267332537 +0200
 296 @@ -28,10 +28,7 @@
 297  #include <string.h>
 298  #include <stdlib.h>
 299  #include <time.h>
 300 -#include <glib/gdate.h>
 301 -#include <glib/gmessages.h>
 302 -#include <glib/gstrfuncs.h>
 303 -#include <glib/gstring.h>
 304 +#include <glib.h>
 305  #include <glib/gi18n-lib.h>
 306  #include <libgda/gda-value.h>
 307  #include <libgda/gda-blob-op.h>
 308 diff -ur libgda-3.1.5.orig/libgda/gda-value.h libgda-3.1.5/libgda/gda-value.h
 309 --- libgda-3.1.5.orig/libgda/gda-value.h        2008-07-20 11:51:23.000000000 +0200
 310 +++ libgda-3.1.5/libgda/gda-value.h     2012-06-29 12:53:05.267332537 +0200
 311 @@ -27,8 +27,7 @@
 312  #define __GDA_VALUE_H__
 313
 314  #include <time.h>
 315 -#include <glib/glist.h>
 316 -#include <glib/gmacros.h>
 317 +#include <glib.h>
 318  #include <glib-object.h>
 319  #include <libxml/tree.h>
 320  #include <libgda/gda-decl.h>
 321 diff -ur libgda-3.1.5.orig/libgda/sqlite/gda-sqlite.h libgda-3.1.5/libgda/sqlite/gda-sqlite.h
 322 --- libgda-3.1.5.orig/libgda/sqlite/gda-sqlite.h        2008-07-20 11:51:22.000000000 +0200
 323 +++ libgda-3.1.5/libgda/sqlite/gda-sqlite.h     2012-06-29 12:53:05.253999204 +0200
 324 @@ -25,8 +25,7 @@
 325  #ifndef __GDA_SQLITE_H__
 326  #define __GDA_SQLITE_H__
 327
 328 -#include <glib/gmacros.h>
 329 -#include <glib/gtypes.h>
 330 +#include <glib.h>
 331  #include <libgda/gda-value.h>
 332  #include <libgda/gda-connection.h>
 333
 334 diff -ur libgda-3.1.5.orig/libgda/sqlite/gda-sqlite-provider.c libgda-3.1.5/libgda/sqlite/gda-sqlite-provider.c
 335 --- libgda-3.1.5.orig/libgda/sqlite/gda-sqlite-provider.c       2008-07-20 11:51:22.000000000 +0200
 336 +++ libgda-3.1.5/libgda/sqlite/gda-sqlite-provider.c    2012-06-29 12:53:05.257332538 +0200
 337 @@ -24,6 +24,7 @@
 338  #include <stdlib.h>
 339  #include <errno.h>
 340  #include <string.h>
 341 +#include <glib.h>
 342  #include <glib/gi18n-lib.h>
 343  #include <glib/gstdio.h>
 344  #include <libgda/gda-data-model-array.h>
 345 diff -ur libgda-3.1.5.orig/libgda-report/DocBook/gda-report-docbook-document.c libgda-3.1.5/libgda-report/DocBook/gda-report-docbook-document.c
 346 --- libgda-3.1.5.orig/libgda-report/DocBook/gda-report-docbook-document.c       2008-07-20 11:51:14.000000000 +0200
 347 +++ libgda-3.1.5/libgda-report/DocBook/gda-report-docbook-document.c    2012-06-29 12:53:05.230665872 +0200
 348 @@ -21,7 +21,7 @@
 349   */
 350
 351  #include <glib/gi18n-lib.h>
 352 -#include <glib/gstdio.h>
 353 +#include <glib.h>
 354  #include <stdio.h>
 355  #include <unistd.h>
 356  #include <string.h>
 357 diff -ur libgda-3.1.5.orig/libgda-report/gda-report-document.c libgda-3.1.5/libgda-report/gda-report-document.c
 358 --- libgda-3.1.5.orig/libgda-report/gda-report-document.c       2008-07-20 11:51:14.000000000 +0200
 359 +++ libgda-3.1.5/libgda-report/gda-report-document.c    2012-06-29 12:53:05.230665872 +0200
 360 @@ -21,7 +21,7 @@
 361   */
 362
 363  #include <glib/gi18n-lib.h>
 364 -#include <glib/gstdio.h>
 365 +#include <glib.h>
 366  #include <stdio.h>
 367  #include <unistd.h>
 368  #include <string.h>
 369 diff -ur libgda-3.1.5.orig/libgda-report/RML/gda-report-rml-document.c libgda-3.1.5/libgda-report/RML/gda-report-rml-document.c
 370 --- libgda-3.1.5.orig/libgda-report/RML/gda-report-rml-document.c       2008-07-20 11:51:14.000000000 +0200
 371 +++ libgda-3.1.5/libgda-report/RML/gda-report-rml-document.c    2012-06-29 12:53:05.230665872 +0200
 372 @@ -21,7 +21,7 @@
 373   */
 374
 375  #include <glib/gi18n-lib.h>
 376 -#include <glib/gstdio.h>
 377 +#include <glib.h>
 378  #include <stdio.h>
 379  #include <unistd.h>
 380  #include <string.h>
 381 diff -ur libgda-3.1.5.orig/libsql/sql_parser.c libgda-3.1.5/libsql/sql_parser.c
 382 --- libgda-3.1.5.orig/libsql/sql_parser.c       2008-07-20 11:51:38.000000000 +0200
 383 +++ libgda-3.1.5/libsql/sql_parser.c    2012-06-29 12:53:05.273999204 +0200
 384 @@ -17,7 +17,7 @@
 385  #include <stdio.h>
 386  #include <glib.h>
 387  #include <glib/gi18n-lib.h>
 388 -#include <glib/gprintf.h>
 389 +#include <glib.h>
 390  #include <strings.h>
 391  #include <string.h>
 392
 393 diff -ur libgda-3.1.5.orig/providers/bdb/gda-bdb.h libgda-3.1.5/providers/bdb/gda-bdb.h
 394 --- libgda-3.1.5.orig/providers/bdb/gda-bdb.h   2008-07-20 11:51:15.000000000 +0200
 395 +++ libgda-3.1.5/providers/bdb/gda-bdb.h        2012-06-29 12:53:05.273999204 +0200
 396 @@ -25,7 +25,7 @@
 397  #if defined(HAVE_CONFIG_H)
 398  #endif
 399
 400 -#include <glib/gmacros.h>
 401 +#include <glib.h>
 402  #include <glib/gi18n-lib.h>
 403  #include <libgda/gda-server-provider.h>
 404  #include <db.h>
 405 diff -ur libgda-3.1.5.orig/providers/firebird/gda-firebird-provider.c libgda-3.1.5/providers/firebird/gda-firebird-provider.c
 406 --- libgda-3.1.5.orig/providers/firebird/gda-firebird-provider.c        2008-07-20 11:51:15.000000000 +0200
 407 +++ libgda-3.1.5/providers/firebird/gda-firebird-provider.c     2012-06-29 12:53:05.277332537 +0200
 408 @@ -21,7 +21,7 @@
 409  #include <libgda/gda-server-provider-extra.h>
 410  #include <libgda/gda-command.h>
 411  #include <libgda/gda-parameter-list.h>
 412 -#include <glib/gprintf.h>
 413 +#include <glib.h>
 414  #include <string.h>
 415  #include "gda-firebird-provider.h"
 416  #include "gda-firebird-recordset.h"
 417 diff -ur libgda-3.1.5.orig/providers/firebird/gda-firebird-recordset.c libgda-3.1.5/providers/firebird/gda-firebird-recordset.c
 418 --- libgda-3.1.5.orig/providers/firebird/gda-firebird-recordset.c       2008-07-20 11:51:15.000000000 +0200
 419 +++ libgda-3.1.5/providers/firebird/gda-firebird-recordset.c    2012-06-29 12:53:05.273999204 +0200
 420 @@ -27,7 +27,7 @@
 421  #include <libgda/gda-quark-list.h>
 422  #include <libgda/gda-parameter-list.h>
 423  #include <glib/gi18n-lib.h>
 424 -#include <glib/gprintf.h>
 425 +#include <glib.h>
 426  #include <string.h>
 427  #include <math.h>
 428
 429 diff -ur libgda-3.1.5.orig/providers/freetds/gda-freetds.h libgda-3.1.5/providers/freetds/gda-freetds.h
 430 --- libgda-3.1.5.orig/providers/freetds/gda-freetds.h   2007-10-01 17:51:37.000000000 +0200
 431 +++ libgda-3.1.5/providers/freetds/gda-freetds.h        2012-06-29 12:53:05.277332537 +0200
 432 @@ -24,7 +24,7 @@
 433  #if defined(HAVE_CONFIG_H)
 434  #endif
 435
 436 -#include <glib/gmacros.h>
 437 +#include <glib.h>
 438  #include <glib/gi18n-lib.h>
 439  #include <libgda/gda-server-provider.h>
 440  #include <tds.h>
 441 diff -ur libgda-3.1.5.orig/providers/freetds/gda-freetds-message.h libgda-3.1.5/providers/freetds/gda-freetds-message.h
 442 --- libgda-3.1.5.orig/providers/freetds/gda-freetds-message.h   2007-10-01 17:51:37.000000000 +0200
 443 +++ libgda-3.1.5/providers/freetds/gda-freetds-message.h        2012-06-29 12:53:05.277332537 +0200
 444 @@ -24,7 +24,7 @@
 445  #if defined(HAVE_CONFIG_H)
 446  #endif
 447
 448 -#include <glib/gmacros.h>
 449 +#include <glib.h>
 450  #include <glib/gi18n-lib.h>
 451  #include <libgda/gda-server-provider.h>
 452  #include <tds.h>
 453 diff -ur libgda-3.1.5.orig/providers/freetds/gda-freetds-types.h libgda-3.1.5/providers/freetds/gda-freetds-types.h
 454 --- libgda-3.1.5.orig/providers/freetds/gda-freetds-types.h     2007-10-01 17:51:37.000000000 +0200
 455 +++ libgda-3.1.5/providers/freetds/gda-freetds-types.h  2012-06-29 12:53:05.277332537 +0200
 456 @@ -24,7 +24,7 @@
 457  #if defined(HAVE_CONFIG_H)
 458  #endif
 459
 460 -#include <glib/gmacros.h>
 461 +#include <glib.h>
 462  #include <glib/gi18n-lib.h>
 463  #include <libgda/gda-server-provider.h>
 464  #include <tds.h>
 465 diff -ur libgda-3.1.5.orig/providers/ibmdb2/gda-ibmdb2.h libgda-3.1.5/providers/ibmdb2/gda-ibmdb2.h
 466 --- libgda-3.1.5.orig/providers/ibmdb2/gda-ibmdb2.h     2007-10-01 17:51:38.000000000 +0200
 467 +++ libgda-3.1.5/providers/ibmdb2/gda-ibmdb2.h  2012-06-29 12:53:05.277332537 +0200
 468 @@ -23,12 +23,11 @@
 469  #if !defined(__gda_ibmdb2_h__)
 470  #  define __gda_ibmdb2_h__
 471
 472 -#include <glib/gmacros.h>
 473 +#include <glib.h>
 474  #include <glib/gi18n-lib.h>
 475  #include <libgda/gda-connection.h>
 476  #include <libgda/gda-server-provider.h>
 477  #include <libgda/gda-value.h>
 478 -#include <glib/gi18n-lib.h>
 479  #include <sqlcli1.h>
 480  #include "gda-ibmdb2-provider.h"
 481
 482 diff -ur libgda-3.1.5.orig/providers/ibmdb2/gda-ibmdb2-types.h libgda-3.1.5/providers/ibmdb2/gda-ibmdb2-types.h
 483 --- libgda-3.1.5.orig/providers/ibmdb2/gda-ibmdb2-types.h       2007-10-01 17:51:38.000000000 +0200
 484 +++ libgda-3.1.5/providers/ibmdb2/gda-ibmdb2-types.h    2012-06-29 12:53:05.277332537 +0200
 485 @@ -23,7 +23,7 @@
 486  #ifndef __GDA_IBMDB2_TYPES_H__
 487  #define __GDA_IBMDB2_TYPES_H__
 488
 489 -#include <glib/gmacros.h>
 490 +#include <glib.h>
 491  #include <glib/gi18n-lib.h>
 492  #include <libgda/gda-server-provider.h>
 493  #include <sqlcli1.h>
 494 diff -ur libgda-3.1.5.orig/providers/ldap/gda-ldap.h libgda-3.1.5/providers/ldap/gda-ldap.h
 495 --- libgda-3.1.5.orig/providers/ldap/gda-ldap.h 2007-10-01 17:51:37.000000000 +0200
 496 +++ libgda-3.1.5/providers/ldap/gda-ldap.h      2012-06-29 12:53:05.273999204 +0200
 497 @@ -26,7 +26,7 @@
 498  #if !defined(__gda_ldap_h__)
 499  #  define __gda_ldap_h__
 500
 501 -#include <glib/gmacros.h>
 502 +#include <glib.h>
 503  #include <libgda/gda-connection.h>
 504  #include <libgda/gda-server-provider.h>
 505  #include <glib/gi18n-lib.h>
 506 diff -ur libgda-3.1.5.orig/providers/mdb/gda-mdb.h libgda-3.1.5/providers/mdb/gda-mdb.h
 507 --- libgda-3.1.5.orig/providers/mdb/gda-mdb.h   2008-07-20 11:51:16.000000000 +0200
 508 +++ libgda-3.1.5/providers/mdb/gda-mdb.h        2012-06-29 12:53:05.273999204 +0200
 509 @@ -24,7 +24,7 @@
 510  #ifndef __GDA_MDB_H__
 511  #define __GDA_MDB_H__
 512
 513 -#include <glib/gmacros.h>
 514 +#include <glib.h>
 515  #include <libgda/gda-connection.h>
 516  #include <libgda/gda-server-provider.h>
 517  #include <glib/gi18n-lib.h>
 518 diff -ur libgda-3.1.5.orig/providers/mdb/gda-mdb-provider.c libgda-3.1.5/providers/mdb/gda-mdb-provider.c
 519 --- libgda-3.1.5.orig/providers/mdb/gda-mdb-provider.c  2008-07-20 11:51:16.000000000 +0200
 520 +++ libgda-3.1.5/providers/mdb/gda-mdb-provider.c       2012-06-29 12:53:05.273999204 +0200
 521 @@ -22,7 +22,7 @@
 522   */
 523
 524  #include <stdlib.h>
 525 -#include <glib/gbacktrace.h>
 526 +#include <glib.h>
 527  #include <virtual/gda-vconnection-data-model.h>
 528  #include <libgda/gda-data-model-array.h>
 529  #include <libgda/gda-data-model-private.h>
 530 diff -ur libgda-3.1.5.orig/providers/msql/gda-msql.h libgda-3.1.5/providers/msql/gda-msql.h
 531 --- libgda-3.1.5.orig/providers/msql/gda-msql.h 2007-10-01 17:51:41.000000000 +0200
 532 +++ libgda-3.1.5/providers/msql/gda-msql.h      2012-06-29 12:53:05.273999204 +0200
 533 @@ -22,7 +22,7 @@
 534  #ifndef __gda_msql_h__
 535  #define __gda_msql_h__
 536
 537 -#include <glib/gmacros.h>
 538 +#include <glib.h>
 539  #include <libgda/gda-connection.h>
 540  #include <libgda/gda-server-provider.h>
 541  #include <glib/gi18n-lib.h>
 542 diff -ur libgda-3.1.5.orig/providers/mysql/gda-mysql.h libgda-3.1.5/providers/mysql/gda-mysql.h
 543 --- libgda-3.1.5.orig/providers/mysql/gda-mysql.h       2008-07-20 11:51:16.000000000 +0200
 544 +++ libgda-3.1.5/providers/mysql/gda-mysql.h    2012-06-29 12:53:05.273999204 +0200
 545 @@ -25,7 +25,7 @@
 546  #ifndef __GDA_MYSQL_H__
 547  #define __GDA_MYSQL_H__
 548
 549 -#include <glib/gmacros.h>
 550 +#include <glib.h>
 551  #include <libgda/gda-connection.h>
 552  #include <libgda/gda-server-provider.h>
 553  #include <glib/gi18n-lib.h>
 554 diff -ur libgda-3.1.5.orig/providers/odbc/gda-odbc.h libgda-3.1.5/providers/odbc/gda-odbc.h
 555 --- libgda-3.1.5.orig/providers/odbc/gda-odbc.h 2007-10-01 17:51:41.000000000 +0200
 556 +++ libgda-3.1.5/providers/odbc/gda-odbc.h      2012-06-29 12:53:05.273999204 +0200
 557 @@ -25,7 +25,7 @@
 558  #if !defined(__gda_odbc_h__)
 559  #  define __gda_odbc_h__
 560
 561 -#include <glib/gmacros.h>
 562 +#include <glib.h>
 563  #include <glib-object.h>
 564  #include <glib/gi18n-lib.h>
 565  #include <libgda/gda-server-provider.h>
 566 diff -ur libgda-3.1.5.orig/providers/oracle/gda-oracle.h libgda-3.1.5/providers/oracle/gda-oracle.h
 567 --- libgda-3.1.5.orig/providers/oracle/gda-oracle.h     2007-10-01 17:51:38.000000000 +0200
 568 +++ libgda-3.1.5/providers/oracle/gda-oracle.h  2012-06-29 12:53:05.277332537 +0200
 569 @@ -31,7 +31,7 @@
 570  #if defined(HAVE_CONFIG_H)
 571  #endif
 572
 573 -#include <glib/gmacros.h>
 574 +#include <glib.h>
 575  #include <libgda/gda-connection.h>
 576  #include <libgda/gda-server-provider.h>
 577  #include <glib/gi18n-lib.h>
 578 diff -ur libgda-3.1.5.orig/providers/postgres/gda-postgres.h libgda-3.1.5/providers/postgres/gda-postgres.h
 579 --- libgda-3.1.5.orig/providers/postgres/gda-postgres.h 2008-07-20 11:51:16.000000000 +0200
 580 +++ libgda-3.1.5/providers/postgres/gda-postgres.h      2012-06-29 12:53:05.273999204 +0200
 581 @@ -24,7 +24,7 @@
 582  #ifndef __GDA_POSTGRES_H__
 583  #define __GDA_POSTGRES_H__
 584
 585 -#include <glib/gmacros.h>
 586 +#include <glib.h>
 587  #include <glib/gi18n-lib.h>
 588  #include <libgda/gda-server-provider.h>
 589  #include "gda-postgres-provider.h"
 590 diff -ur libgda-3.1.5.orig/providers/sybase/gda-sybase.h libgda-3.1.5/providers/sybase/gda-sybase.h
 591 --- libgda-3.1.5.orig/providers/sybase/gda-sybase.h     2007-10-01 17:51:37.000000000 +0200
 592 +++ libgda-3.1.5/providers/sybase/gda-sybase.h  2012-06-29 12:53:05.277332537 +0200
 593 @@ -32,7 +32,7 @@
 594  #  include <config.h>
 595  #endif
 596
 597 -#include <glib/gmacros.h>
 598 +#include <glib.h>
 599  #include <glib/gi18n-lib.h>
 600  #include <libgda/gda-server-provider.h>
 601  #include <ctpublic.h>
 602 diff -ur libgda-3.1.5.orig/testing/gda-test-model-query.c libgda-3.1.5/testing/gda-test-model-query.c
 603 --- libgda-3.1.5.orig/testing/gda-test-model-query.c    2008-07-20 11:51:16.000000000 +0200
 604 +++ libgda-3.1.5/testing/gda-test-model-query.c 2012-06-29 12:53:05.230665872 +0200
 605 @@ -3,7 +3,7 @@
 606  #include <stdio.h>
 607  #include <string.h>
 608  #include <glib.h>
 609 -#include <glib/gstdio.h>
 610 +#include <glib.h>
 611  #include <gmodule.h>
 612  #include <glib/gi18n-lib.h>
 613
 614 diff -ur libgda-3.1.5.orig/testing/gda-test-sql.c libgda-3.1.5/testing/gda-test-sql.c
 615 --- libgda-3.1.5.orig/testing/gda-test-sql.c    2008-07-20 11:51:16.000000000 +0200
 616 +++ libgda-3.1.5/testing/gda-test-sql.c 2012-06-29 12:53:05.230665872 +0200
 617 @@ -3,7 +3,7 @@
 618  #include <stdio.h>
 619  #include <string.h>
 620  #include <glib.h>
 621 -#include <glib/gstdio.h>
 622 +#include <glib.h>
 623  #include <gmodule.h>
 624  #include <glib/gi18n-lib.h>
 625
 626 diff -ur libgda-3.1.5.orig/tools/gda-diagnose.c libgda-3.1.5/tools/gda-diagnose.c
 627 --- libgda-3.1.5.orig/tools/gda-diagnose.c      2008-07-20 11:51:14.000000000 +0200
 628 +++ libgda-3.1.5/tools/gda-diagnose.c   2012-06-29 12:53:05.230665872 +0200
 629 @@ -24,7 +24,7 @@
 630  #include <stdio.h>
 631  #include <string.h>
 632  #include <glib.h>
 633 -#include <glib/gstdio.h>
 634 +#include <glib.h>
 635  #include <gmodule.h>
 636  #include <glib/gi18n-lib.h>
 637  #include <libgda/gda-server-provider-extra.h>
 638 diff -ur libgda-3.1.5.orig/tools/gda-inspect-dict-file.c libgda-3.1.5/tools/gda-inspect-dict-file.c
 639 --- libgda-3.1.5.orig/tools/gda-inspect-dict-file.c     2008-07-20 11:51:14.000000000 +0200
 640 +++ libgda-3.1.5/tools/gda-inspect-dict-file.c  2012-06-29 12:53:05.227332539 +0200
 641 @@ -1,6 +1,6 @@
 642  #include <libgda/libgda.h>
 643  #include <unistd.h>
 644 -#include <glib/gstdio.h>
 645 +#include <glib.h>
 646  #include <glib/gi18n-lib.h>
 647
 648  /* options */
 649 diff -ur libgda-3.1.5.orig/tools/gda-sql.c libgda-3.1.5/tools/gda-sql.c
 650 --- libgda-3.1.5.orig/tools/gda-sql.c   2008-07-20 11:55:34.000000000 +0200
 651 +++ libgda-3.1.5/tools/gda-sql.c        2012-06-29 12:53:05.227332539 +0200
 652 @@ -21,12 +21,11 @@
 653  #include <libgda/libgda.h>
 654  #include <virtual/libgda-virtual.h>
 655  #include <glib/gi18n-lib.h>
 656 -#include <glib/gprintf.h>
 657 +#include <glib.h>
 658  #include <string.h>
 659  #include <errno.h>
 660  #include <stdio.h>
 661  #include <stdlib.h>
 662 -#include <glib/gstdio.h>
 663  #include "tools-input.h"
 664  #include "command-exec.h"
 665  #include <unistd.h>