[libgda: 2/2] Fixed merge



commit 1daafdc77ba4371b7a203d5224abaf55af6aec4a
Merge: bad7639... fa62acc...
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Jun 30 13:04:33 2009 +0200

    Fixed merge

 ChangeLog                                          |  101 +
 Makefile.am                                        |   18 +-
 configure.in                                       |  206 +-
 control-center/.gitignore                          |    2 +
 control-center/Makefile.am                         |   72 +
 control-center/cc-gray-bar.c                       |  496 ++
 control-center/cc-gray-bar.h                       |   63 +
 control-center/cc-utility.c                        |   93 +
 control-center/cc-utility.h                        |   44 +
 control-center/control-center-res.rc               |    2 +
 control-center/dsn-config.c                        |  284 +
 control-center/dsn-config.h                        |   32 +
 control-center/dsn-properties-dialog.c             |  285 +
 control-center/dsn-properties-dialog.h             |   29 +
 control-center/gda-control-center-4.0.desktop.in   |    9 +
 control-center/gda-control-center-newcnc.png       |  Bin 0 -> 2653 bytes
 control-center/gda-control-center.ico              |  Bin 0 -> 8862 bytes
 control-center/gda-control-center.png              |  Bin 0 -> 4828 bytes
 control-center/gdaui-dsn-assistant.c               |  733 +++
 control-center/gdaui-dsn-assistant.h               |   60 +
 control-center/gdaui-dsn-editor.c                  |  397 ++
 control-center/gdaui-dsn-editor.h                  |   62 +
 control-center/gdaui-login-dialog.c                |  298 +
 control-center/gdaui-login-dialog.h                |   59 +
 control-center/main.c                              |  440 ++
 control-center/provider-config.c                   |  130 +
 control-center/provider-config.h                   |   30 +
 doc/C/Makefile.am                                  |    2 +-
 doc/C/libgda-4.0-docs.sgml                         |   23 +-
 doc/C/libgda-4.0-sections.txt                      |   12 +-
 doc/C/packaging.xml                                |  251 +
 doc/C/packaging_ui.xml                             |  143 +
 doc/C/tmpl/gda-connection.sgml                     |    5 +
 doc/C/tmpl/gda-meta-struct.sgml                    |   20 -
 doc/C/tmpl/gda-thread-wrapper.sgml                 |    9 +
 doc/C/tmpl/gda-tree-manager.sgml                   |   51 +-
 doc/C/tmpl/gda-tree-node.sgml                      |   41 +
 doc/C/tmpl/gda-tree.sgml                           |   57 +
 doc/C/tmpl/provider-support.sgml                   |   17 +
 gtk-doc.make                                       |   47 +-
 installers/WindowsWix/etc/gtk-2.0/gtkrc            |   67 +
 installers/WindowsWix/make-zip-exe.sh              |   56 +-
 libgda-report/RML/trml2html/Makefile.am            |   17 +-
 libgda-report/RML/trml2pdf/Makefile.am             |   18 +-
 libgda.doap                                        |    2 +-
 libgda/Makefile.am                                 |    4 +-
 libgda/gda-config.c                                |    6 +
 libgda/gda-connection-sqlite.h                     |   39 +
 libgda/gda-connection.c                            |   70 +-
 libgda/gda-data-access-wrapper.h                   |    1 -
 libgda/gda-data-meta-wrapper.c                     |  577 ++
 libgda/gda-data-meta-wrapper.h                     |   67 +
 libgda/gda-data-select.c                           |   14 +-
 libgda/gda-enums.h                                 |    8 +-
 libgda/gda-meta-store.c                            |   93 +-
 libgda/gda-meta-store.h                            |    1 +
 libgda/gda-meta-struct.c                           |   51 +-
 libgda/gda-meta-struct.h                           |   78 +-
 libgda/gda-sql-builder.c                           |    3 +-
 libgda/gda-tree-manager.c                          |  223 +-
 libgda/gda-tree-manager.h                          |   26 +-
 libgda/gda-tree-mgr-columns.c                      |    8 +-
 libgda/gda-tree-mgr-label.c                        |   17 +-
 libgda/gda-tree-mgr-schemas.c                      |    8 +-
 libgda/gda-tree-mgr-select.c                       |   19 +-
 libgda/gda-tree-mgr-tables.c                       |   10 +-
 libgda/gda-tree-node.c                             |  373 ++-
 libgda/gda-tree-node.h                             |   10 +-
 libgda/gda-tree.c                                  |  344 +-
 libgda/gda-tree.h                                  |    8 +
 libgda/gda-util.c                                  |   85 +-
 libgda/information_schema.xml                      |  200 +-
 libgda/libgda.symbols                              |    6 +-
 libgda/providers-support/Makefile.am               |    3 +-
 libgda/providers-support/gda-meta-column-types.h   |  501 ++
 libgda/sql-parser/gda-statement-struct-util.c      |    2 +-
 libgda/sqlite/gda-sqlite-provider.c                |  184 +-
 libgda/thread-wrapper/gda-thread-wrapper.c         |   88 +-
 libgda/thread-wrapper/gda-thread-wrapper.h         |    2 +-
 libgdaui-4.0.pc.in                                 |   11 +
 libgdaui/.gitignore                                |    7 +
 libgdaui/Makefile.am                               |  144 +
 libgdaui/data-entries/.gitignore                   |    2 +
 libgdaui/data-entries/Makefile.am                  |   63 +
 .../gdaui-data-cell-renderer-boolean.c             |  407 ++
 .../gdaui-data-cell-renderer-boolean.h             |   61 +
 .../data-entries/gdaui-data-cell-renderer-combo.c  |  619 +++
 .../data-entries/gdaui-data-cell-renderer-combo.h  |   62 +
 .../data-entries/gdaui-data-cell-renderer-info.c   |  523 ++
 .../data-entries/gdaui-data-cell-renderer-info.h   |   65 +
 .../gdaui-data-cell-renderer-textual.c             |  714 +++
 .../gdaui-data-cell-renderer-textual.h             |   64 +
 libgdaui/data-entries/gdaui-entry-boolean.c        |  287 +
 libgdaui/data-entries/gdaui-entry-boolean.h        |   60 +
 libgdaui/data-entries/gdaui-entry-combo.c          | 1050 ++++
 libgdaui/data-entries/gdaui-entry-combo.h          |   68 +
 libgdaui/data-entries/gdaui-entry-common-time.c    | 1017 ++++
 libgdaui/data-entries/gdaui-entry-common-time.h    |   57 +
 libgdaui/data-entries/gdaui-entry-date.c           |   90 +
 libgdaui/data-entries/gdaui-entry-date.h           |   58 +
 libgdaui/data-entries/gdaui-entry-none.c           |  229 +
 libgdaui/data-entries/gdaui-entry-none.h           |   59 +
 libgdaui/data-entries/gdaui-entry-shell.c          |  458 ++
 libgdaui/data-entries/gdaui-entry-shell.h          |   64 +
 .../data-entries/gdaui-entry-string-number.xml.in  |   22 +
 .../data-entries/gdaui-entry-string-string.xml.in  |    8 +
 libgdaui/data-entries/gdaui-entry-string.c         |  725 +++
 libgdaui/data-entries/gdaui-entry-string.h         |   59 +
 libgdaui/data-entries/gdaui-entry-time.c           |   90 +
 libgdaui/data-entries/gdaui-entry-time.h           |   58 +
 libgdaui/data-entries/gdaui-entry-timestamp.c      |   90 +
 libgdaui/data-entries/gdaui-entry-timestamp.h      |   58 +
 libgdaui/data-entries/gdaui-entry-wrapper.c        |  874 +++
 libgdaui/data-entries/gdaui-entry-wrapper.h        |   75 +
 libgdaui/data-entries/gdaui-format-entry.c         | 1783 ++++++
 libgdaui/data-entries/gdaui-format-entry.h         |   70 +
 libgdaui/data-entries/plugins/.gitignore           |    4 +
 libgdaui/data-entries/plugins/Makefile.am          |   71 +
 libgdaui/data-entries/plugins/common-pict.c        |  686 +++
 libgdaui/data-entries/plugins/common-pict.h        |   75 +
 libgdaui/data-entries/plugins/custom-marshal.c     |   60 +
 libgdaui/data-entries/plugins/custom-marshal.h     |   41 +
 .../plugins/gdaui-data-cell-renderer-cgrid.c       |  593 ++
 .../plugins/gdaui-data-cell-renderer-cgrid.h       |   78 +
 .../plugins/gdaui-data-cell-renderer-password.c    |  478 ++
 .../plugins/gdaui-data-cell-renderer-password.h    |   60 +
 .../plugins/gdaui-data-cell-renderer-pict.c        |  456 ++
 .../plugins/gdaui-data-cell-renderer-pict.h        |   60 +
 libgdaui/data-entries/plugins/gdaui-entry-cgrid.c  |  865 +++
 libgdaui/data-entries/plugins/gdaui-entry-cgrid.h  |   69 +
 libgdaui/data-entries/plugins/gdaui-entry-cidr.c   |  686 +++
 libgdaui/data-entries/plugins/gdaui-entry-cidr.h   |   59 +
 .../plugins/gdaui-entry-filesel-spec.xml.in        |   32 +
 .../data-entries/plugins/gdaui-entry-filesel.c     |  332 ++
 .../data-entries/plugins/gdaui-entry-filesel.h     |   59 +
 .../data-entries/plugins/gdaui-entry-password.c    |  343 ++
 .../data-entries/plugins/gdaui-entry-password.h    |   59 +
 .../plugins/gdaui-entry-password.xml.in            |   24 +
 .../plugins/gdaui-entry-pict-spec.xml.in           |    6 +
 .../plugins/gdaui-entry-pict-spec_string.xml.in    |   21 +
 libgdaui/data-entries/plugins/gdaui-entry-pict.c   |  548 ++
 libgdaui/data-entries/plugins/gdaui-entry-pict.h   |   59 +
 libgdaui/data-entries/plugins/gdaui-entry-text.c   |  271 +
 libgdaui/data-entries/plugins/gdaui-entry-text.h   |   59 +
 libgdaui/data-entries/plugins/libmain.c            |  256 +
 libgdaui/data-layout.dtd                           |  194 +
 libgdaui/data/Makefile.am                          |   12 +
 libgdaui/data/gdaui-generic.png                    |  Bin 0 -> 3229 bytes
 libgdaui/data/import_encodings.xml                 |  315 ++
 libgdaui/data/server_operation.glade               |  374 ++
 libgdaui/demos/.gitignore                          |    3 +
 libgdaui/demos/Makefile.am                         |   66 +
 libgdaui/demos/data_model_dir.c                    |  117 +
 libgdaui/demos/ddl_queries.c                       |  481 ++
 libgdaui/demos/demo-common.h                       |   11 +
 libgdaui/demos/demo_db.db                          |  Bin 0 -> 2027520 bytes
 libgdaui/demos/example_automatic_layout.xml        |  492 ++
 libgdaui/demos/form.c                              |   61 +
 libgdaui/demos/form_data_layout.c                  |   83 +
 libgdaui/demos/form_pict.c                         |   80 +
 libgdaui/demos/form_rw.c                           |   68 +
 libgdaui/demos/geninclude.pl.in                    |  163 +
 libgdaui/demos/grid.c                              |   61 +
 libgdaui/demos/grid_data_layout.c                  |   94 +
 libgdaui/demos/grid_pict.c                         |   80 +
 libgdaui/demos/grid_rw.c                           |   63 +
 libgdaui/demos/linked_grid_form.c                  |  177 +
 libgdaui/demos/linked_model_param.c                |  101 +
 libgdaui/demos/login.c                             |  133 +
 libgdaui/demos/main.c                              |  862 +++
 libgdaui/demos/tree.c                              |  175 +
 libgdaui/gdaui-basic-form.c                        | 2549 +++++++++
 libgdaui/gdaui-basic-form.h                        |  100 +
 libgdaui/gdaui-combo.c                             |  567 ++
 libgdaui/gdaui-combo.h                             |   71 +
 libgdaui/gdaui-data-entry.c                        |  427 ++
 libgdaui/gdaui-data-entry.h                        |  109 +
 libgdaui/gdaui-data-store.c                        |  846 +++
 libgdaui/gdaui-data-store.h                        |   78 +
 libgdaui/gdaui-data-widget-filter.c                |  385 ++
 libgdaui/gdaui-data-widget-filter.h                |   66 +
 libgdaui/gdaui-data-widget-info.c                  |  714 +++
 libgdaui/gdaui-data-widget-info.h                  |   76 +
 libgdaui/gdaui-data-widget.c                       |  463 ++
 libgdaui/gdaui-data-widget.h                       |   93 +
 libgdaui/gdaui-decl.h                              |   50 +
 libgdaui/gdaui-easy.h                              |   35 +
 libgdaui/gdaui-enums.h                             |   65 +
 libgdaui/gdaui-form.c                              |  203 +
 libgdaui/gdaui-form.h                              |   65 +
 libgdaui/gdaui-grid.c                              |  243 +
 libgdaui/gdaui-grid.h                              |   66 +
 libgdaui/gdaui-init.c                              |  613 +++
 libgdaui/gdaui-login.c                             |  646 +++
 libgdaui/gdaui-login.h                             |   69 +
 libgdaui/gdaui-plugin.h                            |   51 +
 libgdaui/gdaui-provider-selector.c                 |  219 +
 libgdaui/gdaui-provider-selector.h                 |   59 +
 libgdaui/gdaui-raw-form.c                          | 1038 ++++
 libgdaui/gdaui-raw-form.h                          |   65 +
 libgdaui/gdaui-raw-grid.c                          | 2829 ++++++++++
 libgdaui/gdaui-raw-grid.h                          |   73 +
 libgdaui/gdaui-server-operation.c                  | 1243 +++++
 libgdaui/gdaui-server-operation.h                  |   68 +
 libgdaui/gdaui-set.c                               |  405 ++
 libgdaui/gdaui-set.h                               |  104 +
 libgdaui/gdaui-tree-store.c                        |  961 ++++
 libgdaui/gdaui-tree-store.h                        |   67 +
 libgdaui/internal/Makefile.am                      |   20 +
 libgdaui/internal/gdaui-dsn-selector.c             |  224 +
 libgdaui/internal/gdaui-dsn-selector.h             |   57 +
 libgdaui/internal/gdaui-provider-auth-editor.c     |  432 ++
 libgdaui/internal/gdaui-provider-auth-editor.h     |   63 +
 libgdaui/internal/gdaui-provider-spec-editor.c     |  489 ++
 libgdaui/internal/gdaui-provider-spec-editor.h     |   62 +
 libgdaui/internal/utility.c                        |  538 ++
 libgdaui/internal/utility.h                        |   56 +
 libgdaui/libgdaui.h                                |   53 +
 libgdaui/libgdaui.symbols                          |  160 +
 libgdaui/marshallers/Makefile.am                   |   28 +
 libgdaui/marshallers/gdaui-custom-marshal.c        |  408 ++
 libgdaui/marshallers/gdaui-custom-marshal.h        |  130 +
 libgdaui/marshallers/gdaui-marshal.list            |   46 +
 po/ChangeLog                                       |    4 +
 po/POTFILES.in                                     |   76 +
 po/ar.po                                           | 3529 +++++++++---
 po/az.po                                           | 3316 +++++++++---
 po/ca.po                                           | 3435 +++++++++---
 po/cs.po                                           | 3442 +++++++++---
 po/da.po                                           | 3417 +++++++++---
 po/de.po                                           | 5710 ++++++++++++--------
 po/dz.po                                           | 3512 +++++++++---
 po/el.po                                           | 3851 ++++++++++----
 po/en_CA.po                                        | 3481 +++++++++---
 po/en_GB.po                                        | 3534 +++++++++---
 po/es.po                                           | 1227 ++---
 po/eu.po                                           | 3020 +++++++++--
 po/fa.po                                           | 3334 +++++++++---
 po/fi.po                                           | 3364 +++++++++---
 po/fr.po                                           | 3530 +++++++++---
 po/ga.po                                           | 3316 +++++++++---
 po/gl.po                                           | 3380 +++++++++---
 po/hr.po                                           | 3426 +++++++++---
 po/hu.po                                           | 3631 +++++++++----
 po/it.po                                           | 3178 +++++++++---
 po/ja.po                                           | 3484 +++++++++---
 po/ko.po                                           | 3419 +++++++++---
 po/lt.po                                           | 3479 +++++++++---
 po/mk.po                                           | 3316 +++++++++---
 po/ml.po                                           | 3268 +++++++++---
 po/ms.po                                           | 3430 +++++++++---
 po/nb.po                                           | 3330 +++++++++---
 po/ne.po                                           | 3529 +++++++++---
 po/nl.po                                           | 3465 +++++++++---
 po/oc.po                                           | 3309 +++++++++---
 po/pa.po                                           | 3339 +++++++++---
 po/pl.po                                           | 3442 +++++++++---
 po/pt.po                                           | 3192 +++++++++---
 po/pt_BR.po                                        | 3475 +++++++++---
 po/ru.po                                           | 3480 +++++++++---
 po/rw.po                                           | 3546 ++++++++++---
 po/sk.po                                           | 3428 +++++++++---
 po/sl.po                                           | 3449 +++++++++---
 po/sq.po                                           | 3452 +++++++++---
 po/sr.po                                           | 3427 +++++++++---
 po/sr Latn po                                      | 3427 +++++++++---
 po/sv.po                                           | 3509 +++++++++---
 po/tr.po                                           | 3375 +++++++++---
 po/uk.po                                           | 3442 +++++++++---
 po/vi.po                                           | 3533 +++++++++---
 po/zh_CN.po                                        | 3429 +++++++++---
 po/zh_HK.po                                        | 3510 +++++++++---
 po/zh_TW.po                                        | 3510 +++++++++---
 providers/jdbc/.gitignore                          |    4 +-
 providers/oracle/gda-oracle-meta.c                 |  618 +++-
 providers/oracle/gda-oracle-provider.c             |  317 +-
 providers/oracle/gda-oracle-recordset.c            |  394 +-
 providers/oracle/gda-oracle-util.c                 |  361 +-
 providers/oracle/gda-oracle-util.h                 |   52 +-
 providers/oracle/gda-oracle.h                      |    4 +
 providers/postgres/gda-postgres-meta.c             |   48 +-
 providers/sqlite/Makefile.am                       |    2 +-
 samples/README                                     |    2 +
 samples/Report/Makefile                            |   10 +-
 samples/Report/README                              |   12 +-
 samples/Report/schema-report-spec.xml              |  254 +
 samples/Report/schema-report.c                     |  107 +
 samples/SqlParserConsole/console.c                 |    3 +-
 samples/WritableSelect/README                      |  100 +
 samples/WritableSelect/example.c                   |  192 +
 testing/.gitignore                                 |    5 +-
 testing/Makefile.am                                |   15 +-
 testing/gdaui-test-data-entries.c                  | 1189 ++++
 tests/meta-store/common.c                          |   37 +-
 tests/meta-store/data_referential_constraints.csv  |   38 +-
 tools/.gitignore                                   |    1 +
 tools/Makefile.am                                  |   56 +-
 tools/browser/.gitignore                           |    5 +
 tools/browser/Makefile.am                          |  136 +
 tools/browser/auth-dialog.c                        |  592 ++
 tools/browser/auth-dialog.h                        |   76 +
 tools/browser/browser-connection.c                 |  983 ++++
 tools/browser/browser-connection.h                 |   90 +
 tools/browser/browser-connections-list.c           |  494 ++
 tools/browser/browser-connections-list.h           |   55 +
 tools/browser/browser-core.c                       |  350 ++
 tools/browser/browser-core.h                       |   74 +
 tools/browser/browser-perspective.c                |   99 +
 tools/browser/browser-perspective.h                |   52 +
 tools/browser/browser-res.rc                       |    2 +
 tools/browser/browser-spinner.c                    |  946 ++++
 tools/browser/browser-spinner.h                    |   65 +
 tools/browser/browser-variable.c                   |  121 +
 tools/browser/browser-variable.h                   |   55 +
 tools/browser/browser-window.c                     |  847 +++
 tools/browser/browser-window.h                     |   60 +
 tools/browser/canvas-example.c                     |  199 +
 tools/browser/canvas/Makefile.am                   |   38 +
 tools/browser/canvas/browser-canvas-column.c       |  325 ++
 tools/browser/canvas/browser-canvas-column.h       |   66 +
 tools/browser/canvas/browser-canvas-db-relations.c |  526 ++
 tools/browser/canvas/browser-canvas-db-relations.h |   66 +
 tools/browser/canvas/browser-canvas-decl.h         |   46 +
 tools/browser/canvas/browser-canvas-fkey.c         |  518 ++
 tools/browser/canvas/browser-canvas-fkey.h         |   65 +
 tools/browser/canvas/browser-canvas-item.c         |  400 ++
 tools/browser/canvas/browser-canvas-item.h         |   68 +
 tools/browser/canvas/browser-canvas-print.c        |  456 ++
 tools/browser/canvas/browser-canvas-print.h        |   27 +
 tools/browser/canvas/browser-canvas-priv.h         |   41 +
 tools/browser/canvas/browser-canvas-table.c        |  572 ++
 tools/browser/canvas/browser-canvas-table.h        |   67 +
 tools/browser/canvas/browser-canvas-text.c         |  527 ++
 tools/browser/canvas/browser-canvas-text.h         |   71 +
 tools/browser/canvas/browser-canvas-utility.c      |  836 +++
 tools/browser/canvas/browser-canvas-utility.h      |   51 +
 tools/browser/canvas/browser-canvas.c              | 1079 ++++
 tools/browser/canvas/browser-canvas.h              |   84 +
 tools/browser/cc-gray-bar.c                        |    1 +
 tools/browser/cc-gray-bar.h                        |    1 +
 tools/browser/decl.h                               |   50 +
 tools/browser/dnd.c                                |   30 +
 tools/browser/dnd.h                                |   37 +
 tools/browser/dummy-perspective/Makefile.am        |   15 +
 .../browser/dummy-perspective/dummy-perspective.c  |  184 +
 .../browser/dummy-perspective/dummy-perspective.h  |   54 +
 tools/browser/dummy-perspective/perspective-main.c |   36 +
 tools/browser/dummy-perspective/perspective-main.h |   29 +
 tools/browser/gda-browser-4.0.desktop.in           |    9 +
 tools/browser/gda-browser-auth-big.png             |  Bin 0 -> 4660 bytes
 tools/browser/gda-browser-auth.png                 |  Bin 0 -> 2360 bytes
 tools/browser/gda-browser-bookmark.png             |  Bin 0 -> 474 bytes
 tools/browser/gda-browser-column-fk.png            |  Bin 0 -> 442 bytes
 tools/browser/gda-browser-column-fknn.png          |  Bin 0 -> 473 bytes
 tools/browser/gda-browser-column-nn.png            |  Bin 0 -> 449 bytes
 tools/browser/gda-browser-column-pk.png            |  Bin 0 -> 560 bytes
 tools/browser/gda-browser-column.png               |  Bin 0 -> 427 bytes
 tools/browser/gda-browser-connected-big.png        |  Bin 0 -> 4168 bytes
 tools/browser/gda-browser-connected.png            |  Bin 0 -> 2594 bytes
 tools/browser/gda-browser-non-connected-big.png    |  Bin 0 -> 4461 bytes
 tools/browser/gda-browser-non-connected.png        |  Bin 0 -> 2724 bytes
 tools/browser/gda-browser-reference.png            |  Bin 0 -> 350 bytes
 tools/browser/gda-browser-schema.png               |  Bin 0 -> 404 bytes
 tools/browser/gda-browser-table.png                |  Bin 0 -> 577 bytes
 tools/browser/gda-browser-view.png                 |  Bin 0 -> 597 bytes
 tools/browser/gda-browser.ico                      |  Bin 0 -> 9262 bytes
 tools/browser/gda-browser.png                      |  Bin 0 -> 4032 bytes
 tools/browser/login-dialog.c                       |  383 ++
 tools/browser/login-dialog.h                       |   66 +
 tools/browser/main.c                               |  126 +
 tools/browser/marshal.list                         |   25 +
 tools/browser/mgr-favorites.c                      |  316 ++
 tools/browser/mgr-favorites.h                      |   58 +
 tools/browser/schema-browser/Makefile.am           |   31 +
 tools/browser/schema-browser/favorite-selector.c   |  400 ++
 tools/browser/schema-browser/favorite-selector.h   |   58 +
 tools/browser/schema-browser/mgr-columns.c         |  379 ++
 tools/browser/schema-browser/mgr-columns.h         |   71 +
 tools/browser/schema-browser/objects-index.c       |  448 ++
 tools/browser/schema-browser/objects-index.h       |   59 +
 tools/browser/schema-browser/perspective-main.c    |   36 +
 tools/browser/schema-browser/perspective-main.h    |   29 +
 .../schema-browser/schema-browser-perspective.c    |  388 ++
 .../schema-browser/schema-browser-perspective.h    |   60 +
 tools/browser/schema-browser/table-columns.c       |  673 +++
 tools/browser/schema-browser/table-columns.h       |   56 +
 tools/browser/schema-browser/table-info.c          |  396 ++
 tools/browser/schema-browser/table-info.h          |   60 +
 tools/browser/schema-browser/table-relations.c     |  210 +
 tools/browser/schema-browser/table-relations.h     |   56 +
 tools/browser/support.c                            |  249 +
 tools/browser/support.h                            |   63 +
 tools/command-exec.c                               |   16 +-
 tools/dict-file-name.c                             |   88 +
 tools/gda-sql.c                                    |   60 +-
 tools/gda-sql.ico                                  |  Bin 9462 -> 9262 bytes
 tools/information-schema-types.c                   |  155 +
 tools/tools-input.c                                |    1 +
 tools/web-server.c                                 |    2 +
 399 files changed, 191344 insertions(+), 41164 deletions(-)
---
diff --cc ChangeLog
index eeaf481,b525dde..0615072
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,104 +1,109 @@@
 +2009-06-30  Murray Cumming  <murrayc murrayc com>
 +
 +	* libgda/sql-parser/gda-statement-struct-*.h: Add G_BEGIN_DECLS and 
 +	G_END_DECLS so these can be used from C++.
 +
+ 2009-05-17  Vivien Malerba <malerba gnome-db org>
+ 
+ 	* configure.in:
+ 	* testing/:
+ 	* libgdaui/: moved some contents from Libgnomedb
+ 	* control-center/: moved Libgnomedb's control center
+ 	* tools/browser/: new browser tool
+ 	* po/: added new files
+ 
+ 2009-06-08  Vivien Malerba <malerba gnome-db org>
+ 
+ 	* libgda-report/RML/trml2html/Makefile.am:
+ 	* libgda-report/RML/trml2pdf/Makefile.am: applied patch
+ 	for bug #579458 (Gilles Dartiguelongue) for more standard install
+ 	methods
+ 	* configure.in: don't check for GnomeVFS if Gio has been found,
+ 	fixed bug #585108
+ 
+ 2009-06-05  Vivien Malerba <malerba gnome-db org>
+ 
+ 	* tools/gda-sql.c: overwrite any existing definition of a saved statement with
+ 	the same name when saving a new statement
+ 
+ 2009-06-04  Vivien Malerba <malerba gnome-db org>
+ 
+ 	* libgda/sqlite/gda-sqlite-provider.c:
+ 	  - when adding ROWID columns in a SELECT statement, make sure to also
+ 	    modify ORDER BY clauses if necessary
+ 	  - don't add ROWID clauses if there is a DISTINCT clause
+ 	  - fixed rendering of SELECT statements when a COMPOUND statement is used
+ 	    as the FROM part of another statement
+ 
+ 2009-06-04  Vivien Malerba <malerba gnome-db org>
+ 
+ 	Merged changes from LIBGDA_4.0 branch
+ 
+ 2009-05-13  Vivien Malerba <malerba gnome-db org>
+ 
+ 	* providers/oracle/gda-oracle-provider.c: make the Oracle provider
+ 	instanciate the correct SQL parser
+ 
+ 2009-05-13  Vivien Malerba <malerba gnome-db org>
+ 
+ 	* samples/SqlParserConsole/console.c: fix bug in options parsing and help
+ 
+ 2009-05-08  Vivien Malerba <malerba gnome-db org>
+ 
+ 	* po/POTFILES.in: added missing file
+ 	* providers/oracle/gda-oracle-meta.c: misc. improvements
+ 
+ 2009-05-06  Vivien Malerba <malerba gnome-db org>
+ 
+ 	* tools/Makefile.am: install web server data files in the same dir as
+ 	Libgda 4.0, for bug #580821
+ 
+ 2009-05-06  Vivien Malerba <malerba gnome-db org>
+ 
+ 	* providers/oracle:
+ 	  - use the callback API to fetch results for variable length data types
+ 	  - implemented more meta data retreival
+ 	  - booleans (which is not an Oracle data type) are interpreted as 0 an !0
+ 	  - better handling of OCI types
+ 	* libgda/gda-data-meta-wrapper.c: bug fixes
+ 	* libgda/gda-meta-store.c: bug fixes
+ 	* providers/postgres/gda-postgres-meta.c: bug fixes
+ 
+ 2009-05-05  Vivien Malerba <malerba gnome-db org>
+ 
+ 	* libgda/gda-sql-builder.c:
+ 	* libgda/gda-tree-manager.c:
+ 	* libgda/gda-tree-node.c:
+ 	* libgda/gda-tree.c:
+ 	* libgda/thread-wrapper/gda-thread-wrapper.c: applied patch to fix bug #581408
+ 	(thanks to Halton Huo)
+ 
+ 2009-05-01  Vivien Malerba <malerba gnome-db org>
+ 
+ 	* libgda/Makefile.am:
+ 	* libgda/gda-data-meta-wrapper.[ch]: new (private) GdaDataModel wrapper internally
+ 	used by the GdaMetaStore object
+ 	* libgda/gda-data-access-wrapper.h: removed unnecessary #include
+ 	* libgda/gda-enums.h: added the GdaSqlIdentifierStyle enum
+ 	* libgda/gda-meta-store.[ch]:
+ 	  - use the new GdaDataMetaWrapper object to "filter" the
+ 	    updates made by each database provider when updating the meta data
+ 	  - added gda_meta_store_set_identifiers_style(), to be used by database providers
+ 	* libgda/gda-meta-struct.c: updates the way information is searced in the GdaMetaStore
+ 	* libgda/information_schema.xml: identify which columns are SQL identifiers
+ 	* libgda/gda-util.c: improved the gda_completion_list_get() function
+ 	* tools/tools-input.c: correctly set break characters for completion
+ 	* libgda/sql-parser/gda-statement-struct-util.c: corrected gda_sql_identifier_needs_quotes()
+ 	* doc/C: SQL identifiers precisions
+ 
+ 2009-04-28  Vivien Malerba <malerba gnome-db org>
+ 
+ 	* libgda.doap: prefixed mail with "mailto:";
+ 	* tools/gda-sql.c:
+ 	  - allow to specify which kind of meta data to update in the "meta" command
+ 	  - store the dictionary in a file even for connections not created from a DSN
+ 	    if GLIB >= 2.16.0, no change otherwise
+ 
  2009-04-23  Vivien Malerba <malerba gnome-db org>
  
  	* libgda/gda-config.c: only display a warning if loading a provider fails if the



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]