From 15cbd0d5560719bcdb4b33c21262eaafff460596 Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Sat, 14 Aug 2010 12:44:10 +0200 Subject: [PATCH] Bugfixes. --- src/datasource.c | 13 ++++++++++++- src/datasources.c | 5 ++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/datasource.c b/src/datasource.c index bccdd0b..3599d0f 100644 --- a/src/datasource.c +++ b/src/datasource.c @@ -201,7 +201,18 @@ datasource_load (Datasource *datasource) &info->provider, &username, &password); - g_message ("PROVIDER %s CNC %s USER %s PWD %s", info->provider, info->cnc_string, username, password); + info->auth_string = g_strdup (""); + if (username != NULL && g_strcmp0 (g_strstrip (username), "") != 0) + { + info->auth_string = g_strdup_printf ("USERNAME=%s", username); + } + if (password != NULL && g_strcmp0 (g_strstrip (password), "") != 0) + { + info->auth_string = g_strconcat (info->auth_string, + (g_strcmp0 (info->auth_string, "") != 0 ? ";" : ""), + g_strdup_printf ("PASSWORD=%s", password), + NULL); + } gdaui_login_set_connection_information (GDAUI_LOGIN (priv->wlogin), info); } else diff --git a/src/datasources.c b/src/datasources.c index 7e49d33..00b40a0 100644 --- a/src/datasources.c +++ b/src/datasources.c @@ -167,7 +167,10 @@ datasources_load (Datasources *datasources) gtk_tree_store_clear (priv->tstore_datasources); - sql = g_strdup_printf ("SELECT id, name, cnc_string FROM datasources WHERE status <> 'D'"); + sql = g_strdup_printf ("SELECT id, name, cnc_string" + " FROM datasources" + " WHERE status <> 'D'" + " ORDER BY name, cnc_string"); stmt = gda_sql_parser_parse_string (priv->commons->gdaparser, sql, NULL, NULL); dm = gda_connection_statement_execute_select (priv->commons->gdacon, stmt, NULL, &error); g_object_unref (stmt); -- 2.49.0