Create configuration directory

[projects/chimara/chimara.git] / player / main.c

diff --git a/player/main.c b/player/main.c
index 01de3982e1b8199815c8483dd43f776e1612f25d..8d797c37ff245879f7ec3e73e5cb64bab28e1b75 100644 (file)
--- a/player/main.c
+++ b/player/main.c
@@ -38,6 +38,7 @@
 
 #include <glib.h>
 #include <glib/gi18n.h>
+#include <glib/gstdio.h>
 #include <gtk/gtk.h>
 
 /* Use a custom GSettings backend for our preferences file */
@@ -60,7 +61,8 @@ GtkBuilder *builder = NULL;
 GtkWidget *aboutwindow = NULL;
 GtkWidget *prefswindow = NULL;
 GtkWidget *toolbar = NULL;
-GSettings *settings = NULL;
+GSettings *prefs_settings = NULL;
+GSettings *state_settings = NULL;
 
 GObject *
 load_object(const gchar *name)
@@ -230,10 +232,24 @@ main(int argc, char *argv[])
        gdk_threads_init();
        gtk_init(&argc, &argv);
 
-       /* Initialize settings file */
-       gchar *keyfile = g_build_filename(g_get_home_dir(), ".chimara", NULL);
-       GSettingsBackend *backend = g_keyfile_settings_backend_new(keyfile, "/", "player");
-       settings = g_settings_new_with_backend("org.chimara-if.chimara-player", backend);
+       /* Create configuration dir ~/.chimara */
+       gchar *configdir = g_build_filename(g_get_home_dir(), ".chimara", NULL);
+       if(!g_file_test(configdir, G_FILE_TEST_IS_DIR)
+               && g_mkdir(configdir, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) != 0)
+               g_error(_("Cannot create configuration directory ~/.chimara"));
+       g_free(configdir);
+
+       /* Initialize settings file; it can be overridden by a "chimara-config" file
+        in the current directory */
+       gchar *keyfile;
+       if(g_file_test("chimara-config", G_FILE_TEST_IS_REGULAR))
+               keyfile = g_strdup("chimara-config");
+       else
+               keyfile = g_build_filename(g_get_home_dir(), ".chimara", "config", NULL);
+       GSettingsBackend *backend = g_keyfile_settings_backend_new(keyfile, "/org/chimara-if/player/", NULL);
+       prefs_settings = g_settings_new_with_backend("org.chimara-if.player.preferences", backend);
+       state_settings = g_settings_new_with_backend("org.chimara-if.player.state", backend);
+       g_free(keyfile);
 
        create_window();
        gtk_widget_show_all(window);