Support namespace in the config interface.

diff --git a/backend/files/giochannel.c b/backend/files/giochannel.c
index 94f8e77..669165f 100644 (file)
--- a/backend/files/giochannel.c
+++ b/backend/files/giochannel.c
@@ -22,7 +22,7 @@
 
 gchar *giochannel_iri_to_filename (AtomCtx *ctx, IRI *iri)
 {
-  gchar *root = atom_config_get_str (ctx, "root");
+  gchar *root = atom_config_get_str (ctx, "giochannel", "root");
   gchar *path = iri_get_path (iri);
   gchar *filename = g_build_filename (root, path, NULL);
   g_free (root);

diff --git a/config/gkeyfile.c b/config/gkeyfile.c
index 9023d83..33e54e7 100644 (file)
--- a/config/gkeyfile.c
+++ b/config/gkeyfile.c
@@ -21,13 +21,13 @@
 #include <glib.h>
 
 gchar *
-gkeyfile_atom_config_get_str (AtomCtx *ctx, gchar * key)
+gkeyfile_atom_config_get_str (AtomCtx *ctx, gchar *group, gchar * key)
 {
   GKeyFile *keyfile;
   gchar *value;
   GError *error = NULL;
   keyfile = atom_config_data (ctx);
-  value = g_key_file_get_string (keyfile, "", key, &error);
+  value = g_key_file_get_string (keyfile, group, key, &error);
   if (value == NULL)
     {
       atom_error_set (ctx, error);

diff --git a/include/atompub/config.h b/include/atompub/config.h
index 5dca307..d5f3fad 100644 (file)
--- a/include/atompub/config.h
+++ b/include/atompub/config.h
@@ -23,6 +23,6 @@
 #include <atompub/ctx.h>
 
 void atom_config_init (AtomCtx *);
-char *atom_config_get_str (AtomCtx *, char *);
+char *atom_config_get_str (AtomCtx *, char *, char *);
 
 #endif

diff --git a/src/config.c b/src/config.c
index 523e5b9..833ae18 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -20,7 +20,7 @@
 #include <atompub/atom.h>
 
 extern void gkeyfile_atom_config_init (AtomCtx *);
-extern char *gkeyfile_atom_config_get_str (AtomCtx *, char *);
+extern char *gkeyfile_atom_config_get_str (AtomCtx *, char *, char *);
 
 void
 atom_config_init (AtomCtx *ctx)
@@ -29,7 +29,7 @@ atom_config_init (AtomCtx *ctx)
 }
 
 char *
-atom_config_get_str (AtomCtx *ctx, char *key)
+atom_config_get_str (AtomCtx *ctx, char *namespace, char *key)
 {
-  return gkeyfile_atom_config_get_str (ctx, key);
+  return gkeyfile_atom_config_get_str (ctx, namespace, key);
 }