Sophie: gda2.0-3.1.5-14.mga3 src

gda2.0-3.1.5-14.mga3.src.rpm

--- libgda/gda-column.h.glib	2011-12-08 15:03:40.734619410 +0800
+++ libgda/gda-column.h	2011-12-08 15:06:08.944662665 +0800
@@ -28,7 +28,7 @@
 
 #include <glib-object.h>
 #include <libgda/gda-value.h>
-#include <glib/gmacros.h>
+#include <glib.h>
 #include <libgda/gda-decl.h>
 
 G_BEGIN_DECLS
--- libgda/gda-command.h.glib	2011-12-08 15:03:40.734619410 +0800
+++ libgda/gda-command.h	2011-12-08 15:06:08.955044329 +0800
@@ -25,8 +25,8 @@
 #define __GDA_COMMAND_H__
 
 #include <glib-object.h>
-#include <glib/gmacros.h>
-#include <glib/gtypes.h>
+#include <glib.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 
--- libgda/gda-config.h.glib	2011-12-08 15:03:40.744622906 +0800
+++ libgda/gda-config.h	2011-12-08 15:06:08.964907247 +0800
@@ -23,7 +23,7 @@
 #ifndef __GDA_CONFIG_H__
 #define __GDA_CONFIG_H__
 
-#include <glib/gmacros.h>
+#include <glib.h>
 #include <libgda/gda-data-model.h>
 #include <libgda/gda-parameter.h>
 
--- libgda/gda-log.h.glib	2011-12-08 15:03:40.744622906 +0800
+++ libgda/gda-log.h	2011-12-08 15:06:08.975017193 +0800
@@ -20,8 +20,8 @@
 #if !defined(__gda_log_h__)
 #  define __gda_log_h__
 
-#include <glib/gmacros.h>
-#include <glib/gtypes.h>
+#include <glib.h>
+#include <glib.h>
 #include <time.h>
 
 G_BEGIN_DECLS
--- libgda/gda-quark-list.h.glib	2011-12-08 15:03:40.744622906 +0800
+++ libgda/gda-quark-list.h	2011-12-08 15:06:08.984978036 +0800
@@ -24,8 +24,8 @@
 #ifndef __GDA_QUARK_LIST_H__
 #define __GDA_QUARK_LIST_H__
 
-#include <glib/gmacros.h>
-#include <glib/gtypes.h>
+#include <glib.h>
+#include <glib.h>
 #include <glib-object.h>
 
 G_BEGIN_DECLS
--- libgda/gda-row.h.glib	2011-12-08 15:03:40.744622906 +0800
+++ libgda/gda-row.h	2011-12-08 15:06:08.995015884 +0800
@@ -27,7 +27,7 @@
 
 #include <glib-object.h>
 #include <libgda/gda-column.h>
-#include <glib/gmacros.h>
+#include <glib.h>
 #include <libgda/gda-decl.h>
 
 G_BEGIN_DECLS
--- libgda/gda-util.h.glib	2011-12-08 15:04:59.544633658 +0800
+++ libgda/gda-util.h	2011-12-08 15:06:09.004982787 +0800
@@ -24,8 +24,7 @@
 #ifndef __GDA_UTIL_H__
 #define __GDA_UTIL_H__
 
-#include <glib/ghash.h>
-#include <glib/glist.h>
+#include <glib.h>
 #include "gda-parameter.h"
 #include "gda-row.h"
 #include "gda-connection.h"
--- libgda/gda-value.h.glib	2011-12-08 15:04:59.544633658 +0800
+++ libgda/gda-value.h	2011-12-08 15:06:09.015022005 +0800
@@ -27,8 +27,8 @@
 #define __GDA_VALUE_H__
 
 #include <time.h>
-#include <glib/glist.h>
-#include <glib/gmacros.h>
+#include <glib.h>
+#include <glib.h>
 #include <glib-object.h>
 #include <libxml/tree.h>
 #include <libgda/gda-decl.h>
--- libgda/sqlite/gda-sqlite.h.glib	2011-12-08 15:03:40.744622906 +0800
+++ libgda/sqlite/gda-sqlite.h	2011-12-08 15:06:09.024975552 +0800
@@ -25,8 +25,8 @@
 #ifndef __GDA_SQLITE_H__
 #define __GDA_SQLITE_H__
 
-#include <glib/gmacros.h>
-#include <glib/gtypes.h>
+#include <glib.h>
+#include <glib.h>
 #include <libgda/gda-value.h>
 #include <libgda/gda-connection.h>
 
--- providers/bdb/gda-bdb.h.glib	2011-12-08 15:03:40.744622906 +0800
+++ providers/bdb/gda-bdb.h	2011-12-08 15:06:09.034907516 +0800
@@ -25,7 +25,7 @@
 #if defined(HAVE_CONFIG_H)
 #endif
 
-#include <glib/gmacros.h>
+#include <glib.h>
 #include <glib/gi18n-lib.h>
 #include <libgda/gda-server-provider.h>
 #include <db.h>
--- providers/freetds/gda-freetds.h.glib	2011-12-08 15:03:40.744622906 +0800
+++ providers/freetds/gda-freetds.h	2011-12-08 15:06:09.045023588 +0800
@@ -24,7 +24,7 @@
 #if defined(HAVE_CONFIG_H)
 #endif
 
-#include <glib/gmacros.h>
+#include <glib.h>
 #include <glib/gi18n-lib.h>
 #include <libgda/gda-server-provider.h>
 #include <tds.h>
--- providers/freetds/gda-freetds-message.h.glib	2011-12-08 15:03:40.744622906 +0800
+++ providers/freetds/gda-freetds-message.h	2011-12-08 15:06:09.055021152 +0800
@@ -24,7 +24,7 @@
 #if defined(HAVE_CONFIG_H)
 #endif
 
-#include <glib/gmacros.h>
+#include <glib.h>
 #include <glib/gi18n-lib.h>
 #include <libgda/gda-server-provider.h>
 #include <tds.h>
--- providers/freetds/gda-freetds-types.h.glib	2011-12-08 15:03:40.754638798 +0800
+++ providers/freetds/gda-freetds-types.h	2011-12-08 15:06:09.065011699 +0800
@@ -24,7 +24,7 @@
 #if defined(HAVE_CONFIG_H)
 #endif
 
-#include <glib/gmacros.h>
+#include <glib.h>
 #include <glib/gi18n-lib.h>
 #include <libgda/gda-server-provider.h>
 #include <tds.h>
--- providers/ibmdb2/gda-ibmdb2.h.glib	2011-12-08 15:03:40.754638798 +0800
+++ providers/ibmdb2/gda-ibmdb2.h	2011-12-08 15:06:09.075020734 +0800
@@ -23,7 +23,7 @@
 #if !defined(__gda_ibmdb2_h__)
 #  define __gda_ibmdb2_h__
 
-#include <glib/gmacros.h>
+#include <glib.h>
 #include <glib/gi18n-lib.h>
 #include <libgda/gda-connection.h>
 #include <libgda/gda-server-provider.h>
--- providers/ibmdb2/gda-ibmdb2-types.h.glib	2011-12-08 15:03:40.754638798 +0800
+++ providers/ibmdb2/gda-ibmdb2-types.h	2011-12-08 15:06:09.085018666 +0800
@@ -23,7 +23,7 @@
 #ifndef __GDA_IBMDB2_TYPES_H__
 #define __GDA_IBMDB2_TYPES_H__
 
-#include <glib/gmacros.h>
+#include <glib.h>
 #include <glib/gi18n-lib.h>
 #include <libgda/gda-server-provider.h>
 #include <sqlcli1.h>
--- providers/ldap/gda-ldap.h.glib	2011-12-08 15:03:40.754638798 +0800
+++ providers/ldap/gda-ldap.h	2011-12-08 15:06:09.094979235 +0800
@@ -26,7 +26,7 @@
 #if !defined(__gda_ldap_h__)
 #  define __gda_ldap_h__
 
-#include <glib/gmacros.h>
+#include <glib.h>
 #include <libgda/gda-connection.h>
 #include <libgda/gda-server-provider.h>
 #include <glib/gi18n-lib.h>
--- providers/mdb/gda-mdb.h.glib	2011-12-08 15:03:40.754638798 +0800
+++ providers/mdb/gda-mdb.h	2011-12-08 15:06:09.104985375 +0800
@@ -24,7 +24,7 @@
 #ifndef __GDA_MDB_H__
 #define __GDA_MDB_H__
 
-#include <glib/gmacros.h>
+#include <glib.h>
 #include <libgda/gda-connection.h>
 #include <libgda/gda-server-provider.h>
 #include <glib/gi18n-lib.h>
--- providers/msql/gda-msql.h.glib	2011-12-08 15:03:40.754638798 +0800
+++ providers/msql/gda-msql.h	2011-12-08 15:06:09.115030078 +0800
@@ -22,7 +22,7 @@
 #ifndef __gda_msql_h__
 #define __gda_msql_h__
 
-#include <glib/gmacros.h>
+#include <glib.h>
 #include <libgda/gda-connection.h>
 #include <libgda/gda-server-provider.h>
 #include <glib/gi18n-lib.h>
--- providers/mysql/gda-mysql.h.glib	2011-12-08 15:03:40.754638798 +0800
+++ providers/mysql/gda-mysql.h	2011-12-08 15:06:09.125023786 +0800
@@ -25,7 +25,7 @@
 #ifndef __GDA_MYSQL_H__
 #define __GDA_MYSQL_H__
 
-#include <glib/gmacros.h>
+#include <glib.h>
 #include <libgda/gda-connection.h>
 #include <libgda/gda-server-provider.h>
 #include <glib/gi18n-lib.h>
--- providers/odbc/gda-odbc.h.glib	2011-12-08 15:03:40.764604954 +0800
+++ providers/odbc/gda-odbc.h	2011-12-08 15:06:09.135018961 +0800
@@ -25,7 +25,7 @@
 #if !defined(__gda_odbc_h__)
 #  define __gda_odbc_h__
 
-#include <glib/gmacros.h>
+#include <glib.h>
 #include <glib-object.h>
 #include <glib/gi18n-lib.h>
 #include <libgda/gda-server-provider.h>
--- providers/oracle/gda-oracle.h.glib	2011-12-08 15:03:40.764604954 +0800
+++ providers/oracle/gda-oracle.h	2011-12-08 15:06:09.145024301 +0800
@@ -31,7 +31,7 @@
 #if defined(HAVE_CONFIG_H)
 #endif
 
-#include <glib/gmacros.h>
+#include <glib.h>
 #include <libgda/gda-connection.h>
 #include <libgda/gda-server-provider.h>
 #include <glib/gi18n-lib.h>
--- providers/postgres/gda-postgres.h.glib	2011-12-08 15:03:40.764604954 +0800
+++ providers/postgres/gda-postgres.h	2011-12-08 15:06:09.154982700 +0800
@@ -24,7 +24,7 @@
 #ifndef __GDA_POSTGRES_H__
 #define __GDA_POSTGRES_H__
 
-#include <glib/gmacros.h>
+#include <glib.h>
 #include <glib/gi18n-lib.h>
 #include <libgda/gda-server-provider.h>
 #include "gda-postgres-provider.h"
--- providers/sybase/gda-sybase.h.glib	2011-12-08 15:03:40.764604954 +0800
+++ providers/sybase/gda-sybase.h	2011-12-08 15:06:09.165021649 +0800
@@ -32,7 +32,7 @@
 #  include <config.h>
 #endif
 
-#include <glib/gmacros.h>
+#include <glib.h>
 #include <glib/gi18n-lib.h>
 #include <libgda/gda-server-provider.h>
 #include <ctpublic.h>
--- libgda/gda-column.c.glib	2011-12-08 15:47:47.994655507 +0800
+++ libgda/gda-column.c	2011-12-08 15:49:04.416994489 +0800
@@ -23,8 +23,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <glib/gmessages.h>
-#include <glib/gstrfuncs.h>
+#include <glib.h>
 #include <libgda/gda-column.h>
 #include <string.h>
 #include "gda-marshal.h"
--- libgda/gda-command.c.glib	2011-12-08 15:58:54.114812297 +0800
+++ libgda/gda-command.c	2011-12-08 15:59:03.346996558 +0800
@@ -21,9 +21,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <glib/gmem.h>
-#include <glib/gmessages.h>
-#include <glib/gstrfuncs.h>
+#include <glib.h>
 #include <libgda/gda-command.h>
 
 GType
--- libgda/gda-config.c.glib	2011-12-08 09:19:28.000000000 +0100
+++ libgda/gda-config.c	2011-12-08 10:59:26.000000000 +0100
@@ -38,7 +38,6 @@
 #include <sys/stat.h>
 #ifdef HAVE_FAM
 #include <fam.h>
-#include <glib/giochannel.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
--- libgda/gda-data-model-array.c.glib	2011-12-08 11:06:51.000000000 +0100
+++ libgda/gda-data-model-array.c	2011-12-08 11:07:11.000000000 +0100
@@ -22,7 +22,7 @@
  */
 
 #include <string.h>
-#include <glib/garray.h>
+#include <glib.h>
 #include <libgda/gda-data-model-array.h>
 #include <glib/gi18n-lib.h>
 #include <libgda/gda-row.h>
--- libgda/gda-data-model-filter-sql.c.glib	2011-12-08 11:08:15.000000000 +0100
+++ libgda/gda-data-model-filter-sql.c	2011-12-08 11:08:28.000000000 +0100
@@ -21,7 +21,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <glib/gdataset.h>
+#include <glib.h>
 #include <glib-object.h>
 #include <libsql/sql_parser.h>
 #include <glib/gi18n-lib.h>
--- libgda/gda-init.c.glib	2011-12-08 11:10:22.000000000 +0100
+++ libgda/gda-init.c	2011-12-08 11:10:34.000000000 +0100
@@ -17,7 +17,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <glib/gmain.h>
+#include <glib.h>
 #include <gmodule.h>
 #include <libgda/libgda.h>
 #include <glib/gi18n-lib.h>
--- libgda/gda-log.c.glib	2011-12-08 11:11:07.000000000 +0100
+++ libgda/gda-log.c	2011-12-08 11:11:16.000000000 +0100
@@ -24,10 +24,6 @@
 #include <syslog.h>
 #endif
 #include <time.h>
-#include <glib/gmem.h>
-#include <glib/gmessages.h>
-#include <glib/gstrfuncs.h>
-#include <glib/gutils.h>
 #include <glib/gi18n-lib.h>
 #include <libgda/gda-log.h>
 
--- libgda/gda-quark-list.c.glib	2011-12-08 11:12:16.000000000 +0100
+++ libgda/gda-quark-list.c	2011-12-08 11:12:31.000000000 +0100
@@ -22,10 +22,7 @@
  */
 
 #include <libgda/gda-quark-list.h>
-#include <glib/ghash.h>
-#include <glib/gmem.h>
-#include <glib/gmessages.h>
-#include <glib/gstrfuncs.h>
+#include <glib.h>
 
 struct _GdaQuarkList {
 	GHashTable *hash_table;
--- libgda/gda-server-operation.c.glib	2011-12-08 11:13:37.000000000 +0100
+++ libgda/gda-server-operation.c	2011-12-08 11:13:50.000000000 +0100
@@ -21,7 +21,7 @@
  */
 
 #include <stdlib.h>
-#include <glib/gmessages.h>
+#include <glib.h>
 #include <libgda/gda-marshal.h>
 #include <libgda/gda-dict.h>
 #include <libgda/gda-dict-type.h>
--- libgda/gda-server-provider.c.glib	2011-12-08 11:14:37.000000000 +0100
+++ libgda/gda-server-provider.c	2011-12-08 11:14:49.000000000 +0100
@@ -22,7 +22,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <glib/gmessages.h>
+#include <glib.h>
 #include <libgda/gda-server-provider.h>
 #include <libgda/gda-server-provider-extra.h>
 #include <libgda/gda-server-provider-private.h>
--- libgda/gda-util.c.glib	2011-12-08 11:15:49.000000000 +0100
+++ libgda/gda-util.c	2011-12-08 11:16:13.000000000 +0100
@@ -27,10 +27,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <string.h>
-#include <glib/gfileutils.h>
-#include <glib/gmessages.h>
-#include <glib/gstrfuncs.h>
-#include <glib/gprintf.h>
+#include <glib.h>
 #include <libsql/sql_parser.h>
 #include <glib/gi18n-lib.h>
 #include <libgda/gda-log.h>
--- libgda/gda-value.c.glib	2011-12-08 11:16:48.000000000 +0100
+++ libgda/gda-value.c	2011-12-08 11:17:01.000000000 +0100
@@ -28,10 +28,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <time.h>
-#include <glib/gdate.h>
-#include <glib/gmessages.h>
-#include <glib/gstrfuncs.h>
-#include <glib/gstring.h>
+#include <glib.h>
 #include <glib/gi18n-lib.h>
 #include <libgda/gda-value.h>
 #include <libgda/gda-blob-op.h>
--- libgda/gda-data-model-hash.c	2011-12-08 11:24:10.000000000 +0100
+++ libgda/gda-data-model-hash.c.glib	2011-12-08 11:23:56.000000000 +0100
@@ -23,7 +23,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <glib/ghash.h>
+#include <glib.h>
 #include <glib/gi18n-lib.h>
 #include <libgda/gda-data-model-hash.h>
 #include <libgda/gda-data-model-extra.h>