[libgda] Corrections for bug #587435
- From: Vivien Malerba <vivien src gnome org>
- To: svn-commits-list gnome org
- Subject: [libgda] Corrections for bug #587435
- Date: Tue, 30 Jun 2009 20:34:53 +0000 (UTC)
commit b3211c4e540c52f8ba039af511aa28b4a132bb97
Author: Vivien Malerba <malerba gnome-db org>
Date: Tue Jun 30 22:32:03 2009 +0200
Corrections for bug #587435
Merged the changes from the LIBGDA_4.0 and added some changes
specific to the UI extension
ChangeLog | 9 +++
INSTALL | 1 +
Makefile.am | 4 +-
configure.in | 18 +++---
control-center/Makefile.am | 4 +-
control-center/dsn-config.c | 2 +-
control-center/dsn-properties-dialog.c | 2 +-
control-center/gdaui-dsn-assistant.c | 10 ++--
control-center/gdaui-dsn-editor.c | 8 +-
control-center/gdaui-login-dialog.c | 2 +-
control-center/gdaui-login-dialog.h | 2 +-
control-center/main.c | 2 +-
control-center/provider-config.c | 2 +-
doc/C/libgda-4.0-sections.txt | 10 ++--
libgda-4.0.pc.in | 2 +-
libgdaui-4.0.pc.in => libgda-ui-4.0.pc.in | 0
{libgdaui => libgda-ui}/.gitignore | 0
{libgdaui => libgda-ui}/Makefile.am | 60 ++++++++++----------
{libgdaui => libgda-ui}/data-entries/.gitignore | 0
{libgdaui => libgda-ui}/data-entries/Makefile.am | 11 +--
.../gdaui-data-cell-renderer-boolean.c | 0
.../gdaui-data-cell-renderer-boolean.h | 0
.../data-entries/gdaui-data-cell-renderer-combo.c | 4 +-
.../data-entries/gdaui-data-cell-renderer-combo.h | 2 +-
.../data-entries/gdaui-data-cell-renderer-info.c | 2 +-
.../data-entries/gdaui-data-cell-renderer-info.h | 4 +-
.../gdaui-data-cell-renderer-textual.c | 0
.../gdaui-data-cell-renderer-textual.h | 0
.../data-entries/gdaui-entry-boolean.c | 0
.../data-entries/gdaui-entry-boolean.h | 0
.../data-entries/gdaui-entry-combo.c | 0
.../data-entries/gdaui-entry-combo.h | 4 +-
.../data-entries/gdaui-entry-common-time.c | 0
.../data-entries/gdaui-entry-common-time.h | 0
.../data-entries/gdaui-entry-date.c | 0
.../data-entries/gdaui-entry-date.h | 0
.../data-entries/gdaui-entry-none.c | 0
.../data-entries/gdaui-entry-none.h | 0
.../data-entries/gdaui-entry-shell.c | 2 +-
.../data-entries/gdaui-entry-shell.h | 2 +-
.../data-entries/gdaui-entry-string-number.xml.in | 0
.../data-entries/gdaui-entry-string-string.xml.in | 0
.../data-entries/gdaui-entry-string.c | 0
.../data-entries/gdaui-entry-string.h | 0
.../data-entries/gdaui-entry-time.c | 0
.../data-entries/gdaui-entry-time.h | 0
.../data-entries/gdaui-entry-timestamp.c | 0
.../data-entries/gdaui-entry-timestamp.h | 0
.../data-entries/gdaui-entry-wrapper.c | 0
.../data-entries/gdaui-entry-wrapper.h | 2 +-
.../data-entries/gdaui-format-entry.c | 0
.../data-entries/gdaui-format-entry.h | 0
.../data-entries/plugins/.gitignore | 0
.../data-entries/plugins/Makefile.am | 10 ++--
.../data-entries/plugins/common-pict.c | 0
.../data-entries/plugins/common-pict.h | 0
.../data-entries/plugins/custom-marshal.c | 0
.../data-entries/plugins/custom-marshal.h | 0
.../plugins/gdaui-data-cell-renderer-cgrid.c | 2 +-
.../plugins/gdaui-data-cell-renderer-cgrid.h | 2 +-
.../plugins/gdaui-data-cell-renderer-password.c | 0
.../plugins/gdaui-data-cell-renderer-password.h | 2 +-
.../plugins/gdaui-data-cell-renderer-pict.c | 0
.../plugins/gdaui-data-cell-renderer-pict.h | 2 +-
.../data-entries/plugins/gdaui-entry-cgrid.c | 4 +-
.../data-entries/plugins/gdaui-entry-cgrid.h | 2 +-
.../data-entries/plugins/gdaui-entry-cidr.c | 0
.../data-entries/plugins/gdaui-entry-cidr.h | 2 +-
.../plugins/gdaui-entry-filesel-spec.xml.in | 0
.../data-entries/plugins/gdaui-entry-filesel.c | 0
.../data-entries/plugins/gdaui-entry-filesel.h | 2 +-
.../data-entries/plugins/gdaui-entry-password.c | 0
.../data-entries/plugins/gdaui-entry-password.h | 2 +-
.../plugins/gdaui-entry-password.xml.in | 0
.../plugins/gdaui-entry-pict-spec.xml.in | 0
.../plugins/gdaui-entry-pict-spec_string.xml.in | 0
.../data-entries/plugins/gdaui-entry-pict.c | 0
.../data-entries/plugins/gdaui-entry-pict.h | 2 +-
.../data-entries/plugins/gdaui-entry-text.c | 0
.../data-entries/plugins/gdaui-entry-text.h | 2 +-
.../data-entries/plugins/libmain.c | 4 +-
{libgdaui => libgda-ui}/data-layout.dtd | 0
{libgdaui => libgda-ui}/data/Makefile.am | 0
{libgdaui => libgda-ui}/data/gdaui-generic.png | Bin 3229 -> 3229 bytes
{libgdaui => libgda-ui}/data/import_encodings.xml | 0
.../data/server_operation.glade | 0
{libgdaui => libgda-ui}/demos/.gitignore | 0
{libgdaui => libgda-ui}/demos/Makefile.am | 4 +-
{libgdaui => libgda-ui}/demos/data_model_dir.c | 2 +-
{libgdaui => libgda-ui}/demos/ddl_queries.c | 2 +-
{libgdaui => libgda-ui}/demos/demo-common.h | 0
{libgdaui => libgda-ui}/demos/demo_db.db | Bin 2027520 -> 2027520 bytes
.../demos/example_automatic_layout.xml | 0
{libgdaui => libgda-ui}/demos/form.c | 2 +-
{libgdaui => libgda-ui}/demos/form_data_layout.c | 2 +-
{libgdaui => libgda-ui}/demos/form_pict.c | 2 +-
{libgdaui => libgda-ui}/demos/form_rw.c | 2 +-
{libgdaui => libgda-ui}/demos/geninclude.pl.in | 0
{libgdaui => libgda-ui}/demos/grid.c | 2 +-
{libgdaui => libgda-ui}/demos/grid_data_layout.c | 2 +-
{libgdaui => libgda-ui}/demos/grid_pict.c | 2 +-
{libgdaui => libgda-ui}/demos/grid_rw.c | 2 +-
{libgdaui => libgda-ui}/demos/linked_grid_form.c | 2 +-
{libgdaui => libgda-ui}/demos/linked_model_param.c | 2 +-
{libgdaui => libgda-ui}/demos/login.c | 2 +-
{libgdaui => libgda-ui}/demos/main.c | 4 +-
{libgdaui => libgda-ui}/demos/tree.c | 2 +-
{libgdaui => libgda-ui}/gdaui-basic-form.c | 8 +-
{libgdaui => libgda-ui}/gdaui-basic-form.h | 0
{libgdaui => libgda-ui}/gdaui-combo.c | 0
{libgdaui => libgda-ui}/gdaui-combo.h | 0
{libgdaui => libgda-ui}/gdaui-data-entry.c | 0
{libgdaui => libgda-ui}/gdaui-data-entry.h | 0
{libgdaui => libgda-ui}/gdaui-data-store.c | 0
{libgdaui => libgda-ui}/gdaui-data-store.h | 0
{libgdaui => libgda-ui}/gdaui-data-widget-filter.c | 0
{libgdaui => libgda-ui}/gdaui-data-widget-filter.h | 2 +-
{libgdaui => libgda-ui}/gdaui-data-widget-info.c | 0
{libgdaui => libgda-ui}/gdaui-data-widget-info.h | 2 +-
{libgdaui => libgda-ui}/gdaui-data-widget.c | 4 +-
{libgdaui => libgda-ui}/gdaui-data-widget.h | 0
{libgdaui => libgda-ui}/gdaui-decl.h | 0
{libgdaui => libgda-ui}/gdaui-easy.h | 2 +-
{libgdaui => libgda-ui}/gdaui-enums.h | 0
{libgdaui => libgda-ui}/gdaui-form.c | 0
{libgdaui => libgda-ui}/gdaui-form.h | 0
{libgdaui => libgda-ui}/gdaui-grid.c | 0
{libgdaui => libgda-ui}/gdaui-grid.h | 0
{libgdaui => libgda-ui}/gdaui-init.c | 6 +-
{libgdaui => libgda-ui}/gdaui-login.c | 10 ++--
{libgdaui => libgda-ui}/gdaui-login.h | 0
{libgdaui => libgda-ui}/gdaui-plugin.h | 0
{libgdaui => libgda-ui}/gdaui-provider-selector.c | 4 +-
{libgdaui => libgda-ui}/gdaui-provider-selector.h | 2 +-
{libgdaui => libgda-ui}/gdaui-raw-form.c | 0
{libgdaui => libgda-ui}/gdaui-raw-form.h | 0
{libgdaui => libgda-ui}/gdaui-raw-grid.c | 0
{libgdaui => libgda-ui}/gdaui-raw-grid.h | 0
{libgdaui => libgda-ui}/gdaui-server-operation.c | 0
{libgdaui => libgda-ui}/gdaui-server-operation.h | 0
{libgdaui => libgda-ui}/gdaui-set.c | 0
{libgdaui => libgda-ui}/gdaui-set.h | 0
{libgdaui => libgda-ui}/gdaui-tree-store.c | 0
{libgdaui => libgda-ui}/gdaui-tree-store.h | 0
{libgdaui => libgda-ui}/internal/Makefile.am | 4 +-
.../internal/gdaui-dsn-selector.c | 0
.../internal/gdaui-dsn-selector.h | 2 +-
.../internal/gdaui-provider-auth-editor.c | 2 +-
.../internal/gdaui-provider-auth-editor.h | 0
.../internal/gdaui-provider-spec-editor.c | 2 +-
.../internal/gdaui-provider-spec-editor.h | 0
{libgdaui => libgda-ui}/internal/utility.c | 6 +-
{libgdaui => libgda-ui}/internal/utility.h | 8 +-
libgdaui/libgdaui.h => libgda-ui/libgda-ui.h | 36 ++++++------
.../libgda-ui.symbols | 0
{libgdaui => libgda-ui}/marshallers/Makefile.am | 6 +-
.../marshallers/gdaui-custom-marshal.c | 0
.../marshallers/gdaui-custom-marshal.h | 0
.../marshallers/gdaui-marshal.list | 0
libgda/providers-support/Makefile.am | 2 +-
libgda/sql-parser/Makefile.am | 2 +-
libgda/sqlite/virtual/Makefile.am | 2 +-
providers/sqlite/Makefile.am | 3 -
testing/Makefile.am | 2 +-
testing/gdaui-test-data-entries.c | 4 +-
tools/browser/Makefile.am | 4 +-
tools/browser/auth-dialog.h | 2 +-
tools/browser/browser-connections-list.c | 2 +-
tools/browser/canvas-example.c | 2 +-
tools/browser/login-dialog.h | 2 +-
tools/browser/main.c | 2 +-
tools/browser/schema-browser/favorite-selector.c | 2 +-
tools/browser/schema-browser/objects-index.c | 2 +-
tools/browser/schema-browser/table-columns.c | 2 +-
tools/browser/schema-browser/table-relations.c | 2 +-
175 files changed, 196 insertions(+), 192 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 0615072..25bafc6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-06-30 Vivien Malerba <malerba gnome-db org>
+
+ * doc/C/libgda-4.0-sections.txt:
+ * libgda-4.0.pc.in:
+ * libgda/providers-support/Makefile.am:
+ * libgda/sql-parser/Makefile.am:
+ * libgda/sqlite/virtual/Makefile.am:
+ * providers/sqlite/Makefile.am: correction for bug #587435
+
2009-06-30 Murray Cumming <murrayc murrayc com>
* libgda/sql-parser/gda-statement-struct-*.h: Add G_BEGIN_DECLS and
diff --git a/INSTALL b/INSTALL
index c95e20e..23e5f25 100644
--- a/INSTALL
+++ b/INSTALL
@@ -233,3 +233,4 @@ configuration-related scripts to be executed by `/bin/bash'.
`configure' also accepts some other, not widely useful, options. Run
`configure --help' for more details.
+
diff --git a/Makefile.am b/Makefile.am
index 10885ab..5160393 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,9 +6,9 @@ XSLT_PC=libgda-xslt-$(GDA_ABI_VERSION).pc
endif
if HAVE_UI
-UI_DIRS=libgdaui \
+UI_DIRS=libgda-ui \
control-center
-UI_PC=libgdaui-$(GDA_ABI_VERSION).pc
+UI_PC=libgda-ui-$(GDA_ABI_VERSION).pc
endif
SUBDIRS = \
diff --git a/configure.in b/configure.in
index 3c5fa35..3c341b8 100644
--- a/configure.in
+++ b/configure.in
@@ -1647,7 +1647,7 @@ AC_OUTPUT([
Makefile
libgda.spec
libgda-4.0.pc
-libgdaui-4.0.pc
+libgda-ui-4.0.pc
libgda-report-4.0.pc
libgda-xslt-4.0.pc
po/Makefile.in
@@ -1688,14 +1688,14 @@ libgda-report/RML/Makefile
libgda-report/RML/trml2html/Makefile
libgda-report/RML/trml2pdf/Makefile
libgda-xslt/Makefile
-libgdaui/Makefile
-libgdaui/marshallers/Makefile
-libgdaui/internal/Makefile
-libgdaui/data-entries/Makefile
-libgdaui/data-entries/plugins/Makefile
-libgdaui/data/Makefile
-libgdaui/demos/Makefile
-libgdaui/demos/geninclude.pl
+libgda-ui/Makefile
+libgda-ui/marshallers/Makefile
+libgda-ui/internal/Makefile
+libgda-ui/data-entries/Makefile
+libgda-ui/data-entries/plugins/Makefile
+libgda-ui/data/Makefile
+libgda-ui/demos/Makefile
+libgda-ui/demos/geninclude.pl
control-center/Makefile
tools/Makefile
tools/gda-sql-4.0.1:tools/gda-sql.1.in
diff --git a/control-center/Makefile.am b/control-center/Makefile.am
index f366352..93c4c2d 100644
--- a/control-center/Makefile.am
+++ b/control-center/Makefile.am
@@ -48,9 +48,9 @@ control-center-res.o: control-center-res.rc
gda_control_center_4_0_LDFLAGS = $(EXTRALDFLAGS)
gda_control_center_4_0_LDADD=\
- $(top_builddir)/libgdaui/internal/libgdaui-internal.la \
+ $(top_builddir)/libgda-ui/internal/libgda-ui-internal.la \
$(top_builddir)/libgda/libgda-4.0.la \
- $(top_builddir)/libgdaui/libgdaui-4.0.la \
+ $(top_builddir)/libgda-ui/libgda-ui-4.0.la \
$(LIBGDA_LIBS) $(GTK_LIBS) $(UNIQUE_LIBS)
@INTLTOOL_DESKTOP_RULE@
diff --git a/control-center/dsn-config.c b/control-center/dsn-config.c
index 1516659..c641d62 100644
--- a/control-center/dsn-config.c
+++ b/control-center/dsn-config.c
@@ -28,7 +28,7 @@
#include <gtk/gtkstock.h>
#include <gtk/gtktable.h>
#include <gtk/gtkvbbox.h>
-#include <libgdaui/libgdaui.h>
+#include <libgda-ui/libgda-ui.h>
#include "dsn-config.h"
#include "dsn-properties-dialog.h"
#include "cc-utility.h"
diff --git a/control-center/dsn-properties-dialog.c b/control-center/dsn-properties-dialog.c
index 4a745dd..f405293 100644
--- a/control-center/dsn-properties-dialog.c
+++ b/control-center/dsn-properties-dialog.c
@@ -26,7 +26,7 @@
#include <gtk/gtknotebook.h>
#include <gtk/gtkstock.h>
#include <gtk/gtktable.h>
-#include <libgdaui/libgdaui.h>
+#include <libgda-ui/libgda-ui.h>
#include <libgda/binreloc/gda-binreloc.h>
#include "dsn-properties-dialog.h"
#include "gdaui-dsn-editor.h"
diff --git a/control-center/gdaui-dsn-assistant.c b/control-center/gdaui-dsn-assistant.c
index ef7f625..f7b31e5 100644
--- a/control-center/gdaui-dsn-assistant.c
+++ b/control-center/gdaui-dsn-assistant.c
@@ -27,12 +27,12 @@
#include <libgda/gda-holder.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include "gdaui-dsn-assistant.h"
-#include <libgdaui/internal/gdaui-provider-spec-editor.h>
-#include <libgdaui/internal/gdaui-provider-auth-editor.h>
-#include <libgdaui/gdaui-provider-selector.h>
-#include <libgdaui/gdaui-server-operation.h>
+#include <libgda-ui/internal/gdaui-provider-spec-editor.h>
+#include <libgda-ui/internal/gdaui-provider-auth-editor.h>
+#include <libgda-ui/gdaui-provider-selector.h>
+#include <libgda-ui/gdaui-server-operation.h>
#include <glib/gi18n-lib.h>
-#include <libgdaui/internal/utility.h>
+#include <libgda-ui/internal/utility.h>
#include <libgda/binreloc/gda-binreloc.h>
enum {
diff --git a/control-center/gdaui-dsn-editor.c b/control-center/gdaui-dsn-editor.c
index c3dbf2d..ba32022 100644
--- a/control-center/gdaui-dsn-editor.c
+++ b/control-center/gdaui-dsn-editor.c
@@ -26,11 +26,11 @@
#include <gtk/gtktable.h>
#include <libgda/libgda.h>
#include "gdaui-dsn-editor.h"
-#include <libgdaui/gdaui-provider-selector.h>
-#include <libgdaui/gdaui-basic-form.h>
+#include <libgda-ui/gdaui-provider-selector.h>
+#include <libgda-ui/gdaui-basic-form.h>
#include <glib/gi18n-lib.h>
-#include <libgdaui/internal/gdaui-provider-spec-editor.h>
-#include <libgdaui/internal/gdaui-provider-auth-editor.h>
+#include <libgda-ui/internal/gdaui-provider-spec-editor.h>
+#include <libgda-ui/internal/gdaui-provider-auth-editor.h>
struct _GdauiDsnEditorPrivate {
GtkWidget *wname;
diff --git a/control-center/gdaui-login-dialog.c b/control-center/gdaui-login-dialog.c
index 67ea65b..70985d0 100644
--- a/control-center/gdaui-login-dialog.c
+++ b/control-center/gdaui-login-dialog.c
@@ -30,7 +30,7 @@
#include <gtk/gtkwindow.h>
#include <libgda/gda-config.h>
#include <libgda/binreloc/gda-binreloc.h>
-#include <libgdaui/gdaui-login.h>
+#include <libgda-ui/gdaui-login.h>
#include "gdaui-login-dialog.h"
#include <glib/gi18n-lib.h>
diff --git a/control-center/gdaui-login-dialog.h b/control-center/gdaui-login-dialog.h
index 9a04163..136205e 100644
--- a/control-center/gdaui-login-dialog.h
+++ b/control-center/gdaui-login-dialog.h
@@ -24,7 +24,7 @@
#ifndef __GDAUI_LOGIN_DIALOG_H__
#define __GDAUI_LOGIN_DIALOG_H__
-#include <libgdaui/gdaui-login.h>
+#include <libgda-ui/gdaui-login.h>
#include <gtk/gtkdialog.h>
G_BEGIN_DECLS
diff --git a/control-center/main.c b/control-center/main.c
index eacb05c..555d1f6 100644
--- a/control-center/main.c
+++ b/control-center/main.c
@@ -24,7 +24,7 @@
#include <string.h>
#include <gtk/gtkdialog.h>
#include <gtk/gtkstock.h>
-#include <libgdaui/libgdaui.h>
+#include <libgda-ui/libgda-ui.h>
#include <libgda/binreloc/gda-binreloc.h>
#include <gtk/gtklabel.h>
#include <gtk/gtknotebook.h>
diff --git a/control-center/provider-config.c b/control-center/provider-config.c
index 6b24ab6..557b509 100644
--- a/control-center/provider-config.c
+++ b/control-center/provider-config.c
@@ -30,7 +30,7 @@
#include <gtk/gtkstock.h>
#include <gtk/gtktable.h>
#include <gtk/gtkvbbox.h>
-#include <libgdaui/libgdaui.h>
+#include <libgda-ui/libgda-ui.h>
#include "provider-config.h"
#include "cc-gray-bar.h"
diff --git a/doc/C/libgda-4.0-sections.txt b/doc/C/libgda-4.0-sections.txt
index 9fb5645..95f70ef 100644
--- a/doc/C/libgda-4.0-sections.txt
+++ b/doc/C/libgda-4.0-sections.txt
@@ -922,7 +922,7 @@ gda_get_default_handler
<SECTION>
<FILE>gda-report-engine</FILE>
<TITLE>GdaReportEngine</TITLE>
-<INCLUDE>gda-report-engine.h</INCLUDE>
+<INCLUDE>libgda-report/gda-report-engine.h</INCLUDE>
GdaReportEngine
gda_report_engine_new
gda_report_engine_new_from_string
@@ -1105,7 +1105,7 @@ gda_batch_get_type
<SECTION>
<FILE>gda-sql-parser</FILE>
<TITLE>GdaSqlParser</TITLE>
-<INCLUDE>sql-parser/gda-sql-parser.h</INCLUDE>
+<INCLUDE>libgda/sql-parser/gda-sql-parser.h</INCLUDE>
GdaSqlParser
GdaSqlParserMode
gda_sql_parser_new
@@ -1129,7 +1129,7 @@ gda_sql_parser_get_type
<SECTION>
<FILE>gda-sql-statement</FILE>
<TITLE>GdaSqlStatement</TITLE>
-<INCLUDE>sql-parser/gda-sql-statement.h</INCLUDE>
+<INCLUDE>libgda/sql-parser/gda-sql-statement.h</INCLUDE>
GdaSqlStatement
GdaSqlStatementType
gda_sql_statement_new
@@ -1372,7 +1372,7 @@ gda_data_select_get_type
<SECTION>
<FILE>gda-data-select-priv</FILE>
<TITLE>Subclassing GdaDataSelect</TITLE>
-<INCLUDE>providers-support/gda-data-select-priv.h</INCLUDE>
+<INCLUDE>libgda/providers-support/gda-data-select-priv.h</INCLUDE>
GdaDataSelectClass
gda_data_select_take_row
gda_data_select_get_stored_row
@@ -1400,7 +1400,7 @@ gda_row_value_is_valid
<SECTION>
<FILE>gda-pstmt</FILE>
<TITLE>GdaPStmt</TITLE>
-<INCLUDE>providers-support/gda-pstmt.h</INCLUDE>
+<INCLUDE>libgda/providers-support/gda-pstmt.h</INCLUDE>
GdaPStmt
gda_pstmt_set_gda_statement
gda_pstmt_get_gda_statement
diff --git a/libgda-4.0.pc.in b/libgda-4.0.pc.in
index fda12dc..55ef73f 100644
--- a/libgda-4.0.pc.in
+++ b/libgda-4.0.pc.in
@@ -8,4 +8,4 @@ Description: GDA (GNOME Data Access) library
Requires: gobject-2.0 gthread-2.0 libxml-2.0
Version: @VERSION@
Libs: -L${libdir} -lgda- GDA_ABI_MAJOR_VERSION@ GDA_ABI_MINOR_VERSION@
-Cflags: -I${includedir}/libgda- GDA_ABI_MAJOR_VERSION@ GDA_ABI_MINOR_VERSION@ @GDA_DEBUG_FLAGS@
+Cflags: -I${includedir}/libgda- GDA_ABI_MAJOR_VERSION@ GDA_ABI_MINOR_VERSION@ -I${includedir}/libgda- GDA_ABI_MAJOR_VERSION@ GDA_ABI_MINOR_VERSION@/libgda @GDA_DEBUG_FLAGS@
diff --git a/libgdaui-4.0.pc.in b/libgda-ui-4.0.pc.in
similarity index 100%
rename from libgdaui-4.0.pc.in
rename to libgda-ui-4.0.pc.in
diff --git a/libgdaui/.gitignore b/libgda-ui/.gitignore
similarity index 100%
rename from libgdaui/.gitignore
rename to libgda-ui/.gitignore
diff --git a/libgdaui/Makefile.am b/libgda-ui/Makefile.am
similarity index 64%
rename from libgdaui/Makefile.am
rename to libgda-ui/Makefile.am
index 75f519d..4be868b 100644
--- a/libgdaui/Makefile.am
+++ b/libgda-ui/Makefile.am
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = libgdaui-4.0.la
+lib_LTLIBRARIES = libgda-ui-4.0.la
SUBDIRS = marshallers data-entries internal data . data-entries/plugins demos
@@ -8,7 +8,7 @@ AM_CPPFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_srcdir)/libgda \
- -DPLUGINSDIR=\""$(top_builddir)/libgdaui/plugins/.libs"\" \
+ -DPLUGINSDIR=\""$(top_builddir)/libgda-ui/plugins/.libs"\" \
-DGDA_ABI_VERSION=\""$(GDA_ABI_VERSION)"\" \
$(LIBGDA_CFLAGS) \
$(GTK_CFLAGS)
@@ -34,9 +34,9 @@ ui_headers = \
gdaui-set.h \
gdaui-tree-store.h
-libgdaui_4_0_la_SOURCES = \
+libgda_ui_4_0_la_SOURCES = \
$(ui_headers) \
- $(libgdaui_built_cfiles) \
+ $(libgda_ui_built_cfiles) \
gdaui-basic-form.c \
gdaui-combo.c \
gdaui-data-entry.c \
@@ -75,7 +75,7 @@ gdaui-enum-types.c: s-enum-types-c
s-enum-types-c: @REBUILD@ $(ui_headers) Makefile
( cd $(srcdir) && glib-mkenums \
- --fhead "#include <libgdaui/libgdaui.h>\n" \
+ --fhead "#include <libgda-ui/libgda-ui.h>\n" \
--fhead "#include <glib-object.h>" \
--fprod "\n/* enumerations from \"@filename \" */" \
--vhead "GType\n enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G Type@Value values[] = {" \
@@ -89,56 +89,56 @@ s-enum-types-c: @REBUILD@ $(ui_headers) Makefile
# Generate the enums source code, with glib-mkenums:
# This is based on the same Makefile.am stuff in pango:
-libgdaui_built_headers = gdaui-enum-types.h
-libgdaui_built_cfiles = gdaui-enum-types.c
+libgda_ui_built_headers = gdaui-enum-types.h
+libgda_ui_built_cfiles = gdaui-enum-types.c
-$(OBJECTS) $(libgdaui_4_0_la_OBJECTS): $(libgdaui_built_headers) $(libgdaui_built_cfiles)
+$(OBJECTS) $(libgda_ui_4_0_la_OBJECTS): $(libgda_ui_built_headers) $(libgda_ui_built_cfiles)
-libgdaui_4_0_la_LDFLAGS = -version-info $(GDA_CURRENT):$(GDA_REVISION):$(GDA_AGE) \
+libgda_ui_4_0_la_LDFLAGS = -version-info $(GDA_CURRENT):$(GDA_REVISION):$(GDA_AGE) \
$(NO_UNDEFINED) $(LIBTOOL_UI_EXPORT_OPTIONS)
-libgdaui_4_0_la_LIBADD = \
- marshallers/libgdaui-marshallers.la \
- internal/libgdaui-internal.la \
- data-entries/libgdaui-data-entries.la \
+libgda_ui_4_0_la_LIBADD = \
+ marshallers/libgda-ui-marshallers.la \
+ internal/libgda-ui-internal.la \
+ data-entries/libgda-ui-data-entries.la \
../libgda/libgda-4.0.la \
$(LIBGDA_LIBS) \
$(GTK_LIBS)
if PLATFORM_WIN32
-libgdaui_4_0_la_LDFLAGS += -export-symbols $(srcdir)/libgdaui.def
-libgdaui_4_0_la_DEPENDENCIES = libgdaui.def
+libgda_ui_4_0_la_LDFLAGS += -export-symbols $(srcdir)/libgda-ui.def
+libgda_ui_4_0_la_DEPENDENCIES = libgda-ui.def
-libgdaui.def: libgdaui.symbols
- (echo -e EXPORTS; $(CPP) -P - <$(srcdir)/libgdaui.symbols | sed -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g' | sort) > libgdaui.def.tmp && mv libgdaui.def.tmp libgdaui.def
+libgda-ui.def: libgda-ui.symbols
+ (echo -e EXPORTS; $(CPP) -P - <$(srcdir)/libgda-ui.symbols | sed -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g' | sort) > libgda-ui.def.tmp && mv libgda-ui.def.tmp libgda-ui.def
-libgdaui-$(GDA_ABI_VERSION).lib: libgdaui.def
- $(DLLTOOL) --dllname libgdaui-$(GDA_ABI_VERSION)-$(GDA_CURRENT).dll --def libgdaui.def --output-lib libgdaui-$(GDA_ABI_VERSION).lib
+libgda-ui-$(GDA_ABI_VERSION).lib: libgda-ui.def
+ $(DLLTOOL) --dllname libgda-ui-$(GDA_ABI_VERSION)-$(GDA_CURRENT).dll --def libgda-ui.def --output-lib libgda-ui-$(GDA_ABI_VERSION).lib
install-data-local: install-def-files
uninstall-local: uninstall-def-files
-install-def-files: libgdaui.def libgdaui-$(GDA_ABI_VERSION).lib
- $(INSTALL) $(srcdir)/libgdaui.def $(DESTDIR)$(libdir)/libgdaui-$(GDA_ABI_VERSION).def
- $(INSTALL) $(srcdir)/libgdaui-$(GDA_ABI_VERSION).lib $(DESTDIR)$(libdir)/
+install-def-files: libgda-ui.def libgda-ui-$(GDA_ABI_VERSION).lib
+ $(INSTALL) $(srcdir)/libgda-ui.def $(DESTDIR)$(libdir)/libgda-ui-$(GDA_ABI_VERSION).def
+ $(INSTALL) $(srcdir)/libgda-ui-$(GDA_ABI_VERSION).lib $(DESTDIR)$(libdir)/
uninstall-def-files:
- -rm $(DESTDIR)$(libdir)/libgdaui-$(GDA_ABI_VERSION).def
- -rm $(DESTDIR)$(libdir)/libgdaui-$(GDA_ABI_VERSION).lib
+ -rm $(DESTDIR)$(libdir)/libgda-ui-$(GDA_ABI_VERSION).def
+ -rm $(DESTDIR)$(libdir)/libgda-ui-$(GDA_ABI_VERSION).lib
endif
-gdauiincludedir=$(includedir)/libgda-$(GDA_ABI_MAJOR_VERSION).$(GDA_ABI_MINOR_VERSION)/libgdaui
-gdauiinclude_HEADERS= libgdaui.h $(ui_headers) $(libgdaui_built_headers)
+gdauiincludedir=$(includedir)/libgda-$(GDA_ABI_MAJOR_VERSION).$(GDA_ABI_MINOR_VERSION)/libgda-ui
+gdauiinclude_HEADERS= libgda-ui.h $(ui_headers) $(libgda_ui_built_headers)
-CLEANFILES = $(libgdaui_built_headers) $(libgdaui_built_cfiles) \
+CLEANFILES = $(libgda_ui_built_headers) $(libgda_ui_built_cfiles) \
gdaui-enum-types.h \
s-enum-types-h \
gdaui-enum-types.c \
s-enum-types-c \
- libgdaui.def \
- libgdaui-$(GDA_ABI_VERSION).lib
+ libgda-ui.def \
+ libgda-ui-$(GDA_ABI_VERSION).lib
DTD_FILES = data-layout.dtd
dtddir=$(datadir)/libgda-$(GDA_ABI_MAJOR_VERSION).$(GDA_ABI_MINOR_VERSION)/dtd
dtd_DATA=$(DTD_FILES)
-EXTRA_DIST = $(DTD_FILES) libgdaui.symbols
+EXTRA_DIST = $(DTD_FILES) libgda-ui.symbols
diff --git a/libgdaui/data-entries/.gitignore b/libgda-ui/data-entries/.gitignore
similarity index 100%
rename from libgdaui/data-entries/.gitignore
rename to libgda-ui/data-entries/.gitignore
diff --git a/libgdaui/data-entries/Makefile.am b/libgda-ui/data-entries/Makefile.am
similarity index 79%
rename from libgdaui/data-entries/Makefile.am
rename to libgda-ui/data-entries/Makefile.am
index 3ecdb65..491cffa 100644
--- a/libgdaui/data-entries/Makefile.am
+++ b/libgda-ui/data-entries/Makefile.am
@@ -1,4 +1,4 @@
-noinst_LTLIBRARIES = libgdaui-data-entries.la
+noinst_LTLIBRARIES = libgda-ui-data-entries.la
SUBDIRS =
@@ -12,7 +12,7 @@ AM_CPPFLAGS = \
-DDATADIR=\""$(datadir)"\" \
-DLIBDIR=\""$(libdir)"\"
-libgdaui_data_entries_headers = \
+libgda_ui_data_entries_headers = \
gdaui-data-cell-renderer-boolean.h \
gdaui-data-cell-renderer-combo.h \
gdaui-data-cell-renderer-info.h \
@@ -29,11 +29,8 @@ libgdaui_data_entries_headers = \
gdaui-entry-wrapper.h \
gdaui-format-entry.h
-#libgdaui_data_entriesincludedir=$(includedir)/libgnomedb-$(GNOMEDB_ABI_MAJOR_VERSION).$(GNOMEDB_ABI_MINOR_VERSION)/libgnomedb/data-entries
-#libgdaui_data_entriesinclude_HEADERS=$(libgdaui_data_entries_headers)
-
-libgdaui_data_entries_la_SOURCES = \
- $(libgdaui_data_entries_headers) \
+libgda_ui_data_entries_la_SOURCES = \
+ $(libgda_ui_data_entries_headers) \
gdaui-data-cell-renderer-boolean.c \
gdaui-data-cell-renderer-combo.c \
gdaui-data-cell-renderer-info.c \
diff --git a/libgdaui/data-entries/gdaui-data-cell-renderer-boolean.c b/libgda-ui/data-entries/gdaui-data-cell-renderer-boolean.c
similarity index 100%
rename from libgdaui/data-entries/gdaui-data-cell-renderer-boolean.c
rename to libgda-ui/data-entries/gdaui-data-cell-renderer-boolean.c
diff --git a/libgdaui/data-entries/gdaui-data-cell-renderer-boolean.h b/libgda-ui/data-entries/gdaui-data-cell-renderer-boolean.h
similarity index 100%
rename from libgdaui/data-entries/gdaui-data-cell-renderer-boolean.h
rename to libgda-ui/data-entries/gdaui-data-cell-renderer-boolean.h
diff --git a/libgdaui/data-entries/gdaui-data-cell-renderer-combo.c b/libgda-ui/data-entries/gdaui-data-cell-renderer-combo.c
similarity index 99%
rename from libgdaui/data-entries/gdaui-data-cell-renderer-combo.c
rename to libgda-ui/data-entries/gdaui-data-cell-renderer-combo.c
index 9e26c89..c7136d6 100644
--- a/libgdaui/data-entries/gdaui-data-cell-renderer-combo.c
+++ b/libgda-ui/data-entries/gdaui-data-cell-renderer-combo.c
@@ -25,8 +25,8 @@
#include "gdaui-entry-combo.h"
#include "gdaui-data-cell-renderer-combo.h"
#include "marshallers/gdaui-custom-marshal.h"
-#include <libgdaui/gdaui-combo.h>
-#include <libgdaui/gdaui-data-entry.h>
+#include <libgda-ui/gdaui-combo.h>
+#include <libgda-ui/gdaui-data-entry.h>
#include <libgda/gda-enum-types.h>
#define GDAUI_DATA_CELL_RENDERER_COMBO_PATH "gdaui-data-cell-renderer-combo-path"
diff --git a/libgdaui/data-entries/gdaui-data-cell-renderer-combo.h b/libgda-ui/data-entries/gdaui-data-cell-renderer-combo.h
similarity index 98%
rename from libgdaui/data-entries/gdaui-data-cell-renderer-combo.h
rename to libgda-ui/data-entries/gdaui-data-cell-renderer-combo.h
index 4459bfa..521c8e0 100644
--- a/libgdaui/data-entries/gdaui-data-cell-renderer-combo.h
+++ b/libgda-ui/data-entries/gdaui-data-cell-renderer-combo.h
@@ -23,7 +23,7 @@
#define __GDAUI_DATA_CELL_RENDERER_COMBO_H__
#include <gtk/gtk.h>
-#include <libgdaui/gdaui-set.h>
+#include <libgda-ui/gdaui-set.h>
G_BEGIN_DECLS
diff --git a/libgdaui/data-entries/gdaui-data-cell-renderer-info.c b/libgda-ui/data-entries/gdaui-data-cell-renderer-info.c
similarity index 99%
rename from libgdaui/data-entries/gdaui-data-cell-renderer-info.c
rename to libgda-ui/data-entries/gdaui-data-cell-renderer-info.c
index 4ae2563..00277e0 100644
--- a/libgdaui/data-entries/gdaui-data-cell-renderer-info.c
+++ b/libgda-ui/data-entries/gdaui-data-cell-renderer-info.c
@@ -23,7 +23,7 @@
#include <glib/gi18n-lib.h>
#include "gdaui-data-cell-renderer-info.h"
#include "marshallers/gdaui-marshal.h"
-#include <libgdaui/internal/utility.h>
+#include <libgda-ui/internal/utility.h>
#include <libgda/libgda.h>
#include <gdk/gdkkeysyms.h>
#include <libgda/gda-enum-types.h>
diff --git a/libgdaui/data-entries/gdaui-data-cell-renderer-info.h b/libgda-ui/data-entries/gdaui-data-cell-renderer-info.h
similarity index 97%
rename from libgdaui/data-entries/gdaui-data-cell-renderer-info.h
rename to libgda-ui/data-entries/gdaui-data-cell-renderer-info.h
index f725f60..884f001 100644
--- a/libgdaui/data-entries/gdaui-data-cell-renderer-info.h
+++ b/libgda-ui/data-entries/gdaui-data-cell-renderer-info.h
@@ -24,8 +24,8 @@
#include <gtk/gtk.h>
#include <libgda/gda-enums.h>
-#include <libgdaui/gdaui-data-store.h>
-#include <libgdaui/gdaui-set.h>
+#include <libgda-ui/gdaui-data-store.h>
+#include <libgda-ui/gdaui-set.h>
G_BEGIN_DECLS
diff --git a/libgdaui/data-entries/gdaui-data-cell-renderer-textual.c b/libgda-ui/data-entries/gdaui-data-cell-renderer-textual.c
similarity index 100%
rename from libgdaui/data-entries/gdaui-data-cell-renderer-textual.c
rename to libgda-ui/data-entries/gdaui-data-cell-renderer-textual.c
diff --git a/libgdaui/data-entries/gdaui-data-cell-renderer-textual.h b/libgda-ui/data-entries/gdaui-data-cell-renderer-textual.h
similarity index 100%
rename from libgdaui/data-entries/gdaui-data-cell-renderer-textual.h
rename to libgda-ui/data-entries/gdaui-data-cell-renderer-textual.h
diff --git a/libgdaui/data-entries/gdaui-entry-boolean.c b/libgda-ui/data-entries/gdaui-entry-boolean.c
similarity index 100%
rename from libgdaui/data-entries/gdaui-entry-boolean.c
rename to libgda-ui/data-entries/gdaui-entry-boolean.c
diff --git a/libgdaui/data-entries/gdaui-entry-boolean.h b/libgda-ui/data-entries/gdaui-entry-boolean.h
similarity index 100%
rename from libgdaui/data-entries/gdaui-entry-boolean.h
rename to libgda-ui/data-entries/gdaui-entry-boolean.h
diff --git a/libgdaui/data-entries/gdaui-entry-combo.c b/libgda-ui/data-entries/gdaui-entry-combo.c
similarity index 100%
rename from libgdaui/data-entries/gdaui-entry-combo.c
rename to libgda-ui/data-entries/gdaui-entry-combo.c
diff --git a/libgdaui/data-entries/gdaui-entry-combo.h b/libgda-ui/data-entries/gdaui-entry-combo.h
similarity index 97%
rename from libgdaui/data-entries/gdaui-entry-combo.h
rename to libgda-ui/data-entries/gdaui-entry-combo.h
index 625494e..e6d528a 100644
--- a/libgdaui/data-entries/gdaui-entry-combo.h
+++ b/libgda-ui/data-entries/gdaui-entry-combo.h
@@ -23,8 +23,8 @@
#include <gtk/gtk.h>
#include "gdaui-entry-shell.h"
-#include <libgdaui/gdaui-data-entry.h>
-#include <libgdaui/gdaui-set.h>
+#include <libgda-ui/gdaui-data-entry.h>
+#include <libgda-ui/gdaui-set.h>
G_BEGIN_DECLS
diff --git a/libgdaui/data-entries/gdaui-entry-common-time.c b/libgda-ui/data-entries/gdaui-entry-common-time.c
similarity index 100%
rename from libgdaui/data-entries/gdaui-entry-common-time.c
rename to libgda-ui/data-entries/gdaui-entry-common-time.c
diff --git a/libgdaui/data-entries/gdaui-entry-common-time.h b/libgda-ui/data-entries/gdaui-entry-common-time.h
similarity index 100%
rename from libgdaui/data-entries/gdaui-entry-common-time.h
rename to libgda-ui/data-entries/gdaui-entry-common-time.h
diff --git a/libgdaui/data-entries/gdaui-entry-date.c b/libgda-ui/data-entries/gdaui-entry-date.c
similarity index 100%
rename from libgdaui/data-entries/gdaui-entry-date.c
rename to libgda-ui/data-entries/gdaui-entry-date.c
diff --git a/libgdaui/data-entries/gdaui-entry-date.h b/libgda-ui/data-entries/gdaui-entry-date.h
similarity index 100%
rename from libgdaui/data-entries/gdaui-entry-date.h
rename to libgda-ui/data-entries/gdaui-entry-date.h
diff --git a/libgdaui/data-entries/gdaui-entry-none.c b/libgda-ui/data-entries/gdaui-entry-none.c
similarity index 100%
rename from libgdaui/data-entries/gdaui-entry-none.c
rename to libgda-ui/data-entries/gdaui-entry-none.c
diff --git a/libgdaui/data-entries/gdaui-entry-none.h b/libgda-ui/data-entries/gdaui-entry-none.h
similarity index 100%
rename from libgdaui/data-entries/gdaui-entry-none.h
rename to libgda-ui/data-entries/gdaui-entry-none.h
diff --git a/libgdaui/data-entries/gdaui-entry-shell.c b/libgda-ui/data-entries/gdaui-entry-shell.c
similarity index 99%
rename from libgdaui/data-entries/gdaui-entry-shell.c
rename to libgda-ui/data-entries/gdaui-entry-shell.c
index 050cbe8..12a115b 100644
--- a/libgdaui/data-entries/gdaui-entry-shell.c
+++ b/libgda-ui/data-entries/gdaui-entry-shell.c
@@ -22,7 +22,7 @@
#include "gdaui-entry-shell.h"
#include "gdaui-entry-none.h"
#include <libgda/gda-data-handler.h>
-#include <libgdaui/internal/utility.h>
+#include <libgda-ui/internal/utility.h>
#include <glib/gi18n-lib.h>
static void gdaui_entry_shell_class_init (GdauiEntryShellClass *class);
diff --git a/libgdaui/data-entries/gdaui-entry-shell.h b/libgda-ui/data-entries/gdaui-entry-shell.h
similarity index 98%
rename from libgdaui/data-entries/gdaui-entry-shell.h
rename to libgda-ui/data-entries/gdaui-entry-shell.h
index fe22556..d561514 100644
--- a/libgdaui/data-entries/gdaui-entry-shell.h
+++ b/libgda-ui/data-entries/gdaui-entry-shell.h
@@ -22,7 +22,7 @@
#define __GDAUI_ENTRY_SHELL__
#include <gtk/gtk.h>
-#include <libgdaui/gdaui-data-entry.h>
+#include <libgda-ui/gdaui-data-entry.h>
G_BEGIN_DECLS
diff --git a/libgdaui/data-entries/gdaui-entry-string-number.xml.in b/libgda-ui/data-entries/gdaui-entry-string-number.xml.in
similarity index 100%
rename from libgdaui/data-entries/gdaui-entry-string-number.xml.in
rename to libgda-ui/data-entries/gdaui-entry-string-number.xml.in
diff --git a/libgdaui/data-entries/gdaui-entry-string-string.xml.in b/libgda-ui/data-entries/gdaui-entry-string-string.xml.in
similarity index 100%
rename from libgdaui/data-entries/gdaui-entry-string-string.xml.in
rename to libgda-ui/data-entries/gdaui-entry-string-string.xml.in
diff --git a/libgdaui/data-entries/gdaui-entry-string.c b/libgda-ui/data-entries/gdaui-entry-string.c
similarity index 100%
rename from libgdaui/data-entries/gdaui-entry-string.c
rename to libgda-ui/data-entries/gdaui-entry-string.c
diff --git a/libgdaui/data-entries/gdaui-entry-string.h b/libgda-ui/data-entries/gdaui-entry-string.h
similarity index 100%
rename from libgdaui/data-entries/gdaui-entry-string.h
rename to libgda-ui/data-entries/gdaui-entry-string.h
diff --git a/libgdaui/data-entries/gdaui-entry-time.c b/libgda-ui/data-entries/gdaui-entry-time.c
similarity index 100%
rename from libgdaui/data-entries/gdaui-entry-time.c
rename to libgda-ui/data-entries/gdaui-entry-time.c
diff --git a/libgdaui/data-entries/gdaui-entry-time.h b/libgda-ui/data-entries/gdaui-entry-time.h
similarity index 100%
rename from libgdaui/data-entries/gdaui-entry-time.h
rename to libgda-ui/data-entries/gdaui-entry-time.h
diff --git a/libgdaui/data-entries/gdaui-entry-timestamp.c b/libgda-ui/data-entries/gdaui-entry-timestamp.c
similarity index 100%
rename from libgdaui/data-entries/gdaui-entry-timestamp.c
rename to libgda-ui/data-entries/gdaui-entry-timestamp.c
diff --git a/libgdaui/data-entries/gdaui-entry-timestamp.h b/libgda-ui/data-entries/gdaui-entry-timestamp.h
similarity index 100%
rename from libgdaui/data-entries/gdaui-entry-timestamp.h
rename to libgda-ui/data-entries/gdaui-entry-timestamp.h
diff --git a/libgdaui/data-entries/gdaui-entry-wrapper.c b/libgda-ui/data-entries/gdaui-entry-wrapper.c
similarity index 100%
rename from libgdaui/data-entries/gdaui-entry-wrapper.c
rename to libgda-ui/data-entries/gdaui-entry-wrapper.c
diff --git a/libgdaui/data-entries/gdaui-entry-wrapper.h b/libgda-ui/data-entries/gdaui-entry-wrapper.h
similarity index 98%
rename from libgdaui/data-entries/gdaui-entry-wrapper.h
rename to libgda-ui/data-entries/gdaui-entry-wrapper.h
index da8c751..c329205 100644
--- a/libgdaui/data-entries/gdaui-entry-wrapper.h
+++ b/libgda-ui/data-entries/gdaui-entry-wrapper.h
@@ -23,7 +23,7 @@
#include <gtk/gtk.h>
#include "gdaui-entry-shell.h"
-#include <libgdaui/gdaui-data-entry.h>
+#include <libgda-ui/gdaui-data-entry.h>
G_BEGIN_DECLS
diff --git a/libgdaui/data-entries/gdaui-format-entry.c b/libgda-ui/data-entries/gdaui-format-entry.c
similarity index 100%
rename from libgdaui/data-entries/gdaui-format-entry.c
rename to libgda-ui/data-entries/gdaui-format-entry.c
diff --git a/libgdaui/data-entries/gdaui-format-entry.h b/libgda-ui/data-entries/gdaui-format-entry.h
similarity index 100%
rename from libgdaui/data-entries/gdaui-format-entry.h
rename to libgda-ui/data-entries/gdaui-format-entry.h
diff --git a/libgdaui/data-entries/plugins/.gitignore b/libgda-ui/data-entries/plugins/.gitignore
similarity index 100%
rename from libgdaui/data-entries/plugins/.gitignore
rename to libgda-ui/data-entries/plugins/.gitignore
diff --git a/libgdaui/data-entries/plugins/Makefile.am b/libgda-ui/data-entries/plugins/Makefile.am
similarity index 86%
rename from libgdaui/data-entries/plugins/Makefile.am
rename to libgda-ui/data-entries/plugins/Makefile.am
index 029322b..e730ffd 100644
--- a/libgdaui/data-entries/plugins/Makefile.am
+++ b/libgda-ui/data-entries/plugins/Makefile.am
@@ -1,4 +1,4 @@
-plugin_LTLIBRARIES = libgdaui-plugins.la
+plugin_LTLIBRARIES = libgda-ui-plugins.la
plugindir = $(libdir)/libgda-$(GDA_ABI_MAJOR_VERSION).$(GDA_ABI_MINOR_VERSION)/plugins
AM_CPPFLAGS = \
@@ -33,7 +33,7 @@ plugins_headers = \
gdaui-entry-pict.h \
$(gcrypt_headers)
-libgdaui_plugins_la_SOURCES = \
+libgda_ui_plugins_la_SOURCES = \
$(plugins_headers) \
common-pict.c \
custom-marshal.c \
@@ -48,10 +48,10 @@ libgdaui_plugins_la_SOURCES = \
gdaui-entry-pict.c \
$(gcrypt_sources)
-libgdaui_plugins_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED)
-libgdaui_plugins_la_LIBADD = \
+libgda_ui_plugins_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED)
+libgda_ui_plugins_la_LIBADD = \
$(top_builddir)/libgda/libgda-4.0.la \
- $(top_builddir)/libgdaui/libgdaui-4.0.la \
+ $(top_builddir)/libgda-ui/libgda-ui-4.0.la \
$(LIBGCRYPT_LIBS) \
$(LIBGDA_LIBS) \
$(GTK_LIBS)
diff --git a/libgdaui/data-entries/plugins/common-pict.c b/libgda-ui/data-entries/plugins/common-pict.c
similarity index 100%
rename from libgdaui/data-entries/plugins/common-pict.c
rename to libgda-ui/data-entries/plugins/common-pict.c
diff --git a/libgdaui/data-entries/plugins/common-pict.h b/libgda-ui/data-entries/plugins/common-pict.h
similarity index 100%
rename from libgdaui/data-entries/plugins/common-pict.h
rename to libgda-ui/data-entries/plugins/common-pict.h
diff --git a/libgdaui/data-entries/plugins/custom-marshal.c b/libgda-ui/data-entries/plugins/custom-marshal.c
similarity index 100%
rename from libgdaui/data-entries/plugins/custom-marshal.c
rename to libgda-ui/data-entries/plugins/custom-marshal.c
diff --git a/libgdaui/data-entries/plugins/custom-marshal.h b/libgda-ui/data-entries/plugins/custom-marshal.h
similarity index 100%
rename from libgdaui/data-entries/plugins/custom-marshal.h
rename to libgda-ui/data-entries/plugins/custom-marshal.h
diff --git a/libgdaui/data-entries/plugins/gdaui-data-cell-renderer-cgrid.c b/libgda-ui/data-entries/plugins/gdaui-data-cell-renderer-cgrid.c
similarity index 99%
rename from libgdaui/data-entries/plugins/gdaui-data-cell-renderer-cgrid.c
rename to libgda-ui/data-entries/plugins/gdaui-data-cell-renderer-cgrid.c
index 56d1901..9c4ebd3 100644
--- a/libgdaui/data-entries/plugins/gdaui-data-cell-renderer-cgrid.c
+++ b/libgda-ui/data-entries/plugins/gdaui-data-cell-renderer-cgrid.c
@@ -20,7 +20,7 @@
#include <glib/gi18n-lib.h>
-#include <libgdaui/gdaui-data-entry.h>
+#include <libgda-ui/gdaui-data-entry.h>
#include "gdaui-entry-cgrid.h"
#include "gdaui-data-cell-renderer-cgrid.h"
diff --git a/libgdaui/data-entries/plugins/gdaui-data-cell-renderer-cgrid.h b/libgda-ui/data-entries/plugins/gdaui-data-cell-renderer-cgrid.h
similarity index 99%
rename from libgdaui/data-entries/plugins/gdaui-data-cell-renderer-cgrid.h
rename to libgda-ui/data-entries/plugins/gdaui-data-cell-renderer-cgrid.h
index fbf04d4..7906fd0 100644
--- a/libgdaui/data-entries/plugins/gdaui-data-cell-renderer-cgrid.h
+++ b/libgda-ui/data-entries/plugins/gdaui-data-cell-renderer-cgrid.h
@@ -23,7 +23,7 @@
#include <gtk/gtk.h>
#include <pango/pango.h>
-#include <libgdaui/gdaui-decl.h>
+#include <libgda-ui/gdaui-decl.h>
#include <libgda/libgda.h>
#include <libgda/gda-enum-types.h>
diff --git a/libgdaui/data-entries/plugins/gdaui-data-cell-renderer-password.c b/libgda-ui/data-entries/plugins/gdaui-data-cell-renderer-password.c
similarity index 100%
rename from libgdaui/data-entries/plugins/gdaui-data-cell-renderer-password.c
rename to libgda-ui/data-entries/plugins/gdaui-data-cell-renderer-password.c
diff --git a/libgdaui/data-entries/plugins/gdaui-data-cell-renderer-password.h b/libgda-ui/data-entries/plugins/gdaui-data-cell-renderer-password.h
similarity index 98%
rename from libgdaui/data-entries/plugins/gdaui-data-cell-renderer-password.h
rename to libgda-ui/data-entries/plugins/gdaui-data-cell-renderer-password.h
index 1c552ac..8f22ad4 100644
--- a/libgdaui/data-entries/plugins/gdaui-data-cell-renderer-password.h
+++ b/libgda-ui/data-entries/plugins/gdaui-data-cell-renderer-password.h
@@ -21,7 +21,7 @@
#define __GDAUI_DATA_CELL_RENDERER_PASSWORD_H__
#include <gtk/gtk.h>
-#include <libgdaui/gdaui-decl.h>
+#include <libgda-ui/gdaui-decl.h>
G_BEGIN_DECLS
diff --git a/libgdaui/data-entries/plugins/gdaui-data-cell-renderer-pict.c b/libgda-ui/data-entries/plugins/gdaui-data-cell-renderer-pict.c
similarity index 100%
rename from libgdaui/data-entries/plugins/gdaui-data-cell-renderer-pict.c
rename to libgda-ui/data-entries/plugins/gdaui-data-cell-renderer-pict.c
diff --git a/libgdaui/data-entries/plugins/gdaui-data-cell-renderer-pict.h b/libgda-ui/data-entries/plugins/gdaui-data-cell-renderer-pict.h
similarity index 98%
rename from libgdaui/data-entries/plugins/gdaui-data-cell-renderer-pict.h
rename to libgda-ui/data-entries/plugins/gdaui-data-cell-renderer-pict.h
index c65b508..8f8ad0c 100644
--- a/libgdaui/data-entries/plugins/gdaui-data-cell-renderer-pict.h
+++ b/libgda-ui/data-entries/plugins/gdaui-data-cell-renderer-pict.h
@@ -21,7 +21,7 @@
#define __GDAUI_DATA_CELL_RENDERER_PICT_H__
#include <gtk/gtk.h>
-#include <libgdaui/gdaui-decl.h>
+#include <libgda-ui/gdaui-decl.h>
G_BEGIN_DECLS
diff --git a/libgdaui/data-entries/plugins/gdaui-entry-cgrid.c b/libgda-ui/data-entries/plugins/gdaui-entry-cgrid.c
similarity index 99%
rename from libgdaui/data-entries/plugins/gdaui-entry-cgrid.c
rename to libgda-ui/data-entries/plugins/gdaui-entry-cgrid.c
index 05d62b9..a3962d1 100644
--- a/libgdaui/data-entries/plugins/gdaui-entry-cgrid.c
+++ b/libgda-ui/data-entries/plugins/gdaui-entry-cgrid.c
@@ -31,8 +31,8 @@
#include <gtk/gtktreeselection.h>
#include <libgda/gda-data-model.h>
-#include <libgdaui/gdaui-raw-grid.h>
-#include <libgdaui/gdaui-data-widget.h>
+#include <libgda-ui/gdaui-raw-grid.h>
+#include <libgda-ui/gdaui-data-widget.h>
#include "gdaui-entry-cgrid.h"
diff --git a/libgdaui/data-entries/plugins/gdaui-entry-cgrid.h b/libgda-ui/data-entries/plugins/gdaui-entry-cgrid.h
similarity index 98%
rename from libgdaui/data-entries/plugins/gdaui-entry-cgrid.h
rename to libgda-ui/data-entries/plugins/gdaui-entry-cgrid.h
index 73fc766..82bb06b 100644
--- a/libgdaui/data-entries/plugins/gdaui-entry-cgrid.h
+++ b/libgda-ui/data-entries/plugins/gdaui-entry-cgrid.h
@@ -21,7 +21,7 @@
#ifndef __GDAUI_ENTRY_CGRID_H__
#define __GDAUI_ENTRY_CGRID_H__
-#include <libgdaui/data-entries/gdaui-entry-wrapper.h>
+#include <libgda-ui/data-entries/gdaui-entry-wrapper.h>
G_BEGIN_DECLS
diff --git a/libgdaui/data-entries/plugins/gdaui-entry-cidr.c b/libgda-ui/data-entries/plugins/gdaui-entry-cidr.c
similarity index 100%
rename from libgdaui/data-entries/plugins/gdaui-entry-cidr.c
rename to libgda-ui/data-entries/plugins/gdaui-entry-cidr.c
diff --git a/libgdaui/data-entries/plugins/gdaui-entry-cidr.h b/libgda-ui/data-entries/plugins/gdaui-entry-cidr.h
similarity index 97%
rename from libgdaui/data-entries/plugins/gdaui-entry-cidr.h
rename to libgda-ui/data-entries/plugins/gdaui-entry-cidr.h
index a424578..d3cbdeb 100644
--- a/libgdaui/data-entries/plugins/gdaui-entry-cidr.h
+++ b/libgda-ui/data-entries/plugins/gdaui-entry-cidr.h
@@ -22,7 +22,7 @@
#ifndef __GDAUI_ENTRY_CIDR_H_
#define __GDAUI_ENTRY_CIDR_H_
-#include <libgdaui/data-entries/gdaui-entry-wrapper.h>
+#include <libgda-ui/data-entries/gdaui-entry-wrapper.h>
G_BEGIN_DECLS
diff --git a/libgdaui/data-entries/plugins/gdaui-entry-filesel-spec.xml.in b/libgda-ui/data-entries/plugins/gdaui-entry-filesel-spec.xml.in
similarity index 100%
rename from libgdaui/data-entries/plugins/gdaui-entry-filesel-spec.xml.in
rename to libgda-ui/data-entries/plugins/gdaui-entry-filesel-spec.xml.in
diff --git a/libgdaui/data-entries/plugins/gdaui-entry-filesel.c b/libgda-ui/data-entries/plugins/gdaui-entry-filesel.c
similarity index 100%
rename from libgdaui/data-entries/plugins/gdaui-entry-filesel.c
rename to libgda-ui/data-entries/plugins/gdaui-entry-filesel.c
diff --git a/libgdaui/data-entries/plugins/gdaui-entry-filesel.h b/libgda-ui/data-entries/plugins/gdaui-entry-filesel.h
similarity index 97%
rename from libgdaui/data-entries/plugins/gdaui-entry-filesel.h
rename to libgda-ui/data-entries/plugins/gdaui-entry-filesel.h
index bc42df7..fcd5578 100644
--- a/libgdaui/data-entries/plugins/gdaui-entry-filesel.h
+++ b/libgda-ui/data-entries/plugins/gdaui-entry-filesel.h
@@ -22,7 +22,7 @@
#ifndef __GDAUI_ENTRY_FILESEL_H_
#define __GDAUI_ENTRY_FILESEL_H_
-#include <libgdaui/data-entries/gdaui-entry-wrapper.h>
+#include <libgda-ui/data-entries/gdaui-entry-wrapper.h>
G_BEGIN_DECLS
diff --git a/libgdaui/data-entries/plugins/gdaui-entry-password.c b/libgda-ui/data-entries/plugins/gdaui-entry-password.c
similarity index 100%
rename from libgdaui/data-entries/plugins/gdaui-entry-password.c
rename to libgda-ui/data-entries/plugins/gdaui-entry-password.c
diff --git a/libgdaui/data-entries/plugins/gdaui-entry-password.h b/libgda-ui/data-entries/plugins/gdaui-entry-password.h
similarity index 97%
rename from libgdaui/data-entries/plugins/gdaui-entry-password.h
rename to libgda-ui/data-entries/plugins/gdaui-entry-password.h
index b9f7b6b..28010b4 100644
--- a/libgdaui/data-entries/plugins/gdaui-entry-password.h
+++ b/libgda-ui/data-entries/plugins/gdaui-entry-password.h
@@ -22,7 +22,7 @@
#ifndef __GDAUI_ENTRY_PASSWORD_H_
#define __GDAUI_ENTRY_PASSWORD_H_
-#include <libgdaui/data-entries/gdaui-entry-wrapper.h>
+#include <libgda-ui/data-entries/gdaui-entry-wrapper.h>
G_BEGIN_DECLS
diff --git a/libgdaui/data-entries/plugins/gdaui-entry-password.xml.in b/libgda-ui/data-entries/plugins/gdaui-entry-password.xml.in
similarity index 100%
rename from libgdaui/data-entries/plugins/gdaui-entry-password.xml.in
rename to libgda-ui/data-entries/plugins/gdaui-entry-password.xml.in
diff --git a/libgdaui/data-entries/plugins/gdaui-entry-pict-spec.xml.in b/libgda-ui/data-entries/plugins/gdaui-entry-pict-spec.xml.in
similarity index 100%
rename from libgdaui/data-entries/plugins/gdaui-entry-pict-spec.xml.in
rename to libgda-ui/data-entries/plugins/gdaui-entry-pict-spec.xml.in
diff --git a/libgdaui/data-entries/plugins/gdaui-entry-pict-spec_string.xml.in b/libgda-ui/data-entries/plugins/gdaui-entry-pict-spec_string.xml.in
similarity index 100%
rename from libgdaui/data-entries/plugins/gdaui-entry-pict-spec_string.xml.in
rename to libgda-ui/data-entries/plugins/gdaui-entry-pict-spec_string.xml.in
diff --git a/libgdaui/data-entries/plugins/gdaui-entry-pict.c b/libgda-ui/data-entries/plugins/gdaui-entry-pict.c
similarity index 100%
rename from libgdaui/data-entries/plugins/gdaui-entry-pict.c
rename to libgda-ui/data-entries/plugins/gdaui-entry-pict.c
diff --git a/libgdaui/data-entries/plugins/gdaui-entry-pict.h b/libgda-ui/data-entries/plugins/gdaui-entry-pict.h
similarity index 97%
rename from libgdaui/data-entries/plugins/gdaui-entry-pict.h
rename to libgda-ui/data-entries/plugins/gdaui-entry-pict.h
index a2e8549..a0148d2 100644
--- a/libgdaui/data-entries/plugins/gdaui-entry-pict.h
+++ b/libgda-ui/data-entries/plugins/gdaui-entry-pict.h
@@ -22,7 +22,7 @@
#ifndef __GDAUI_ENTRY_PICT_H_
#define __GDAUI_ENTRY_PICT_H_
-#include <libgdaui/data-entries/gdaui-entry-wrapper.h>
+#include <libgda-ui/data-entries/gdaui-entry-wrapper.h>
G_BEGIN_DECLS
diff --git a/libgdaui/data-entries/plugins/gdaui-entry-text.c b/libgda-ui/data-entries/plugins/gdaui-entry-text.c
similarity index 100%
rename from libgdaui/data-entries/plugins/gdaui-entry-text.c
rename to libgda-ui/data-entries/plugins/gdaui-entry-text.c
diff --git a/libgdaui/data-entries/plugins/gdaui-entry-text.h b/libgda-ui/data-entries/plugins/gdaui-entry-text.h
similarity index 97%
rename from libgdaui/data-entries/plugins/gdaui-entry-text.h
rename to libgda-ui/data-entries/plugins/gdaui-entry-text.h
index a3a2ae6..60c8a14 100644
--- a/libgdaui/data-entries/plugins/gdaui-entry-text.h
+++ b/libgda-ui/data-entries/plugins/gdaui-entry-text.h
@@ -22,7 +22,7 @@
#ifndef __GDAUI_ENTRY_TEXT_H_
#define __GDAUI_ENTRY_TEXT_H_
-#include <libgdaui/data-entries/gdaui-entry-wrapper.h>
+#include <libgda-ui/data-entries/gdaui-entry-wrapper.h>
G_BEGIN_DECLS
diff --git a/libgdaui/data-entries/plugins/libmain.c b/libgda-ui/data-entries/plugins/libmain.c
similarity index 99%
rename from libgdaui/data-entries/plugins/libmain.c
rename to libgda-ui/data-entries/plugins/libmain.c
index 3978f25..b5f6949 100644
--- a/libgdaui/data-entries/plugins/libmain.c
+++ b/libgda-ui/data-entries/plugins/libmain.c
@@ -22,8 +22,8 @@
#include <libgda/libgda.h>
#include <glib/gi18n-lib.h>
#include <sql-parser/gda-sql-parser.h>
-#include <libgdaui/libgdaui.h>
-#include <libgdaui/gdaui-plugin.h>
+#include <libgda-ui/libgda-ui.h>
+#include <libgda-ui/gdaui-plugin.h>
#include <libgda/binreloc/gda-binreloc.h>
#include "gdaui-entry-filesel.h"
diff --git a/libgdaui/data-layout.dtd b/libgda-ui/data-layout.dtd
similarity index 100%
rename from libgdaui/data-layout.dtd
rename to libgda-ui/data-layout.dtd
diff --git a/libgdaui/data/Makefile.am b/libgda-ui/data/Makefile.am
similarity index 100%
rename from libgdaui/data/Makefile.am
rename to libgda-ui/data/Makefile.am
diff --git a/libgdaui/data/gdaui-generic.png b/libgda-ui/data/gdaui-generic.png
similarity index 100%
rename from libgdaui/data/gdaui-generic.png
rename to libgda-ui/data/gdaui-generic.png
diff --git a/libgdaui/data/import_encodings.xml b/libgda-ui/data/import_encodings.xml
similarity index 100%
rename from libgdaui/data/import_encodings.xml
rename to libgda-ui/data/import_encodings.xml
diff --git a/libgdaui/data/server_operation.glade b/libgda-ui/data/server_operation.glade
similarity index 100%
rename from libgdaui/data/server_operation.glade
rename to libgda-ui/data/server_operation.glade
diff --git a/libgdaui/demos/.gitignore b/libgda-ui/demos/.gitignore
similarity index 100%
rename from libgdaui/demos/.gitignore
rename to libgda-ui/demos/.gitignore
diff --git a/libgdaui/demos/Makefile.am b/libgda-ui/demos/Makefile.am
similarity index 94%
rename from libgdaui/demos/Makefile.am
rename to libgda-ui/demos/Makefile.am
index e34fe5f..bbee550 100644
--- a/libgdaui/demos/Makefile.am
+++ b/libgda-ui/demos/Makefile.am
@@ -1,4 +1,4 @@
-## Makefile.am for libgdaui demos
+## Makefile.am for libgda-ui demos
democodedir=$(datadir)/libgda-$(GDA_ABI_MAJOR_VERSION).$(GDA_ABI_MINOR_VERSION)/demo
@@ -57,7 +57,7 @@ gdaui_demo_4_0_DEPENDENCIES = $(DEPS)
gdaui_demo_4_0_LDFLAGS = $(EXTRALDFLAGS)
gdaui_demo_4_0_LDADD = \
$(top_builddir)/libgda/libgda-4.0.la \
- $(top_builddir)/libgdaui/libgdaui-4.0.la \
+ $(top_builddir)/libgda-ui/libgda-ui-4.0.la \
$(LIBGDA_LIBS) $(GTK_LIBS)
democode_DATA = $(demos) $(demofiles)
diff --git a/libgdaui/demos/data_model_dir.c b/libgda-ui/demos/data_model_dir.c
similarity index 99%
rename from libgdaui/demos/data_model_dir.c
rename to libgda-ui/demos/data_model_dir.c
index dd67c8d..74a1a2a 100644
--- a/libgdaui/demos/data_model_dir.c
+++ b/libgda-ui/demos/data_model_dir.c
@@ -6,7 +6,7 @@
*/
#include <libgda/binreloc/gda-binreloc.h>
-#include <libgdaui/libgdaui.h>
+#include <libgda-ui/libgda-ui.h>
static GtkWidget *window = NULL;
diff --git a/libgdaui/demos/ddl_queries.c b/libgda-ui/demos/ddl_queries.c
similarity index 99%
rename from libgdaui/demos/ddl_queries.c
rename to libgda-ui/demos/ddl_queries.c
index cc9c565..1d8c9d5 100644
--- a/libgdaui/demos/ddl_queries.c
+++ b/libgda-ui/demos/ddl_queries.c
@@ -20,7 +20,7 @@
* and assign value to the named parameters of a GdaServerOperation object.
*/
-#include <libgdaui/libgdaui.h>
+#include <libgda-ui/libgda-ui.h>
#include <string.h>
static GtkWidget *window = NULL;
diff --git a/libgdaui/demos/demo-common.h b/libgda-ui/demos/demo-common.h
similarity index 100%
rename from libgdaui/demos/demo-common.h
rename to libgda-ui/demos/demo-common.h
diff --git a/libgdaui/demos/demo_db.db b/libgda-ui/demos/demo_db.db
similarity index 100%
rename from libgdaui/demos/demo_db.db
rename to libgda-ui/demos/demo_db.db
diff --git a/libgdaui/demos/example_automatic_layout.xml b/libgda-ui/demos/example_automatic_layout.xml
similarity index 100%
rename from libgdaui/demos/example_automatic_layout.xml
rename to libgda-ui/demos/example_automatic_layout.xml
diff --git a/libgdaui/demos/form.c b/libgda-ui/demos/form.c
similarity index 98%
rename from libgdaui/demos/form.c
rename to libgda-ui/demos/form.c
index 1767c5e..28122f7 100644
--- a/libgdaui/demos/form.c
+++ b/libgda-ui/demos/form.c
@@ -3,7 +3,7 @@
* The GdauiForm widget displays data stored in a GdaDataModel.
*/
-#include <libgdaui/libgdaui.h>
+#include <libgda-ui/libgda-ui.h>
#include <sql-parser/gda-sql-parser.h>
extern GdaConnection *demo_cnc;
diff --git a/libgdaui/demos/form_data_layout.c b/libgda-ui/demos/form_data_layout.c
similarity index 98%
rename from libgdaui/demos/form_data_layout.c
rename to libgda-ui/demos/form_data_layout.c
index 1e74e3f..9efd775 100644
--- a/libgdaui/demos/form_data_layout.c
+++ b/libgda-ui/demos/form_data_layout.c
@@ -4,7 +4,7 @@
*
*/
-#include <libgdaui/libgdaui.h>
+#include <libgda-ui/libgda-ui.h>
#include <sql-parser/gda-sql-parser.h>
extern GdaConnection *demo_cnc;
diff --git a/libgdaui/demos/form_pict.c b/libgda-ui/demos/form_pict.c
similarity index 98%
rename from libgdaui/demos/form_pict.c
rename to libgda-ui/demos/form_pict.c
index efdb6a5..3ae2a2e 100644
--- a/libgdaui/demos/form_pict.c
+++ b/libgda-ui/demos/form_pict.c
@@ -4,7 +4,7 @@
* internally stored as a BLOB
*/
-#include <libgdaui/libgdaui.h>
+#include <libgda-ui/libgda-ui.h>
#include <sql-parser/gda-sql-parser.h>
extern GdaConnection *demo_cnc;
diff --git a/libgdaui/demos/form_rw.c b/libgda-ui/demos/form_rw.c
similarity index 98%
rename from libgdaui/demos/form_rw.c
rename to libgda-ui/demos/form_rw.c
index 4655b1e..5b5e650 100644
--- a/libgdaui/demos/form_rw.c
+++ b/libgda-ui/demos/form_rw.c
@@ -3,7 +3,7 @@
* The GdauiForm widget displays data stored in a GdaDataModel.
*/
-#include <libgdaui/libgdaui.h>
+#include <libgda-ui/libgda-ui.h>
#include <sql-parser/gda-sql-parser.h>
extern GdaConnection *demo_cnc;
diff --git a/libgdaui/demos/geninclude.pl.in b/libgda-ui/demos/geninclude.pl.in
similarity index 100%
rename from libgdaui/demos/geninclude.pl.in
rename to libgda-ui/demos/geninclude.pl.in
diff --git a/libgdaui/demos/grid.c b/libgda-ui/demos/grid.c
similarity index 98%
rename from libgdaui/demos/grid.c
rename to libgda-ui/demos/grid.c
index 6c70c24..8921601 100644
--- a/libgdaui/demos/grid.c
+++ b/libgda-ui/demos/grid.c
@@ -3,7 +3,7 @@
* The GdauiGrid widget displays data stored in a GdaDataModel.
*/
-#include <libgdaui/libgdaui.h>
+#include <libgda-ui/libgda-ui.h>
#include <sql-parser/gda-sql-parser.h>
extern GdaConnection *demo_cnc;
diff --git a/libgdaui/demos/grid_data_layout.c b/libgda-ui/demos/grid_data_layout.c
similarity index 98%
rename from libgdaui/demos/grid_data_layout.c
rename to libgda-ui/demos/grid_data_layout.c
index ae7d6f7..7b54c6b 100644
--- a/libgdaui/demos/grid_data_layout.c
+++ b/libgda-ui/demos/grid_data_layout.c
@@ -4,7 +4,7 @@
*
*/
-#include <libgdaui/libgdaui.h>
+#include <libgda-ui/libgda-ui.h>
#include <sql-parser/gda-sql-parser.h>
extern GdaConnection *demo_cnc;
diff --git a/libgdaui/demos/grid_pict.c b/libgda-ui/demos/grid_pict.c
similarity index 98%
rename from libgdaui/demos/grid_pict.c
rename to libgda-ui/demos/grid_pict.c
index cd7e80e..20831a6 100644
--- a/libgdaui/demos/grid_pict.c
+++ b/libgda-ui/demos/grid_pict.c
@@ -4,7 +4,7 @@
* internally stored as a BLOB
*/
-#include <libgdaui/libgdaui.h>
+#include <libgda-ui/libgda-ui.h>
#include <sql-parser/gda-sql-parser.h>
extern GdaConnection *demo_cnc;
diff --git a/libgdaui/demos/grid_rw.c b/libgda-ui/demos/grid_rw.c
similarity index 98%
rename from libgdaui/demos/grid_rw.c
rename to libgda-ui/demos/grid_rw.c
index ab8543e..919fe54 100644
--- a/libgdaui/demos/grid_rw.c
+++ b/libgda-ui/demos/grid_rw.c
@@ -3,7 +3,7 @@
* The GdauiGrid widget displays data stored in a GdaDataModel.
*/
-#include <libgdaui/libgdaui.h>
+#include <libgda-ui/libgda-ui.h>
#include <sql-parser/gda-sql-parser.h>
extern GdaConnection *demo_cnc;
diff --git a/libgdaui/demos/linked_grid_form.c b/libgda-ui/demos/linked_grid_form.c
similarity index 99%
rename from libgdaui/demos/linked_grid_form.c
rename to libgda-ui/demos/linked_grid_form.c
index 60b78c1..7e3cc25 100644
--- a/libgdaui/demos/linked_grid_form.c
+++ b/libgda-ui/demos/linked_grid_form.c
@@ -4,7 +4,7 @@
* optionally to have the same selected row.
*/
-#include <libgdaui/libgdaui.h>
+#include <libgda-ui/libgda-ui.h>
#include <sql-parser/gda-sql-parser.h>
extern GdaConnection *demo_cnc;
diff --git a/libgdaui/demos/linked_model_param.c b/libgda-ui/demos/linked_model_param.c
similarity index 99%
rename from libgdaui/demos/linked_model_param.c
rename to libgda-ui/demos/linked_model_param.c
index 1e6102b..be6bd08 100644
--- a/libgdaui/demos/linked_model_param.c
+++ b/libgda-ui/demos/linked_model_param.c
@@ -4,7 +4,7 @@
* form to display the required parameter.
*/
-#include <libgdaui/libgdaui.h>
+#include <libgda-ui/libgda-ui.h>
#include <sql-parser/gda-sql-parser.h>
extern GdaConnection *demo_cnc;
diff --git a/libgdaui/demos/login.c b/libgda-ui/demos/login.c
similarity index 99%
rename from libgdaui/demos/login.c
rename to libgda-ui/demos/login.c
index d9cce42..6d16cbb 100644
--- a/libgdaui/demos/login.c
+++ b/libgda-ui/demos/login.c
@@ -3,7 +3,7 @@
* The GdauiLogin widget displays information required to open a connection
*/
-#include <libgdaui/libgdaui.h>
+#include <libgda-ui/libgda-ui.h>
static GtkWidget *window = NULL;
diff --git a/libgdaui/demos/main.c b/libgda-ui/demos/main.c
similarity index 99%
rename from libgdaui/demos/main.c
rename to libgda-ui/demos/main.c
index 89ed02c..d32e784 100644
--- a/libgdaui/demos/main.c
+++ b/libgda-ui/demos/main.c
@@ -7,7 +7,7 @@
#include <glib/gstdio.h>
#include <glib/gi18n-lib.h>
-#include <libgdaui/libgdaui.h>
+#include <libgda-ui/libgda-ui.h>
#include <libgda/binreloc/gda-binreloc.h>
#include <sql-parser/gda-sql-parser.h>
@@ -750,7 +750,7 @@ main (int argc, char **argv)
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
- /* Initialize libgdaui & GTK+ */
+ /* Initialize libgda-ui & GTK+ */
gdaui_init ();
gtk_init (&argc, &argv);
diff --git a/libgdaui/demos/tree.c b/libgda-ui/demos/tree.c
similarity index 99%
rename from libgdaui/demos/tree.c
rename to libgda-ui/demos/tree.c
index f69bee7..c4b3cf4 100644
--- a/libgdaui/demos/tree.c
+++ b/libgda-ui/demos/tree.c
@@ -46,7 +46,7 @@
* `-- warehouses
*/
-#include <libgdaui/libgdaui.h>
+#include <libgda-ui/libgda-ui.h>
static GtkWidget *window = NULL;
extern GdaConnection *demo_cnc;
diff --git a/libgdaui/gdaui-basic-form.c b/libgda-ui/gdaui-basic-form.c
similarity index 99%
rename from libgdaui/gdaui-basic-form.c
rename to libgda-ui/gdaui-basic-form.c
index d3d2db7..b421b67 100644
--- a/libgdaui/gdaui-basic-form.c
+++ b/libgda-ui/gdaui-basic-form.c
@@ -26,10 +26,10 @@
#include "gdaui-enums.h"
#include "internal/utility.h"
#include "gdaui-data-entry.h"
-#include <libgdaui/data-entries/gdaui-entry-combo.h>
-#include <libgdaui/gdaui-data-widget.h>
-#include <libgdaui/gdaui-raw-form.h>
-#include <libgdaui/gdaui-easy.h>
+#include <libgda-ui/data-entries/gdaui-entry-combo.h>
+#include <libgda-ui/gdaui-data-widget.h>
+#include <libgda-ui/gdaui-raw-form.h>
+#include <libgda-ui/gdaui-easy.h>
static void gdaui_basic_form_class_init (GdauiBasicFormClass * class);
static void gdaui_basic_form_init (GdauiBasicForm *wid);
diff --git a/libgdaui/gdaui-basic-form.h b/libgda-ui/gdaui-basic-form.h
similarity index 100%
rename from libgdaui/gdaui-basic-form.h
rename to libgda-ui/gdaui-basic-form.h
diff --git a/libgdaui/gdaui-combo.c b/libgda-ui/gdaui-combo.c
similarity index 100%
rename from libgdaui/gdaui-combo.c
rename to libgda-ui/gdaui-combo.c
diff --git a/libgdaui/gdaui-combo.h b/libgda-ui/gdaui-combo.h
similarity index 100%
rename from libgdaui/gdaui-combo.h
rename to libgda-ui/gdaui-combo.h
diff --git a/libgdaui/gdaui-data-entry.c b/libgda-ui/gdaui-data-entry.c
similarity index 100%
rename from libgdaui/gdaui-data-entry.c
rename to libgda-ui/gdaui-data-entry.c
diff --git a/libgdaui/gdaui-data-entry.h b/libgda-ui/gdaui-data-entry.h
similarity index 100%
rename from libgdaui/gdaui-data-entry.h
rename to libgda-ui/gdaui-data-entry.h
diff --git a/libgdaui/gdaui-data-store.c b/libgda-ui/gdaui-data-store.c
similarity index 100%
rename from libgdaui/gdaui-data-store.c
rename to libgda-ui/gdaui-data-store.c
diff --git a/libgdaui/gdaui-data-store.h b/libgda-ui/gdaui-data-store.h
similarity index 100%
rename from libgdaui/gdaui-data-store.h
rename to libgda-ui/gdaui-data-store.h
diff --git a/libgdaui/gdaui-data-widget-filter.c b/libgda-ui/gdaui-data-widget-filter.c
similarity index 100%
rename from libgdaui/gdaui-data-widget-filter.c
rename to libgda-ui/gdaui-data-widget-filter.c
diff --git a/libgdaui/gdaui-data-widget-filter.h b/libgda-ui/gdaui-data-widget-filter.h
similarity index 98%
rename from libgdaui/gdaui-data-widget-filter.h
rename to libgda-ui/gdaui-data-widget-filter.h
index 792d946..ed2b059 100644
--- a/libgdaui/gdaui-data-widget-filter.h
+++ b/libgda-ui/gdaui-data-widget-filter.h
@@ -23,7 +23,7 @@
#include <gtk/gtk.h>
#include <libgda/gda-decl.h>
-#include <libgdaui/gdaui-decl.h>
+#include <libgda-ui/gdaui-decl.h>
G_BEGIN_DECLS
diff --git a/libgdaui/gdaui-data-widget-info.c b/libgda-ui/gdaui-data-widget-info.c
similarity index 100%
rename from libgdaui/gdaui-data-widget-info.c
rename to libgda-ui/gdaui-data-widget-info.c
diff --git a/libgdaui/gdaui-data-widget-info.h b/libgda-ui/gdaui-data-widget-info.h
similarity index 98%
rename from libgdaui/gdaui-data-widget-info.h
rename to libgda-ui/gdaui-data-widget-info.h
index 5689dce..d523368 100644
--- a/libgdaui/gdaui-data-widget-info.h
+++ b/libgda-ui/gdaui-data-widget-info.h
@@ -23,7 +23,7 @@
#include <gtk/gtk.h>
#include <libgda/gda-decl.h>
-#include <libgdaui/gdaui-decl.h>
+#include <libgda-ui/gdaui-decl.h>
G_BEGIN_DECLS
diff --git a/libgdaui/gdaui-data-widget.c b/libgda-ui/gdaui-data-widget.c
similarity index 99%
rename from libgdaui/gdaui-data-widget.c
rename to libgda-ui/gdaui-data-widget.c
index b2624b0..9318a29 100644
--- a/libgdaui/gdaui-data-widget.c
+++ b/libgda-ui/gdaui-data-widget.c
@@ -23,8 +23,8 @@
#include <libgda/binreloc/gda-binreloc.h>
#include "gdaui-data-widget.h"
#include <glib/gi18n-lib.h>
-#include <libgdaui/gdaui-raw-form.h>
-#include <libgdaui/gdaui-raw-grid.h>
+#include <libgda-ui/gdaui-raw-form.h>
+#include <libgda-ui/gdaui-raw-grid.h>
/* signals */
enum
diff --git a/libgdaui/gdaui-data-widget.h b/libgda-ui/gdaui-data-widget.h
similarity index 100%
rename from libgdaui/gdaui-data-widget.h
rename to libgda-ui/gdaui-data-widget.h
diff --git a/libgdaui/gdaui-decl.h b/libgda-ui/gdaui-decl.h
similarity index 100%
rename from libgdaui/gdaui-decl.h
rename to libgda-ui/gdaui-decl.h
diff --git a/libgdaui/gdaui-easy.h b/libgda-ui/gdaui-easy.h
similarity index 96%
rename from libgdaui/gdaui-easy.h
rename to libgda-ui/gdaui-easy.h
index cb8425b..59a5589 100644
--- a/libgdaui/gdaui-easy.h
+++ b/libgda-ui/gdaui-easy.h
@@ -23,7 +23,7 @@
#ifndef __GDAUI_EASY_H__
#define __GDAUI_EASY_H__
-#include <libgdaui/gdaui-data-entry.h>
+#include <libgda-ui/gdaui-data-entry.h>
G_BEGIN_DECLS
diff --git a/libgdaui/gdaui-enums.h b/libgda-ui/gdaui-enums.h
similarity index 100%
rename from libgdaui/gdaui-enums.h
rename to libgda-ui/gdaui-enums.h
diff --git a/libgdaui/gdaui-form.c b/libgda-ui/gdaui-form.c
similarity index 100%
rename from libgdaui/gdaui-form.c
rename to libgda-ui/gdaui-form.c
diff --git a/libgdaui/gdaui-form.h b/libgda-ui/gdaui-form.h
similarity index 100%
rename from libgdaui/gdaui-form.h
rename to libgda-ui/gdaui-form.h
diff --git a/libgdaui/gdaui-grid.c b/libgda-ui/gdaui-grid.c
similarity index 100%
rename from libgdaui/gdaui-grid.c
rename to libgda-ui/gdaui-grid.c
diff --git a/libgdaui/gdaui-grid.h b/libgda-ui/gdaui-grid.h
similarity index 100%
rename from libgdaui/gdaui-grid.h
rename to libgda-ui/gdaui-grid.h
diff --git a/libgdaui/gdaui-init.c b/libgda-ui/gdaui-init.c
similarity index 99%
rename from libgdaui/gdaui-init.c
rename to libgda-ui/gdaui-init.c
index 2565ab5..e2dc27b 100644
--- a/libgdaui/gdaui-init.c
+++ b/libgda-ui/gdaui-init.c
@@ -25,8 +25,8 @@
#include <gtk/gtk.h>
#include <glib/gi18n-lib.h>
#include <libgda/libgda.h>
-#include <libgdaui/gdaui-data-entry.h>
-#include <libgdaui/gdaui-plugin.h>
+#include <libgda-ui/gdaui-data-entry.h>
+#include <libgda-ui/gdaui-plugin.h>
#include <libgda/binreloc/gda-binreloc.h>
#include "data-entries/gdaui-entry-boolean.h"
#include "data-entries/gdaui-entry-string.h"
@@ -46,7 +46,7 @@ GHashTable *gdaui_plugins_hash = NULL; /* key = plugin name, value = GdauiPlugin
/**
* gdaui_init
*
- * Initialization of the libgdaui library, must be called before any usage of the library.
+ * Initialization of the libgda-ui library, must be called before any usage of the library.
* Note: gtk_init() is not called by this function and should also be called.
*/
void
diff --git a/libgdaui/gdaui-login.c b/libgda-ui/gdaui-login.c
similarity index 98%
rename from libgdaui/gdaui-login.c
rename to libgda-ui/gdaui-login.c
index ffe4e13..86b98d1 100644
--- a/libgdaui/gdaui-login.c
+++ b/libgda-ui/gdaui-login.c
@@ -23,12 +23,12 @@
#include "gdaui-decl.h"
#include <libgda/gda-config.h>
-#include <libgdaui/internal/gdaui-dsn-selector.h>
-#include <libgdaui/gdaui-provider-selector.h>
+#include <libgda-ui/internal/gdaui-dsn-selector.h>
+#include <libgda-ui/gdaui-provider-selector.h>
#include <glib/gi18n-lib.h>
-#include <libgdaui/gdaui-login.h>
-#include <libgdaui/internal/gdaui-provider-spec-editor.h>
-#include <libgdaui/internal/gdaui-provider-auth-editor.h>
+#include <libgda-ui/gdaui-login.h>
+#include <libgda-ui/internal/gdaui-provider-spec-editor.h>
+#include <libgda-ui/internal/gdaui-provider-auth-editor.h>
#include "gdaui-enum-types.h"
#include <gtk/gtklabel.h>
#include <gtk/gtktable.h>
diff --git a/libgdaui/gdaui-login.h b/libgda-ui/gdaui-login.h
similarity index 100%
rename from libgdaui/gdaui-login.h
rename to libgda-ui/gdaui-login.h
diff --git a/libgdaui/gdaui-plugin.h b/libgda-ui/gdaui-plugin.h
similarity index 100%
rename from libgdaui/gdaui-plugin.h
rename to libgda-ui/gdaui-plugin.h
diff --git a/libgdaui/gdaui-provider-selector.c b/libgda-ui/gdaui-provider-selector.c
similarity index 98%
rename from libgdaui/gdaui-provider-selector.c
rename to libgda-ui/gdaui-provider-selector.c
index fb511a1..e7d672e 100644
--- a/libgdaui/gdaui-provider-selector.c
+++ b/libgda-ui/gdaui-provider-selector.c
@@ -23,8 +23,8 @@
#include <string.h>
#include <libgda/gda-config.h>
-#include <libgdaui/gdaui-provider-selector.h>
-#include <libgdaui/gdaui-combo.h>
+#include <libgda-ui/gdaui-provider-selector.h>
+#include <libgda-ui/gdaui-combo.h>
#define PARENT_TYPE GDAUI_TYPE_COMBO
diff --git a/libgdaui/gdaui-provider-selector.h b/libgda-ui/gdaui-provider-selector.h
similarity index 98%
rename from libgdaui/gdaui-provider-selector.h
rename to libgda-ui/gdaui-provider-selector.h
index c82e68f..5383a5a 100644
--- a/libgdaui/gdaui-provider-selector.h
+++ b/libgda-ui/gdaui-provider-selector.h
@@ -24,7 +24,7 @@
#ifndef __GDAUI_PROVIDER_SELECTOR_H__
#define __GDAUI_PROVIDER_SELECTOR_H__
-#include <libgdaui/gdaui-combo.h>
+#include <libgda-ui/gdaui-combo.h>
G_BEGIN_DECLS
diff --git a/libgdaui/gdaui-raw-form.c b/libgda-ui/gdaui-raw-form.c
similarity index 100%
rename from libgdaui/gdaui-raw-form.c
rename to libgda-ui/gdaui-raw-form.c
diff --git a/libgdaui/gdaui-raw-form.h b/libgda-ui/gdaui-raw-form.h
similarity index 100%
rename from libgdaui/gdaui-raw-form.h
rename to libgda-ui/gdaui-raw-form.h
diff --git a/libgdaui/gdaui-raw-grid.c b/libgda-ui/gdaui-raw-grid.c
similarity index 100%
rename from libgdaui/gdaui-raw-grid.c
rename to libgda-ui/gdaui-raw-grid.c
diff --git a/libgdaui/gdaui-raw-grid.h b/libgda-ui/gdaui-raw-grid.h
similarity index 100%
rename from libgdaui/gdaui-raw-grid.h
rename to libgda-ui/gdaui-raw-grid.h
diff --git a/libgdaui/gdaui-server-operation.c b/libgda-ui/gdaui-server-operation.c
similarity index 100%
rename from libgdaui/gdaui-server-operation.c
rename to libgda-ui/gdaui-server-operation.c
diff --git a/libgdaui/gdaui-server-operation.h b/libgda-ui/gdaui-server-operation.h
similarity index 100%
rename from libgdaui/gdaui-server-operation.h
rename to libgda-ui/gdaui-server-operation.h
diff --git a/libgdaui/gdaui-set.c b/libgda-ui/gdaui-set.c
similarity index 100%
rename from libgdaui/gdaui-set.c
rename to libgda-ui/gdaui-set.c
diff --git a/libgdaui/gdaui-set.h b/libgda-ui/gdaui-set.h
similarity index 100%
rename from libgdaui/gdaui-set.h
rename to libgda-ui/gdaui-set.h
diff --git a/libgdaui/gdaui-tree-store.c b/libgda-ui/gdaui-tree-store.c
similarity index 100%
rename from libgdaui/gdaui-tree-store.c
rename to libgda-ui/gdaui-tree-store.c
diff --git a/libgdaui/gdaui-tree-store.h b/libgda-ui/gdaui-tree-store.h
similarity index 100%
rename from libgdaui/gdaui-tree-store.h
rename to libgda-ui/gdaui-tree-store.h
diff --git a/libgdaui/internal/Makefile.am b/libgda-ui/internal/Makefile.am
similarity index 82%
rename from libgdaui/internal/Makefile.am
rename to libgda-ui/internal/Makefile.am
index 0ca1441..e723a9e 100644
--- a/libgdaui/internal/Makefile.am
+++ b/libgda-ui/internal/Makefile.am
@@ -1,4 +1,4 @@
-noinst_LTLIBRARIES = libgdaui-internal.la
+noinst_LTLIBRARIES = libgda-ui-internal.la
AM_CPPFLAGS = \
-I$(top_builddir)/ui \
@@ -9,7 +9,7 @@ AM_CPPFLAGS = \
$(LIBGDA_CFLAGS) \
$(GTK_CFLAGS)
-libgdaui_internal_la_SOURCES = \
+libgda_ui_internal_la_SOURCES = \
gdaui-dsn-selector.c \
gdaui-dsn-selector.h \
gdaui-provider-auth-editor.c \
diff --git a/libgdaui/internal/gdaui-dsn-selector.c b/libgda-ui/internal/gdaui-dsn-selector.c
similarity index 100%
rename from libgdaui/internal/gdaui-dsn-selector.c
rename to libgda-ui/internal/gdaui-dsn-selector.c
diff --git a/libgdaui/internal/gdaui-dsn-selector.h b/libgda-ui/internal/gdaui-dsn-selector.h
similarity index 98%
rename from libgdaui/internal/gdaui-dsn-selector.h
rename to libgda-ui/internal/gdaui-dsn-selector.h
index b393201..573effb 100644
--- a/libgdaui/internal/gdaui-dsn-selector.h
+++ b/libgda-ui/internal/gdaui-dsn-selector.h
@@ -24,7 +24,7 @@
#ifndef __GDAUI_DSN_SELECTOR_H__
#define __GDAUI_DSN_SELECTOR_H__
-#include <libgdaui/gdaui-combo.h>
+#include <libgda-ui/gdaui-combo.h>
G_BEGIN_DECLS
diff --git a/libgdaui/internal/gdaui-provider-auth-editor.c b/libgda-ui/internal/gdaui-provider-auth-editor.c
similarity index 99%
rename from libgdaui/internal/gdaui-provider-auth-editor.c
rename to libgda-ui/internal/gdaui-provider-auth-editor.c
index 19fb44f..2cfc7cc 100644
--- a/libgdaui/internal/gdaui-provider-auth-editor.c
+++ b/libgda-ui/internal/gdaui-provider-auth-editor.c
@@ -25,7 +25,7 @@
#include <gtk/gtktable.h>
#include <libgda/libgda.h>
#include "gdaui-provider-auth-editor.h"
-#include <libgdaui/gdaui-basic-form.h>
+#include <libgda-ui/gdaui-basic-form.h>
#include <glib/gi18n-lib.h>
struct _GdauiProviderAuthEditorPrivate {
diff --git a/libgdaui/internal/gdaui-provider-auth-editor.h b/libgda-ui/internal/gdaui-provider-auth-editor.h
similarity index 100%
rename from libgdaui/internal/gdaui-provider-auth-editor.h
rename to libgda-ui/internal/gdaui-provider-auth-editor.h
diff --git a/libgdaui/internal/gdaui-provider-spec-editor.c b/libgda-ui/internal/gdaui-provider-spec-editor.c
similarity index 99%
rename from libgdaui/internal/gdaui-provider-spec-editor.c
rename to libgda-ui/internal/gdaui-provider-spec-editor.c
index 56787d6..8c55deb 100644
--- a/libgdaui/internal/gdaui-provider-spec-editor.c
+++ b/libgda-ui/internal/gdaui-provider-spec-editor.c
@@ -25,7 +25,7 @@
#include <gtk/gtktable.h>
#include <libgda/libgda.h>
#include "gdaui-provider-spec-editor.h"
-#include <libgdaui/gdaui-basic-form.h>
+#include <libgda-ui/gdaui-basic-form.h>
#include <glib/gi18n-lib.h>
typedef enum {
diff --git a/libgdaui/internal/gdaui-provider-spec-editor.h b/libgda-ui/internal/gdaui-provider-spec-editor.h
similarity index 100%
rename from libgdaui/internal/gdaui-provider-spec-editor.h
rename to libgda-ui/internal/gdaui-provider-spec-editor.h
diff --git a/libgdaui/internal/utility.c b/libgda-ui/internal/utility.c
similarity index 99%
rename from libgdaui/internal/utility.c
rename to libgda-ui/internal/utility.c
index fd22770..101c906 100644
--- a/libgdaui/internal/utility.c
+++ b/libgda-ui/internal/utility.c
@@ -23,9 +23,9 @@
#include "utility.h"
#include <libgda/libgda.h>
#include <glib/gi18n-lib.h>
-#include <libgdaui/gdaui-data-entry.h>
-#include <libgdaui/libgdaui.h>
-#include <libgdaui/gdaui-decl.h>
+#include <libgda-ui/gdaui-data-entry.h>
+#include <libgda-ui/libgda-ui.h>
+#include <libgda-ui/gdaui-decl.h>
/**
diff --git a/libgdaui/internal/utility.h b/libgda-ui/internal/utility.h
similarity index 93%
rename from libgdaui/internal/utility.h
rename to libgda-ui/internal/utility.h
index 91f9066..28c2763 100644
--- a/libgdaui/internal/utility.h
+++ b/libgda-ui/internal/utility.h
@@ -20,10 +20,10 @@
#include <gtk/gtk.h>
#include <libgda/gda-set.h>
-#include <libgdaui/gdaui-data-entry.h>
-#include <libgdaui/gdaui-data-store.h>
-#include <libgdaui/gdaui-set.h>
-#include <libgdaui/gdaui-data-widget.h>
+#include <libgda-ui/gdaui-data-entry.h>
+#include <libgda-ui/gdaui-data-store.h>
+#include <libgda-ui/gdaui-set.h>
+#include <libgda-ui/gdaui-data-widget.h>
/*
*
diff --git a/libgdaui/libgdaui.h b/libgda-ui/libgda-ui.h
similarity index 59%
rename from libgdaui/libgdaui.h
rename to libgda-ui/libgda-ui.h
index 4cc5c4a..45031f9 100644
--- a/libgdaui/libgdaui.h
+++ b/libgda-ui/libgda-ui.h
@@ -25,24 +25,24 @@
#include <libgda/libgda.h>
-#include <libgdaui/gdaui-data-entry.h>
-#include <libgdaui/gdaui-basic-form.h>
-#include <libgdaui/gdaui-combo.h>
-#include <libgdaui/gdaui-data-store.h>
-#include <libgdaui/gdaui-data-widget-filter.h>
-#include <libgdaui/gdaui-data-widget.h>
-#include <libgdaui/gdaui-easy.h>
-#include <libgdaui/gdaui-enums.h>
-#include <libgdaui/gdaui-raw-form.h>
-#include <libgdaui/gdaui-form.h>
-#include <libgdaui/gdaui-set.h>
-#include <libgdaui/gdaui-raw-grid.h>
-#include <libgdaui/gdaui-grid.h>
-#include <libgdaui/gdaui-data-widget-info.h>
-#include <libgdaui/gdaui-provider-selector.h>
-#include <libgdaui/gdaui-server-operation.h>
-#include <libgdaui/gdaui-login.h>
-#include <libgdaui/gdaui-tree-store.h>
+#include <libgda-ui/gdaui-data-entry.h>
+#include <libgda-ui/gdaui-basic-form.h>
+#include <libgda-ui/gdaui-combo.h>
+#include <libgda-ui/gdaui-data-store.h>
+#include <libgda-ui/gdaui-data-widget-filter.h>
+#include <libgda-ui/gdaui-data-widget.h>
+#include <libgda-ui/gdaui-easy.h>
+#include <libgda-ui/gdaui-enums.h>
+#include <libgda-ui/gdaui-raw-form.h>
+#include <libgda-ui/gdaui-form.h>
+#include <libgda-ui/gdaui-set.h>
+#include <libgda-ui/gdaui-raw-grid.h>
+#include <libgda-ui/gdaui-grid.h>
+#include <libgda-ui/gdaui-data-widget-info.h>
+#include <libgda-ui/gdaui-provider-selector.h>
+#include <libgda-ui/gdaui-server-operation.h>
+#include <libgda-ui/gdaui-login.h>
+#include <libgda-ui/gdaui-tree-store.h>
G_BEGIN_DECLS
diff --git a/libgdaui/libgdaui.symbols b/libgda-ui/libgda-ui.symbols
similarity index 100%
rename from libgdaui/libgdaui.symbols
rename to libgda-ui/libgda-ui.symbols
diff --git a/libgdaui/marshallers/Makefile.am b/libgda-ui/marshallers/Makefile.am
similarity index 77%
rename from libgdaui/marshallers/Makefile.am
rename to libgda-ui/marshallers/Makefile.am
index 1070d22..aa7f384 100644
--- a/libgdaui/marshallers/Makefile.am
+++ b/libgda-ui/marshallers/Makefile.am
@@ -1,4 +1,4 @@
-noinst_LTLIBRARIES = libgdaui-marshallers.la
+noinst_LTLIBRARIES = libgda-ui-marshallers.la
AM_CPPFLAGS = \
-I$(top_builddir)/ui \
@@ -13,13 +13,13 @@ gdaui-marshal.h: gdaui-marshal.list $(GLIB_GENMARSHAL)
gdaui-marshal.c: gdaui-marshal.list $(GLIB_GENMARSHAL)
$(GLIB_GENMARSHAL) $< --body --prefix=_gdaui_marshal > $@
-libgdaui_marshallers_la_SOURCES = \
+libgda_ui_marshallers_la_SOURCES = \
gdaui-marshal.h \
gdaui-marshal.c \
gdaui-custom-marshal.c \
gdaui-custom-marshal.h
-$(OBJECTS) $(libgdaui_marshallers_la_OBJECTS): gdaui-marshal.c gdaui-marshal.h
+$(OBJECTS) $(libgda_ui_marshallers_la_OBJECTS): gdaui-marshal.c gdaui-marshal.h
EXTRA_DIST = gdaui-marshal.list
diff --git a/libgdaui/marshallers/gdaui-custom-marshal.c b/libgda-ui/marshallers/gdaui-custom-marshal.c
similarity index 100%
rename from libgdaui/marshallers/gdaui-custom-marshal.c
rename to libgda-ui/marshallers/gdaui-custom-marshal.c
diff --git a/libgdaui/marshallers/gdaui-custom-marshal.h b/libgda-ui/marshallers/gdaui-custom-marshal.h
similarity index 100%
rename from libgdaui/marshallers/gdaui-custom-marshal.h
rename to libgda-ui/marshallers/gdaui-custom-marshal.h
diff --git a/libgdaui/marshallers/gdaui-marshal.list b/libgda-ui/marshallers/gdaui-marshal.list
similarity index 100%
rename from libgdaui/marshallers/gdaui-marshal.list
rename to libgda-ui/marshallers/gdaui-marshal.list
diff --git a/libgda/providers-support/Makefile.am b/libgda/providers-support/Makefile.am
index 7e3d768..8ef4fc5 100644
--- a/libgda/providers-support/Makefile.am
+++ b/libgda/providers-support/Makefile.am
@@ -18,5 +18,5 @@ libgda_psupport_la_SOURCES = \
libgda_psupport_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED)
libgda_psupport_la_LIBADD = $(LIBGDA_LIBS)
-psupportincludedir=$(includedir)/libgda-$(GDA_ABI_MAJOR_VERSION).$(GDA_ABI_MINOR_VERSION)/providers-support
+psupportincludedir=$(includedir)/libgda-$(GDA_ABI_MAJOR_VERSION).$(GDA_ABI_MINOR_VERSION)/libgda/providers-support
psupportinclude_HEADERS=$(psupport_headers)
diff --git a/libgda/sql-parser/Makefile.am b/libgda/sql-parser/Makefile.am
index ad30bdf..f6055d1 100644
--- a/libgda/sql-parser/Makefile.am
+++ b/libgda/sql-parser/Makefile.am
@@ -74,7 +74,7 @@ libgda_sql_parser_built_headers = gda-sql-parser-enum-types.h
libgda_sql_parser_built_cfiles = gda-sql-parser-enum-types.c
$(OBJECTS) $(libgda_sql_parser_4_0_la_OBJECTS): token_types.h
-libgda_sql_parserincludedir=$(includedir)/libgda-$(GDA_ABI_MAJOR_VERSION).$(GDA_ABI_MINOR_VERSION)/sql-parser
+libgda_sql_parserincludedir=$(includedir)/libgda-$(GDA_ABI_MAJOR_VERSION).$(GDA_ABI_MINOR_VERSION)/libgda/sql-parser
libgda_sql_parserinclude_HEADERS=$(libgda_sql_parser_headers) $(libgda_sql_parser_built_headers)
libgda_sql_parser_4_0_la_SOURCES = \
diff --git a/libgda/sqlite/virtual/Makefile.am b/libgda/sqlite/virtual/Makefile.am
index b5f6abe..d0d363e 100644
--- a/libgda/sqlite/virtual/Makefile.am
+++ b/libgda/sqlite/virtual/Makefile.am
@@ -38,7 +38,7 @@ libgda_virtual_4_0_la_SOURCES = \
gda-virtual-connection.c \
gda-virtual-provider.c
-gdaincludedir=$(includedir)/libgda-$(GDA_ABI_MAJOR_VERSION).$(GDA_ABI_MINOR_VERSION)/virtual
+gdaincludedir=$(includedir)/libgda-$(GDA_ABI_MAJOR_VERSION).$(GDA_ABI_MINOR_VERSION)/libgda/virtual
gdainclude_HEADERS=$(virtual_headers)
xmldir = $(datadir)/libgda-4.0
diff --git a/providers/sqlite/Makefile.am b/providers/sqlite/Makefile.am
index a851284..e67d78d 100644
--- a/providers/sqlite/Makefile.am
+++ b/providers/sqlite/Makefile.am
@@ -34,9 +34,6 @@ xml_in_files = \
sqlite_specs_create_view.xml.in \
sqlite_specs_drop_view.xml.in
-gdaincludedir=$(includedir)/libgda-$(GDA_ABI_MAJOR_VERSION).$(GDA_ABI_MINOR_VERSION)/virtual
-gdainclude_HEADERS=$(virtualheaders)
-
@INTLTOOL_XML_RULE@
xml_DATA = $(xml_in_files:.xml.in=.xml)
diff --git a/testing/Makefile.am b/testing/Makefile.am
index 2d80616..8e553dc 100644
--- a/testing/Makefile.am
+++ b/testing/Makefile.am
@@ -41,7 +41,7 @@ gdaui_test_data_entries_SOURCES = \
gdaui_test_data_entries_LDADD = \
$(top_builddir)/libgda/libgda-4.0.la \
- $(top_builddir)/libgdaui/libgdaui-4.0.la \
+ $(top_builddir)/libgda-ui/libgda-ui-4.0.la \
$(LIBGDA_LIBS)
EXTRA_DIST =
diff --git a/testing/gdaui-test-data-entries.c b/testing/gdaui-test-data-entries.c
index f5f9d96..3ab3352 100644
--- a/testing/gdaui-test-data-entries.c
+++ b/testing/gdaui-test-data-entries.c
@@ -1,6 +1,6 @@
#include <glib/gi18n-lib.h>
-#include <libgdaui/libgdaui.h>
-#include <libgdaui/gdaui-plugin.h>
+#include <libgda-ui/libgda-ui.h>
+#include <libgda-ui/gdaui-plugin.h>
#include <gtk/gtk.h>
typedef enum {
diff --git a/tools/browser/Makefile.am b/tools/browser/Makefile.am
index 92d93db..9a55bac 100644
--- a/tools/browser/Makefile.am
+++ b/tools/browser/Makefile.am
@@ -75,7 +75,7 @@ gda_browser_4_0_LDADD=\
$(top_builddir)/tools/browser/schema-browser/libperspective.la \
$(top_builddir)/tools/browser/dummy-perspective/libperspective.la \
$(top_builddir)/libgda/libgda-4.0.la \
- $(top_builddir)/libgdaui/libgdaui-4.0.la \
+ $(top_builddir)/libgda-ui/libgda-ui-4.0.la \
$(LIBGDA_LIBS) $(GTK_LIBS)
if HAVE_GOOCANVAS
@@ -99,7 +99,7 @@ canvas_example_SOURCES = \
canvas_example_CFLAGS = -DCANVAS_EXAMPLE
canvas_example_LDFLAGS = \
$(top_builddir)/libgda/libgda-4.0.la \
- $(top_builddir)/libgdaui/libgdaui-4.0.la \
+ $(top_builddir)/libgda-ui/libgda-ui-4.0.la \
canvas/libcanvas.la
diff --git a/tools/browser/auth-dialog.h b/tools/browser/auth-dialog.h
index d9d6ded..3894bef 100644
--- a/tools/browser/auth-dialog.h
+++ b/tools/browser/auth-dialog.h
@@ -21,7 +21,7 @@
#ifndef __AUTH_DIALOG_H_
#define __AUTH_DIALOG_H_
-#include <libgdaui/libgdaui.h>
+#include <libgda-ui/libgda-ui.h>
#include <gtk/gtk.h>
G_BEGIN_DECLS
diff --git a/tools/browser/browser-connections-list.c b/tools/browser/browser-connections-list.c
index a8f0e2d..e682242 100644
--- a/tools/browser/browser-connections-list.c
+++ b/tools/browser/browser-connections-list.c
@@ -24,7 +24,7 @@
#include "browser-core.h"
#include "browser-window.h"
#include "browser-connection.h"
-#include <libgdaui/gdaui-login.h>
+#include <libgda-ui/gdaui-login.h>
#include "support.h"
#include "login-dialog.h"
diff --git a/tools/browser/canvas-example.c b/tools/browser/canvas-example.c
index 8874558..9131b97 100644
--- a/tools/browser/canvas-example.c
+++ b/tools/browser/canvas-example.c
@@ -1,6 +1,6 @@
#include <libgda/libgda.h>
#include <libgda/binreloc/gda-binreloc.h>
-#include <libgdaui/libgdaui.h>
+#include <libgda-ui/libgda-ui.h>
#include "canvas/browser-canvas-db-relations.h"
#include "dnd.h"
diff --git a/tools/browser/login-dialog.h b/tools/browser/login-dialog.h
index b48214e..6675ee5 100644
--- a/tools/browser/login-dialog.h
+++ b/tools/browser/login-dialog.h
@@ -21,7 +21,7 @@
#ifndef __LOGIN_DIALOG_H_
#define __LOGIN_DIALOG_H_
-#include <libgdaui/libgdaui.h>
+#include <libgda-ui/libgda-ui.h>
#include <gtk/gtk.h>
G_BEGIN_DECLS
diff --git a/tools/browser/main.c b/tools/browser/main.c
index c04992b..a89b9aa 100644
--- a/tools/browser/main.c
+++ b/tools/browser/main.c
@@ -22,7 +22,7 @@
#include <glib/gi18n-lib.h>
#include <glib/gprintf.h>
#include <string.h>
-#include <libgdaui/libgdaui.h>
+#include <libgda-ui/libgda-ui.h>
#include "support.h"
#include "browser-core.h"
#include "browser-connection.h"
diff --git a/tools/browser/schema-browser/favorite-selector.c b/tools/browser/schema-browser/favorite-selector.c
index 0972b81..8d903e1 100644
--- a/tools/browser/schema-browser/favorite-selector.c
+++ b/tools/browser/schema-browser/favorite-selector.c
@@ -26,7 +26,7 @@
#include <libgda/gda-tree.h>
#include "favorite-selector.h"
#include "../mgr-favorites.h"
-#include <libgdaui/gdaui-tree-store.h>
+#include <libgda-ui/gdaui-tree-store.h>
#include "../dnd.h"
#include "../support.h"
#include "../cc-gray-bar.h"
diff --git a/tools/browser/schema-browser/objects-index.c b/tools/browser/schema-browser/objects-index.c
index ae3bc21..88e6786 100644
--- a/tools/browser/schema-browser/objects-index.c
+++ b/tools/browser/schema-browser/objects-index.c
@@ -25,7 +25,7 @@
#include <gtk/gtk.h>
#include <libgda/gda-tree.h>
#include "objects-index.h"
-#include <libgdaui/gdaui-tree-store.h>
+#include <libgda-ui/gdaui-tree-store.h>
#include "../dnd.h"
#include "../support.h"
#include "../cc-gray-bar.h"
diff --git a/tools/browser/schema-browser/table-columns.c b/tools/browser/schema-browser/table-columns.c
index 6dd920d..d557379 100644
--- a/tools/browser/schema-browser/table-columns.c
+++ b/tools/browser/schema-browser/table-columns.c
@@ -27,7 +27,7 @@
#include <libgda/gda-tree.h>
#include "table-info.h"
#include "table-columns.h"
-#include <libgdaui/gdaui-tree-store.h>
+#include <libgda-ui/gdaui-tree-store.h>
#include "../support.h"
#include "../cc-gray-bar.h"
#include "mgr-columns.h"
diff --git a/tools/browser/schema-browser/table-relations.c b/tools/browser/schema-browser/table-relations.c
index 1328335..6e0ec6b 100644
--- a/tools/browser/schema-browser/table-relations.c
+++ b/tools/browser/schema-browser/table-relations.c
@@ -27,7 +27,7 @@
#include <libgda/gda-tree.h>
#include "table-info.h"
#include "table-relations.h"
-#include <libgdaui/gdaui-tree-store.h>
+#include <libgda-ui/gdaui-tree-store.h>
#include "../support.h"
#include "../cc-gray-bar.h"
#include "schema-browser-perspective.h"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
