+++ /dev/null
-diff -NurdB mergeant-0.65/configure.in mergeant-0.65-patched/configure.in
---- mergeant-0.65/configure.in 2006-12-22 14:57:36.000000000 -0500
-+++ mergeant-0.65-patched/configure.in 2007-02-13 05:42:58.000000000 -0500
-@@ -79,8 +79,10 @@
- ALL_LINGUAS="am ar az ca cs da de el en_CA en_GB es eu fa fi fr gl hr it ja lt ml ms nb ne nl pl pt pt_BR ru rw sk sq sr sr@Latn sv tr uk vi zh_CN zh_HK zh_TW"
- AM_GLIB_GNU_GETTEXT
-
--PKG_CHECK_MODULES(MERGEANT, libgnomedb-3.0 >= 2.99.2 \
-- libgda-3.0 >= 2.99.2 \
-+PKG_CHECK_MODULES(MERGEANT, libgnomedb-3.0 >= 2.99.5 \
-+ libgnomedb-graph-3.0 >= 2.99.5 \
-+ libgnomedb-extra-3.0 >= 2.99.5 \
-+ libgda-3.0 >= 2.99.5 \
- gconf-2.0 \
- gtk+-2.0 >= 2.6.0 \
- gdk-pixbuf-2.0 \
-diff -NurdB mergeant-0.65/src/mg-extra-formgrid.c mergeant-0.65-patched/src/mg-extra-formgrid.c
---- mergeant-0.65/src/mg-extra-formgrid.c 2006-12-21 03:40:36.000000000 -0500
-+++ mergeant-0.65-patched/src/mg-extra-formgrid.c 2007-02-13 14:09:56.000000000 -0500
-@@ -184,7 +184,7 @@
-
- formgrid->priv->info = gnome_db_data_widget_info_new (GNOME_DB_DATA_WIDGET (formgrid->priv->raw_grid),
- GNOME_DB_DATA_WIDGET_INFO_CURRENT_ROW |
-- GNOME_DB_DATA_WIDGET_INFO_ROW_MODIF_BUTTONS |
-+ GNOME_DB_DATA_WIDGET_INFO_ROW_MODIFY_BUTTONS |
- GNOME_DB_DATA_WIDGET_INFO_CHUNCK_CHANGE_BUTTONS);
- gtk_box_pack_start (GTK_BOX (hbox), formgrid->priv->info, TRUE, TRUE, 0);
- gtk_widget_show (formgrid->priv->info);
-@@ -198,7 +198,7 @@
- g_object_set (G_OBJECT (formgrid->priv->info),
- "data-widget", formgrid->priv->raw_form,
- "flags", GNOME_DB_DATA_WIDGET_INFO_CURRENT_ROW |
-- GNOME_DB_DATA_WIDGET_INFO_ROW_MODIF_BUTTONS |
-+ GNOME_DB_DATA_WIDGET_INFO_ROW_MODIFY_BUTTONS |
- GNOME_DB_DATA_WIDGET_INFO_ROW_MOVE_BUTTONS, NULL);
- gtk_button_set_image (GTK_BUTTON (button),
- gtk_image_new_from_file (MERGEANT_PIXMAPDIR "/mg-extra-form.png"));
-@@ -208,7 +208,7 @@
- g_object_set (G_OBJECT (formgrid->priv->info),
- "data-widget", formgrid->priv->raw_grid,
- "flags", GNOME_DB_DATA_WIDGET_INFO_CURRENT_ROW |
-- GNOME_DB_DATA_WIDGET_INFO_ROW_MODIF_BUTTONS |
-+ GNOME_DB_DATA_WIDGET_INFO_ROW_MODIFY_BUTTONS |
- GNOME_DB_DATA_WIDGET_INFO_CHUNCK_CHANGE_BUTTONS, NULL);
- gtk_button_set_image (GTK_BUTTON (button),
- gtk_image_new_from_file (MERGEANT_PIXMAPDIR "/mg-extra-grid.png"));
-diff -NurdB mergeant-0.65/src/query-druid.c mergeant-0.65-patched/src/query-druid.c
---- mergeant-0.65/src/query-druid.c 2006-10-27 10:02:09.000000000 -0500
-+++ mergeant-0.65-patched/src/query-druid.c 2007-02-13 14:25:53.000000000 -0500
-@@ -19,6 +19,9 @@
- */
-
- #include "query-druid.h"
-+#include <libgnomedb-extra/gnome-db-editor.h>
-+#include <libgnomedb-extra/gnome-db-selector.h>
-+#include <libgnomedb-graph/libgnomedb-graph.h>
- #include <libgnomedb/libgnomedb.h>
- #include <libgda/libgda.h>
- #include "workspace-page.h"
-diff -NurdB mergeant-0.65/src/query-editor.c mergeant-0.65-patched/src/query-editor.c
---- mergeant-0.65/src/query-editor.c 2006-12-22 05:06:35.000000000 -0500
-+++ mergeant-0.65-patched/src/query-editor.c 2007-02-13 06:08:16.000000000 -0500
-@@ -21,7 +21,8 @@
- #include "query-editor.h"
- #include "query-fields-editor.h"
- #include "query-params-editor.h"
--#include <libgnomedb/gnome-db-editor.h>
-+#include <libgnomedb-extra/gnome-db-editor.h>
-+#include <libgnomedb-graph/libgnomedb-graph.h>
-
- static void query_editor_class_init (QueryEditorClass * class);
- static void query_editor_init (QueryEditor * wid);
-@@ -488,8 +489,8 @@
- gtk_entry_set_text (GTK_ENTRY (qedit->priv->q_descr), "");
-
- /* SQL version */
-- sql = gda_renderer_render_as_sql (GDA_RENDERER (qedit->priv->query), NULL,
-- GDA_RENDERER_EXTRA_PRETTY_SQL | GDA_RENDERER_EXTRA_VAL_ATTRS, NULL);
-+ sql = gda_renderer_render_as_sql (GDA_RENDERER (qedit->priv->query), NULL, NULL,
-+ GDA_RENDERER_EXTRA_PRETTY_SQL | GDA_RENDERER_PARAMS_AS_DETAILED, NULL);
- if (sql) {
- gnome_db_editor_set_text (GNOME_DB_EDITOR (qedit->priv->sql_editor), sql, -1);
- g_free (sql);
-@@ -503,8 +504,8 @@
- sql = NULL;
-
- if (cond)
-- sql = gda_renderer_render_as_sql (GDA_RENDERER (cond), NULL,
-- GDA_RENDERER_EXTRA_PRETTY_SQL | GDA_RENDERER_EXTRA_VAL_ATTRS, NULL);
-+ sql = gda_renderer_render_as_sql (GDA_RENDERER (cond), NULL, NULL,
-+ GDA_RENDERER_EXTRA_PRETTY_SQL | GDA_RENDERER_PARAMS_AS_DETAILED, NULL);
- if (sql) {
- gnome_db_editor_set_text (GNOME_DB_EDITOR (qedit->priv->select_where), sql, -1);
- g_free (sql);
-diff -NurdB mergeant-0.65/src/query-fields-editor.c mergeant-0.65-patched/src/query-fields-editor.c
---- mergeant-0.65/src/query-fields-editor.c 2006-10-27 10:02:09.000000000 -0500
-+++ mergeant-0.65-patched/src/query-fields-editor.c 2007-02-13 16:45:43.000000000 -0500
-@@ -431,7 +431,7 @@
- g_object_get (G_OBJECT (field), "gda-type", >ype, NULL);
- dh = gda_dict_get_default_handler (gda_object_get_dict ((GdaObject *) field), gtype);
- value = gda_data_handler_get_value_from_sql (dh, new_text,
-- gda_query_field_value_get_g_type (GDA_QUERY_FIELD_VALUE (field)));
-+ gda_entity_field_get_g_type (GDA_ENTITY_FIELD (field)));
- if (value) {
- gda_query_field_value_set_value (GDA_QUERY_FIELD_VALUE (field), value);
- gda_value_free (value);
-@@ -476,7 +476,7 @@
- newcond = gda_query_condition_new_from_sql (fedit->priv->query, new_text, NULL, &error);
- if (!newcond) {
- gchar *sql;
-- sql = gda_renderer_render_as_sql (GDA_RENDERER (field), NULL, 0, NULL);
-+ sql = gda_renderer_render_as_sql (GDA_RENDERER (field), NULL, NULL, 0, NULL);
- if (sql) {
- gchar *text = g_strdup_printf ("%s %s", sql, new_text);
- g_free (sql);
-@@ -700,7 +700,7 @@
- }
-
- /* modify the model at iter */
-- sql = gda_renderer_render_as_sql (GDA_RENDERER (field), NULL, 0, NULL);
-+ sql = gda_renderer_render_as_sql (GDA_RENDERER (field), NULL, NULL, 0, NULL);
- order = gda_query_get_order_by_field (fedit->priv->query, field, &asc);
- if (order >= 0) {
- order_str = g_strdup_printf ("%d", order + 1);
-@@ -709,8 +709,8 @@
- cond = g_object_get_data (G_OBJECT (field), "qf_filter_cond");
- g_object_set_data (G_OBJECT (field), "qf_filter_cond", NULL);
- if (cond)
-- cond_sql = gda_renderer_render_as_sql (GDA_RENDERER (cond), NULL,
-- GDA_RENDERER_EXTRA_VAL_ATTRS,
-+ cond_sql = gda_renderer_render_as_sql (GDA_RENDERER (cond), NULL, NULL,
-+ GDA_RENDERER_PARAMS_AS_DETAILED,
- NULL);
- gtk_list_store_set (GTK_LIST_STORE (model), &iter,
- COLUMN_FIELD_PTR, field,
-diff -NurdB mergeant-0.65/src/query-params-editor.c mergeant-0.65-patched/src/query-params-editor.c
---- mergeant-0.65/src/query-params-editor.c 2006-11-18 10:28:55.000000000 -0500
-+++ mergeant-0.65-patched/src/query-params-editor.c 2007-02-13 16:49:37.000000000 -0500
-@@ -436,7 +436,7 @@
- GdaDataHandler *dh;
- GdaDictType *dtype;
-
-- dtype = gda_query_field_value_get_dict_type (GDA_QUERY_FIELD_VALUE (field));
-+ dtype = gda_entity_field_get_dict_type (GDA_ENTITY_FIELD (field));
- if (dtype)
- vtype = gda_dict_type_get_g_type (dtype);
- else
-@@ -444,7 +444,7 @@
-
- dh = gda_dict_get_default_handler (gda_object_get_dict (GDA_OBJECT (field)), vtype);
- value = gda_data_handler_get_value_from_sql (dh, new_text,
-- gda_query_field_value_get_g_type (GDA_QUERY_FIELD_VALUE (field)));
-+ gda_entity_field_get_g_type (GDA_ENTITY_FIELD (field)));
- if (value) {
- gda_query_field_value_set_value (GDA_QUERY_FIELD_VALUE (field), value);
- gda_value_free (value);
-@@ -494,7 +494,7 @@
- field = (GdaQueryField *) (list->data);
-
- if (GDA_IS_QUERY_FIELD_VALUE (field))
-- gda_query_field_value_set_dict_type (GDA_QUERY_FIELD_VALUE (field), dtype);
-+ gda_entity_field_set_dict_type (GDA_ENTITY_FIELD (field), dtype);
-
- list = g_slist_next (list);
- }
-@@ -656,7 +656,7 @@
-
- list = fields;
- while (list) {
-- if (GDA_IS_QUERY_FIELD_VALUE (list->data) && !gda_query_field_value_is_parameter (GDA_QUERY_FIELD_VALUE (list->data))) {
-+ if (GDA_IS_QUERY_FIELD_VALUE (list->data) && !gda_query_field_value_get_is_parameter (GDA_QUERY_FIELD_VALUE (list->data))) {
- GdaQueryFieldValue *qfield = GDA_QUERY_FIELD_VALUE (list->data);
- gchar *valstr;
- const gchar *typestr;
-@@ -685,7 +685,7 @@
- else
- valstr = g_strdup ("");
-
-- typestr = gda_dict_type_get_sqlname (gda_query_field_value_get_dict_type (qfield));
-+ typestr = gda_dict_type_get_sqlname (gda_entity_field_get_dict_type (GDA_ENTITY_FIELD (qfield)));
- gtk_list_store_set (GTK_LIST_STORE (model), &iter,
- COLUMN_PARAM_PTR, NULL,
- COLUMN_QFVALUE_PTR, qfield,
-diff -NurdB mergeant-0.65/src/workspace-window.c mergeant-0.65-patched/src/workspace-window.c
---- mergeant-0.65/src/workspace-window.c 2006-12-05 09:50:15.000000000 -0500
-+++ mergeant-0.65-patched/src/workspace-window.c 2007-02-13 06:17:25.000000000 -0500
-@@ -31,7 +31,7 @@
- #include <libgnomeui/gnome-about.h>
- #include <libgnomedb/libgnomedb.h>
- #include <libgnomedb/gnome-db-login-dialog.h>
--#include <libgnomedb/gnome-db-dbms-update-viewer.h>
-+#include <libgnomedb-extra/gnome-db-dbms-update-viewer.h>
- #include "workspace.h"
- #include "workspace-window.h"
- #include <libgda/gda-threader.h>
-diff -NurdB mergeant-0.65/src/workspace.c mergeant-0.65-patched/src/workspace.c
---- mergeant-0.65/src/workspace.c 2006-12-20 09:32:34.000000000 -0500
-+++ mergeant-0.65-patched/src/workspace.c 2007-02-13 16:51:01.000000000 -0500
-@@ -29,6 +29,7 @@
- #include <gtk/gtktable.h>
- #include <gtk/gtkvpaned.h>
- #include <libgnomedb/libgnomedb.h>
-+#include <libgnomedb-extra/gnome-db-gray-bar.h>
- #include "workspace.h"
- #include <string.h>
- #include "query-druid.h"
-diff -NurdB mergeant-0.65/src/ws-datatypes.c mergeant-0.65-patched/src/ws-datatypes.c
---- mergeant-0.65/src/ws-datatypes.c 2006-10-27 10:02:10.000000000 -0500
-+++ mergeant-0.65-patched/src/ws-datatypes.c 2007-02-13 12:25:56.000000000 -0500
-@@ -24,6 +24,7 @@
- #include <glib-object.h>
- #include <gtk/gtk.h>
- #include <libgnomedb/libgnomedb.h>
-+#include <libgnomedb-extra/gnome-db-selector.h>
- #include <glib/gi18n-lib.h>
-
- /*
-diff -NurdB mergeant-0.65/src/ws-dbrels.c mergeant-0.65-patched/src/ws-dbrels.c
---- mergeant-0.65/src/ws-dbrels.c 2006-10-27 10:02:10.000000000 -0500
-+++ mergeant-0.65-patched/src/ws-dbrels.c 2007-02-13 12:41:12.000000000 -0500
-@@ -23,8 +23,8 @@
- #include <string.h>
- #include <glib-object.h>
- #include <gtk/gtk.h>
--#include <libgnomedb/libgnomedb.h>
- #include <glib/gi18n-lib.h>
-+#include <libgnomedb-extra/gnome-db-selector.h>
-
- /*
- * Main static functions
-diff -NurdB mergeant-0.65/src/ws-dbrels.h mergeant-0.65-patched/src/ws-dbrels.h
---- mergeant-0.65/src/ws-dbrels.h 2006-10-27 10:02:10.000000000 -0500
-+++ mergeant-0.65-patched/src/ws-dbrels.h 2007-02-13 04:33:56.000000000 -0500
-@@ -24,6 +24,7 @@
-
- #include <libgda/libgda.h>
- #include <libgnomedb/libgnomedb.h>
-+#include <libgnomedb-graph/libgnomedb-graph.h>
-
-
- G_BEGIN_DECLS
-diff -NurdB mergeant-0.65/src/ws-queries.c mergeant-0.65-patched/src/ws-queries.c
---- mergeant-0.65/src/ws-queries.c 2006-10-27 10:02:10.000000000 -0500
-+++ mergeant-0.65-patched/src/ws-queries.c 2007-02-13 16:52:08.000000000 -0500
-@@ -24,6 +24,8 @@
- #include <glib-object.h>
- #include <gtk/gtk.h>
- #include <libgnomedb/libgnomedb.h>
-+#include <libgnomedb-extra/gnome-db-editor.h>
-+#include <libgnomedb-extra/gnome-db-selector.h>
- #include "query-druid.h"
- #include "query-editor.h"
- #include "query-params-editor.h"
-@@ -613,7 +615,7 @@
- while (parent_window && !GTK_IS_WINDOW (parent_window))
- parent_window = gtk_widget_get_parent (parent_window);
-
-- sql = gda_renderer_render_as_sql (GDA_RENDERER (query), context, 0, &error);
-+ sql = gda_renderer_render_as_sql (GDA_RENDERER (query), context, NULL, 0, &error);
- qtype = gda_query_get_query_type (query);
-
- switch (qtype) {
-@@ -740,7 +742,7 @@
- qei->query = gda_query_new_copy (query, NULL);
- query = qei->query;
-
-- if (gda_query_is_modif_query (query)) {
-+ if (gda_query_is_modify_query (query)) {
- /* modification query */
- context = gda_query_get_parameter_list (query);
- if (fill_context_in_dialog (ws, context) == GTK_RESPONSE_ACCEPT)
-@@ -843,7 +845,7 @@
- gchar *msg;
- const gchar *sql;
-
-- sql = gda_renderer_render_as_sql (GDA_RENDERER (query), context,
-+ sql = gda_renderer_render_as_sql (GDA_RENDERER (query), context, NULL,
- GDA_RENDERER_EXTRA_PRETTY_SQL, NULL);
- query_exec_instance_free (qei);
- msg = g_strdup_printf (_("<b><big>Execute the following query ?</big></b>\n"
-@@ -957,7 +959,7 @@
- if (query) {
- gchar *sql;
- GError *error = NULL;
-- sql = gda_renderer_render_as_sql (GDA_RENDERER (query), NULL,
-+ sql = gda_renderer_render_as_sql (GDA_RENDERER (query), NULL, NULL,
- GDA_RENDERER_EXTRA_PRETTY_SQL, &error);
- if (sql) {
- gnome_db_editor_set_text (GNOME_DB_EDITOR (ws->priv->sql_editor), sql, -1);
-diff -NurdB mergeant-0.65/src/ws-tables.c mergeant-0.65-patched/src/ws-tables.c
---- mergeant-0.65/src/ws-tables.c 2006-12-20 04:53:26.000000000 -0500
-+++ mergeant-0.65-patched/src/ws-tables.c 2007-02-13 13:30:25.000000000 -0500
-@@ -24,6 +24,7 @@
- #include <glib-object.h>
- #include <gtk/gtk.h>
- #include <libgnomedb/libgnomedb.h>
-+#include <libgnomedb-extra/gnome-db-selector.h>
- #include <libgda/gda-enums.h>
- #include <glib/gi18n.h>
- #include "utils.h"
projects / gentoo.git / commitdiff