Fix broken cooperative instances

[chorizo.git] / src / browser.c

diff --git a/src/browser.c b/src/browser.c
index 4542eb7c3a9f2e1290b73924bc2da564154b0584..c492bbc05ca07878b9ecce8b5347dfaafcb9b688 100644 (file)
--- a/src/browser.c
+++ b/src/browser.c
@@ -256,7 +256,7 @@ client_new(const gchar *uri, WebKitWebView *related_wv, gboolean show,
     g_signal_connect(G_OBJECT(evbox), "scroll-event", G_CALLBACK(key_tablabel),
                      c);
 
-    /* For easy access, store a reference to our label. */
+    // For easy access, store a reference to our label.
     g_object_set_data(G_OBJECT(evbox), "chorizo-tab-label", c->tablabel);
 
     /* This only shows the event box and the label inside, nothing else.
@@ -310,8 +310,8 @@ cooperation_setup(void) {
         fprintf(stderr, __NAME__ ": Can't open FIFO at all.\n");
     } else {
         if (write(cooperative_pipe_fp, "", 0) == -1) {
-            /* Could not do an empty write to the FIFO which means
-      there's no one listening. */
+            /* Could not do an empty write to the FIFO which means there's no
+             * one listening. */
             close(cooperative_pipe_fp);
             towatch = g_io_channel_new_file(fifopath, "r+", NULL);
             g_io_add_watch(towatch, G_IO_IN, (GIOFunc)remote_msg, NULL);
@@ -474,7 +474,7 @@ decide_policy(WebKitWebView *web_view, WebKitPolicyDecision *decision,
             webkit_policy_decision_use(decision);
         break;
     default:
-        /* Use whatever default there is. */
+        // Use whatever default there is.
         return FALSE;
     }
     return TRUE;
@@ -506,7 +506,7 @@ get_config(void) {
     cfg.accepted_language[0] = NULL;
     cfg.accepted_language[1] = NULL;
     cfg.cooperative_alone = TRUE;
-    cfg.cooperative_alone = TRUE;
+    cfg.cooperative_instances = TRUE;
     cfg.fifo_suffix = "main";
 
     const char *e = g_getenv(__NAME_UPPERCASE__ "_FIFO_SUFFIX");
@@ -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;