Use of libzakconfi.

diff --git a/configure.ac b/configure.ac
index a1398d4d85756c4c0ebbe2660a40f565ae005c5a..5cd543dd76c078292af027fdaa2143c1bab4f20b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,8 @@ AC_PROG_CXX
 
 # Checks for libraries.
 PKG_CHECK_MODULES(ZAK_AUTHE_GUI, [gtk+-3.0 >= 3.0.0
-                           libzakauthe >= 0.5.99])
+                                  libzakauthe >= 0.5.99
+                                  libzakconfi >= 0.10.0])
 
 AC_SUBST(ZAK_AUTHE_GUI_CFLAGS)
 AC_SUBST(ZAK_AUTHE_GUI_LIBS)

diff --git a/src/main.c b/src/main.c
index e9a8e11d159ec6c6318f816faa6e65365735ab83..e51c9c38173f77c6e9465fc8ffc081141f4527de 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -23,6 +23,7 @@
 #include <gtk/gtk.h>
 
 #include <libzakauthe/libzakauthe.h>
+#include <libzakconfi/libzakconfi.h>
 
 static GtkBuilder *gtkbuilder;
 static gchar *guidir;
@@ -75,6 +76,8 @@ main (int argc, char **argv)
 {
        GError *error;
 
+       ZakConfi *confi;
+
        ZakAuthe *aute;
        gchar **aute_params;
        gsize n_aute_params;
@@ -89,34 +92,18 @@ main (int argc, char **argv)
        /* leggo la configurazione dal file */
        if (argc == 1)
                {
-                       g_error ("You need to provide the configuration file on command line.");
+                       g_error ("You need to provide the libzakconfi connection string on command line.");
                }
 
-       error = NULL;
-       config = g_key_file_new ();
-       if (!g_key_file_load_from_file (config, argv[1], G_KEY_FILE_NONE, &error))
+       confi = zak_confi_new (argv[1]);
+       if (confi == NULL)
                {
-                       g_error ("Unable to load the provided configuration file «%s»: %s.",
-                                        argv[1], error != NULL && error->message != NULL ? error->message : "no details");
+                       g_error ("Unable to load the provided configuration file «%s».");
                }
 
        /* parameters for authetication */
-       error = NULL;
-       aute_params = g_key_file_get_keys (config, "ZAKAUTHE", &n_aute_params, &error);
-       if (aute_params == NULL)
-               {
-                       g_error ("Unable to read configuration for authentication system: %s.",
-                                        error != NULL && error->message != NULL ? error->message : "no details");
-               }
-
-       sl_aute_params = NULL;
-       for (i = 0; i < n_aute_params; i++)
-               {
-                       error = NULL;
-                       sl_aute_params = g_slist_append (sl_aute_params, g_key_file_get_string (config, "ZAKAUTHE", aute_params[i], &error));
-               }
-
-       g_strfreev (aute_params);
+       sl_aute_params = g_slist_append (sl_aute_params, "{libzakconfi}");
+       sl_aute_params = g_slist_append (sl_aute_params, confi);
 
        /* authentication */
        aute = zak_authe_new ();