Fix cookie database path

diff --git a/Makefile b/Makefile
index abc30a3deccca6e8fe372d64fd91d7dd65d1776f..8528f6a00263c6d3117dbfe2506e30b7070ba484 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -43,11 +43,11 @@ install: all
                $(datadir)/chorizo/user-scripts \
                $(datadir)/applications
 
-       cp chorizo $(bindir)/chorizo
+       cp chorizo $(bindir)/
        cp man/*.1 $(mandir)/man1/
        cp man/*.5 $(mandir)/man5/
-       cp chorizo.ini $(confdir)/chorizo.ini
-       cp chorizo.desktop $(datadir)/applications/chorizo.ini
+       cp chorizo.ini $(confdir)/
+       cp chorizo.desktop $(datadir)/applications/
        cp -r extensions/*.so $(libdir)/chorizo/web_extensions/
        cp -r user-scripts/* $(datadir)/chorizo/user-scripts/
 

diff --git a/man/chorizo.1.scd b/man/chorizo.1.scd
index 87ef0f9e19fd8f91d134cc79e1e697960cffaaff..45048ba74b8c60077f4ea3ed9e3e5c951c7c205c 100644 (file)
--- a/man/chorizo.1.scd
+++ b/man/chorizo.1.scd
@@ -48,6 +48,10 @@ XDG variables will be used to construct these paths.
 *~/.local/share/chorizo/certs*
        Directory where trusted certificates are stored. See *chorizo-usage*(1).
 
+*~/.local/share/chorizo/cookies.db*
+       Database where cookies are stored. It is kept in the same format as Firefox,
+       so the file can easily be copied over.
+
 ~/.local/share/chorizo/user-scripts
        Directory to store user-supplied JavaScript snippets. See *chorizo-usage*(1).
 

diff --git a/src/browser.c b/src/browser.c
index 4542eb7c3a9f2e1290b73924bc2da564154b0584..669ba60f295b1c4f66761fee4187eaf301be0664 100644 (file)
--- a/src/browser.c
+++ b/src/browser.c
@@ -709,7 +709,7 @@ init_default_web_context(void) {
     if (!cfg.private) {
         webkit_web_context_set_favicon_database_directory(wc, NULL);
 
-        gchar *fname = g_build_filename("/", g_get_user_cache_dir(), __NAME__,
+        gchar *fname = g_build_filename("/", g_get_user_data_dir(), __NAME__,
                                         "cookies.db", NULL);
         WebKitCookiePersistentStorage type =
             WEBKIT_COOKIE_PERSISTENT_STORAGE_SQLITE;