[libgda/gtk3: 102/103] Merge branch 'master' into gtk3
- From: Vivien Malerba <vivien src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgda/gtk3: 102/103] Merge branch 'master' into gtk3
- Date: Wed, 28 Jul 2010 19:37:47 +0000 (UTC)
commit dda4c036430c15ea5af6ed2d27ea1246e3a2c85b
Merge: 2ed89cb 7c3460b
Author: Vivien Malerba <malerba gnome-db org>
Date: Wed Jul 28 21:31:58 2010 +0200
Merge branch 'master' into gtk3
configure.ac | 64 +-
control-center/gdaui-dsn-assistant.c | 5 +-
doc/C/howto.xml | 46 +-
doc/C/libgda-5.0-docs.sgml | 5 +
doc/C/libgda-sections.txt | 6 +
doc/C/libgda-ui-sections.txt | 8 +-
doc/C/prov-writing.xml | 15 +-
doc/C/tmpl/gda-connection.sgml | 6 +
doc/C/tmpl/gda-data-model-bdb.sgml | 12 +-
doc/C/tmpl/gda-server-operation.sgml | 9 +
doc/C/tmpl/gda-server-provider.sgml | 2 +
doc/C/tmpl/gda-set.sgml | 34 +-
doc/C/tmpl/gda-sql-builder.sgml | 4 +-
doc/C/tmpl/gda-thread-wrapper.sgml | 3 +-
doc/C/tmpl/gda-value.sgml | 18 +
doc/C/tmpl/gdaui-basic-form.sgml | 2 +-
doc/C/tmpl/gdaui-data-entry.sgml | 16 +-
doc/C/tmpl/gdaui-grid.sgml | 2 +-
doc/C/tmpl/provider-support.sgml | 12 +
.../data-entries/gdaui-data-cell-renderer-bin.c | 2 +-
.../gdaui-data-cell-renderer-boolean.c | 2 +-
.../gdaui-data-cell-renderer-textual.c | 14 +-
.../data-entries/gdaui-data-cell-renderer-util.c | 15 +-
libgda-ui/data-entries/gdaui-entry-bin.c | 6 +-
libgda-ui/data-entries/gdaui-entry-boolean.c | 6 +-
libgda-ui/data-entries/gdaui-entry-combo.c | 50 +-
libgda-ui/data-entries/gdaui-entry-combo.h | 6 +-
libgda-ui/data-entries/gdaui-entry-common-time.c | 6 +-
libgda-ui/data-entries/gdaui-entry-none.c | 12 +-
libgda-ui/data-entries/gdaui-entry-number.c | 6 +-
libgda-ui/data-entries/gdaui-entry-string.c | 14 +-
libgda-ui/data-entries/gdaui-entry-wrapper.c | 60 +-
libgda-ui/data-entries/gdaui-entry-wrapper.h | 2 +-
.../plugins/gdaui-data-cell-renderer-password.c | 4 +-
.../plugins/gdaui-data-cell-renderer-pict.c | 2 +-
libgda-ui/data-entries/plugins/gdaui-entry-cgrid.c | 32 +-
libgda-ui/data-entries/plugins/gdaui-entry-cidr.c | 6 +-
.../data-entries/plugins/gdaui-entry-filesel.c | 6 +-
.../data-entries/plugins/gdaui-entry-password.c | 6 +-
libgda-ui/data-entries/plugins/gdaui-entry-pict.c | 6 +-
.../plugins/gdaui-entry-text-spec.xml.in | 24 +
libgda-ui/data-entries/plugins/gdaui-entry-text.c | 30 +-
libgda-ui/data-entries/widget-embedder.c | 18 +-
libgda-ui/gdaui-basic-form.c | 153 +-
libgda-ui/gdaui-data-entry.c | 45 +-
libgda-ui/gdaui-data-entry.h | 27 +-
libgda-ui/gdaui-data-proxy-info.c | 2 +-
libgda-ui/gdaui-form.c | 4 +-
libgda-ui/gdaui-init.c | 7 +-
libgda-ui/gdaui-login.c | 20 +
libgda-ui/gdaui-raw-form.c | 5 -
libgda-ui/gdaui-raw-grid.c | 138 +-
libgda-ui/gdaui-set.c | 44 +-
libgda-ui/gdaui-set.h | 3 +-
libgda-ui/libgda-ui.symbols | 8 +-
libgda/Makefile.am | 8 +-
libgda/gda-config.c | 435 +-
libgda/gda-connection-event.c | 29 +-
libgda/gda-connection-private.h | 1 +
libgda/gda-connection.c | 537 +-
libgda/gda-connection.h | 16 +-
libgda/gda-data-model-dir.c | 16 -
libgda/gda-data-model.c | 164 +-
libgda/gda-data-proxy.c | 24 +-
libgda/gda-data-select.c | 9 +-
libgda/gda-holder.c | 28 +-
libgda/gda-meta-store.c | 2 +-
libgda/gda-server-operation.c | 53 +
libgda/gda-server-operation.h | 1 +
libgda/gda-server-provider.c | 2 +-
libgda/gda-server-provider.h | 11 +-
libgda/gda-set.c | 255 +-
libgda/gda-set.h | 14 +-
libgda/gda-sql-builder.c | 85 +-
libgda/gda-statement-priv.h | 34 +
libgda/gda-statement.c | 9 +-
libgda/gda-util.c | 237 +-
libgda/gda-util.h | 5 +-
libgda/gda-value.c | 53 +
libgda/gda-value.h | 4 +
libgda/information_schema.xml | 2 +-
libgda/libgda.symbols | 6 +
libgda/sql-parser/gda-statement-struct-insert.c | 2 +-
libgda/sqlite/gda-sqlite-provider.c | 299 +-
libgda/sqlite/sqlite-src/PragmasPatch | 6 +-
libgda/sqlite/sqlite-src/sqlite3.c |19216 ++++++++++++++------
libgda/sqlite/sqlite-src/sqlite3.h | 419 +-
libgda/thread-wrapper/gda-thread-provider.c | 25 +-
libgda/thread-wrapper/gda-thread-wrapper.c | 71 +-
libgda/thread-wrapper/gda-thread-wrapper.h | 3 +-
po/POTFILES.in | 1 +
po/cs.po | 8946 +++++-----
po/da.po | 8814 +++++-----
po/de.po | 3014 ++--
po/es.po | 2507 ++-
po/nb.po | 4748 +++--
po/pt.po | 4084 +++---
po/sl.po | 3172 ++--
providers/jdbc/gda-jdbc-provider.c | 68 +-
providers/mysql/gda-mysql-ddl.c | 4 +-
providers/mysql/gda-mysql-provider.c | 160 +-
providers/mysql/gda-mysql-util.c | 4 +-
providers/oracle/gda-oracle-provider.c | 62 +-
providers/oracle/gda-oracle-util.c | 12 +-
providers/oracle/gda-oracle-util.h | 2 +-
providers/postgres/gda-postgres-provider.c | 90 +-
providers/postgres/gda-postgres-util.c | 6 +-
.../skel-implementation/capi/gda-capi-provider.c | 64 +-
providers/web/gda-web-provider.c | 65 +-
testing/gdaui-test-data-entries.c | 4 +-
testing/gdaui-test-errors.c | 2 +-
tests/multi-threading/check_wrapper.c | 6 +-
tests/parser/.gitignore | 3 +-
tests/parser/Makefile.am | 10 +-
tests/parser/check_rewrite_for_default.c | 121 +
tests/test-sql-builder.c | 47 +-
tests/value-holders/set.data | 2 +-
tools/browser/Makefile.am | 4 +-
tools/browser/auth-dialog.c | 131 +-
tools/browser/browser-connection-priv.h | 12 +-
tools/browser/browser-connection.c | 387 +-
tools/browser/browser-connection.h | 26 +
tools/browser/browser-connections-list.c | 2 +-
tools/browser/common/Makefile.am | 4 +-
tools/browser/common/gdaui-entry-import.c | 6 +-
tools/browser/common/ui-formgrid.c | 438 +
tools/browser/common/ui-formgrid.h | 76 +
tools/browser/data-manager/Makefile.am | 4 +-
tools/browser/data-manager/data-console.c | 25 +-
.../browser/data-manager/data-favorite-selector.c | 2 +-
tools/browser/data-manager/data-source-manager.c | 458 +
tools/browser/data-manager/data-source-manager.h | 70 +
tools/browser/data-manager/data-source.c | 79 +-
tools/browser/data-manager/data-source.h | 3 +-
tools/browser/data-manager/data-widget.c | 15 +-
tools/browser/data-manager/spec-editor.c | 408 +-
tools/browser/data-manager/spec-editor.h | 10 +-
tools/browser/doc/gda-browser-sections.txt | 4 +
tools/browser/doc/tmpl/browser-connection.sgml | 61 +-
tools/browser/gda-browser-form.png | Bin 0 -> 286 bytes
tools/browser/gda-browser-grid.png | Bin 0 -> 258 bytes
tools/browser/help/C/figures/table-insert-data.png | Bin 0 -> 23450 bytes
tools/browser/help/C/table-insert-data.page | 44 +
tools/browser/help/Makefile.am | 6 +-
tools/browser/help/es/.gitignore | 2 +
tools/browser/help/es/es.po | 944 +
tools/browser/login-dialog.c | 6 +-
tools/browser/query-exec/query-editor.c | 3 +-
tools/browser/query-exec/query-favorite-selector.c | 2 +-
tools/browser/query-exec/query-result.c | 54 +-
tools/browser/schema-browser/favorite-selector.c | 2 +-
tools/browser/schema-browser/mgr-columns.c | 29 +-
tools/browser/schema-browser/mgr-columns.h | 1 +
.../schema-browser/schema-browser-perspective.c | 4 -
tools/browser/schema-browser/table-columns.c | 69 +-
tools/browser/schema-browser/table-info.c | 476 +-
tools/browser/schema-browser/table-preferences.c | 2 +-
tools/browser/support.c | 61 +-
tools/browser/support.h | 4 +
tools/gda-sql.c | 24 +-
160 files changed, 39559 insertions(+), 23558 deletions(-)
---
diff --cc libgda-ui/data-entries/plugins/gdaui-entry-cgrid.c
index cbdbbc6,0dc8dbd..2ef8ccf
--- a/libgda-ui/data-entries/plugins/gdaui-entry-cgrid.c
+++ b/libgda-ui/data-entries/plugins/gdaui-entry-cgrid.c
@@@ -788,14 -803,13 +783,13 @@@ can_expand (GdauiEntryWrapper *mgwrap,
}
static void
- set_editable (GdauiEntryWrapper *entry_wrapper,
- gboolean editable)
+ set_editable (GdauiEntryWrapper *entry_wrapper, gboolean editable)
{
- g_return_if_fail (GDAUI_IS_ENTRY_CGRID(entry_wrapper));
+ g_return_if_fail (GDAUI_IS_ENTRY_CGRID (entry_wrapper));
- GdauiEntryCGrid *cgrid = GDAUI_ENTRY_CGRID(entry_wrapper);
+ GdauiEntryCGrid *cgrid = GDAUI_ENTRY_CGRID (entry_wrapper);
- gtk_entry_set_editable (GTK_ENTRY(cgrid->priv->entry), editable);
+ gtk_editable_set_editable (GTK_EDITABLE (cgrid->priv->entry), editable);
}
static void
diff --cc libgda-ui/gdaui-basic-form.c
index 95fd3fe,2c509db..b2dc543
--- a/libgda-ui/gdaui-basic-form.c
+++ b/libgda-ui/gdaui-basic-form.c
@@@ -1913,7 -1984,8 +1980,7 @@@ gdaui_basic_form_new_in_dialog (GdaSet
gboolean can_expand;
- g_object_get ((GObject*) form, "can-expand", &can_expand, NULL);
+ g_object_get ((GObject*) form, "can-expand-v", &can_expand, NULL);
-#if GTK_CHECK_VERSION(2,18,0)
gtk_container_set_border_width (GTK_CONTAINER (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg)))), 4);
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), form,
can_expand, can_expand, 10);
diff --cc libgda/Makefile.am
index 8f60b46,04836ce..158efe9
--- a/libgda/Makefile.am
+++ b/libgda/Makefile.am
@@@ -217,19 -217,19 +217,19 @@@ libgda_5_0_la_LDFLAGS =
-version-info $(GDA_CURRENT):$(GDA_REVISION):$(GDA_AGE) \
-export-dynamic $(NO_UNDEFINED) $(LIBTOOL_EXPORT_OPTIONS)
-libgda_4_0_la_LIBADD = \
- sql-parser/libgda_sql_parser-4.0.la \
+libgda_5_0_la_LIBADD = \
+ sql-parser/libgda_sql_parser-5.0.la \
providers-support/libgda-psupport.la \
- handlers/libgda_handlers-4.0.la \
- binreloc/libgda_binreloc-4.0.la \
+ handlers/libgda_handlers-5.0.la \
+ binreloc/libgda_binreloc-5.0.la \
sqlite/libgda-sqlite.la \
- thread-wrapper/libgda_threadwrapper-4.0.la \
+ thread-wrapper/libgda_threadwrapper-5.0.la \
- $(LIBGDA_LIBS) $(FAM_LIBS) \
- $(GIO_LIBS) $(GNOMEVFS_LIBS)
+ $(LIBGDA_LIBS) \
+ $(GIO_LIBS) $(GNOME_KEYRING_LIBS)
if PLATFORM_WIN32
-libgda_4_0_la_LDFLAGS += -export-symbols $(builddir)/libgda.def
-libgda_4_0_la_DEPENDENCIES = libgda.def
+libgda_5_0_la_LDFLAGS += -export-symbols $(builddir)/libgda.def
+libgda_5_0_la_DEPENDENCIES = libgda.def
libgda.def: libgda.symbols
(echo -e EXPORTS; $(CPP) -P $(DEF_FLAGS) - <$(srcdir)/libgda.symbols | sed -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g' | sort) > libgda.def.tmp && mv libgda.def.tmp libgda.def
diff --cc tests/parser/Makefile.am
index bc3c9fc,ee67543..da4fcad
--- a/tests/parser/Makefile.am
+++ b/tests/parser/Makefile.am
@@@ -32,9 -32,15 +32,15 @@@ check_dml_comp_LDADD =
check_script_SOURCES = check_script.c
check_script_LDADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
$(LIBGDA_LIBS)
+ check_rewrite_for_default_SOURCES = check_rewrite_for_default.c
+ check_rewrite_for_default_LDADD = \
+ $(top_builddir)/libgda/libgda-4.0.la \
+ $(LIBGDA_LIBS)
+
+
EXTRA_DIST = testdata.xml testvalid.xml testscripts.xml \
scripts/mysql_employees.sql \
scripts/mysql_employees_partitioned.sql
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
