[libgda] Misc. corrections
- From: Vivien Malerba <vivien src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgda] Misc. corrections
- Date: Sun, 23 Aug 2015 12:44:23 +0000 (UTC)
commit cdc0566b110b0cd58367d5a0b6154c3346d9973b
Author: Vivien Malerba <malerba gnome-db org>
Date: Sun Aug 23 14:34:20 2015 +0200
Misc. corrections
libgda/gda-connection-internal.h | 2 +-
libgda/gda-meta-struct.c | 3 ---
libgda/gda-server-provider.c | 2 +-
tools/common/t-connection.c | 2 +-
4 files changed, 3 insertions(+), 6 deletions(-)
---
diff --git a/libgda/gda-connection-internal.h b/libgda/gda-connection-internal.h
index e440859..a1763e2 100644
--- a/libgda/gda-connection-internal.h
+++ b/libgda/gda-connection-internal.h
@@ -34,7 +34,7 @@ G_BEGIN_DECLS
*/
#ifdef GDA_DEBUG
#define ASSERT_TABLE_NAME(x,y) g_assert (!strcmp ((x), (y)))
-#define WARN_META_UPDATE_FAILURE(x,method) if (!(x)) g_print ("%s (meta method => %s) ERROR: %s\n",
__FUNCTION__, (method), error && *error && (*error)->message ? (*error)->message : "???")
+#define WARN_META_UPDATE_FAILURE(x,method) if (!(x)) g_print ("%s:%d %s (meta method => %s) ERROR: %s\n",
__FILE__, __LINE__, __FUNCTION__, (method), error && *error && (*error)->message ? (*error)->message : "???")
#else
#define ASSERT_TABLE_NAME(x,y)
#define WARN_META_UPDATE_FAILURE(x,method)
diff --git a/libgda/gda-meta-struct.c b/libgda/gda-meta-struct.c
index c0f8df8..df3bd07 100644
--- a/libgda/gda-meta-struct.c
+++ b/libgda/gda-meta-struct.c
@@ -1045,9 +1045,6 @@ _meta_struct_complement (GdaMetaStruct *mstruct, GdaMetaDbObjectType type,
if (!strcmp (tmp, GDA_EXTRA_AUTO_INCREMENT))
gda_attributes_manager_set (att_mgr, tcol,
GDA_ATTRIBUTE_AUTO_INCREMENT,
true_value);
- else
- g_message ("Unknown EXTRA attribute '%s', please report this
bug to "
- "http://bugzilla.gnome.org/ for the \"libgda\"
product.", tmp);
}
gda_value_free (true_value);
g_strfreev (array);
diff --git a/libgda/gda-server-provider.c b/libgda/gda-server-provider.c
index 2a23803..28905e6 100644
--- a/libgda/gda-server-provider.c
+++ b/libgda/gda-server-provider.c
@@ -2957,7 +2957,7 @@ _gda_server_provider_meta_0arg (GdaServerProvider *provider, GdaConnection *cnc,
gda_connection_increase_usage (cnc); /* USAGE ++ */
gpointer retval;
gda_worker_do_job (worker, context, 0, &retval, NULL,
- (GdaWorkerFunc) worker_meta, (gpointer) &data, NULL, NULL, NULL);
+ (GdaWorkerFunc) worker_meta, (gpointer) &data, NULL, NULL, error);
if (context)
g_main_context_unref (context);
diff --git a/tools/common/t-connection.c b/tools/common/t-connection.c
index 0dbe349..ac6ac24 100644
--- a/tools/common/t-connection.c
+++ b/tools/common/t-connection.c
@@ -434,7 +434,7 @@ t_connection_set_property (GObject *object,
if (! have_meta_store_ready (tcnc, &lerror)) {
gchar *tmp;
tmp = g_strdup_printf (_("Error while fetching meta data from the connection:
%s"),
- lerror->message ? lerror->message : _("No detail"));
+ lerror && lerror->message ? lerror->message : _("No
detail"));
g_clear_error (&lerror);
g_signal_emit (tcnc, t_connection_signals [NOTICE], 0, tmp);
g_free (tmp);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]