Bugfixes.

diff --git a/src/datasource.c b/src/datasource.c
index bccdd0b204fceaa42a7a6c3b7255e878157742d2..3599d0f9bebb52381bab6c852607e388e3bf0f10 100644 (file)
--- 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 7e49d3348f02b4aeb15b0bf1b1ea4ce5b196ce36..00b40a0ac30993b796438e5dbf167d04f7df21be 100644 (file)
--- 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);