[epiphany] embed-shell: Change icon database location again

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 744608ea94f115f4e8a8d0117d14f3b0a3c05ccc
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Tue Aug 8 10:42:26 2017 -0500

    embed-shell: Change icon database location again

 embed/ephy-embed-shell.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/embed/ephy-embed-shell.c b/embed/ephy-embed-shell.c
index ac09eea..d83cfdf 100644
--- a/embed/ephy-embed-shell.c
+++ b/embed/ephy-embed-shell.c
@@ -915,7 +915,7 @@ ephy_embed_shell_startup (GApplication *application)
 {
   EphyEmbedShell *shell = EPHY_EMBED_SHELL (application);
   EphyEmbedShellPrivate *priv = ephy_embed_shell_get_instance_private (shell);
-  const char *favicon_db_path;
+  char *favicon_db_path;
   WebKitCookieManager *cookie_manager;
   char *filename;
   char *cookie_policy;
@@ -980,8 +980,12 @@ ephy_embed_shell_startup (GApplication *application)
                     shell);
 
   /* Favicon Database */
-  favicon_db_path = (priv->mode == EPHY_EMBED_SHELL_MODE_PRIVATE ? ephy_dot_dir () : NULL);
+  if (priv->mode == EPHY_EMBED_SHELL_MODE_PRIVATE)
+    favicon_db_path = g_build_filename (ephy_dot_dir (), "icondatabase", NULL);
+  else
+    favicon_db_path = g_build_filename (g_get_user_cache_dir (), "epiphany", "icondatabase", NULL);
   webkit_web_context_set_favicon_database_directory (priv->web_context, favicon_db_path);
+  g_free (favicon_db_path);
 
   /* Do not ignore TLS errors. */
   webkit_web_context_set_tls_errors_policy (priv->web_context, WEBKIT_TLS_ERRORS_POLICY_FAIL);