[epiphany/wip/tingping/profile-migration: 53/58] Consistently use ephy_cache_dir() everywhere



commit 7c3762325f9166a9ce6f7914ed206061015ce88a
Author: Patrick Griffis <pgriffis igalia com>
Date:   Wed Dec 19 12:33:12 2018 -0500

    Consistently use ephy_cache_dir() everywhere

 embed/ephy-embed-shell.c    | 5 +----
 lib/ephy-snapshot-service.c | 3 +--
 2 files changed, 2 insertions(+), 6 deletions(-)
---
diff --git a/embed/ephy-embed-shell.c b/embed/ephy-embed-shell.c
index 41cd1c2dd..66e790ec7 100644
--- a/embed/ephy-embed-shell.c
+++ b/embed/ephy-embed-shell.c
@@ -1256,10 +1256,7 @@ ephy_embed_shell_startup (GApplication *application)
    */
   if (priv->mode != EPHY_EMBED_SHELL_MODE_AUTOMATION) {
     /* Favicon Database */
-    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);
+    favicon_db_path = g_build_filename (ephy_cache_dir (), "icondatabase", NULL);
     webkit_web_context_set_favicon_database_directory (priv->web_context, favicon_db_path);
     g_free (favicon_db_path);
 
diff --git a/lib/ephy-snapshot-service.c b/lib/ephy-snapshot-service.c
index 06163c4fe..824070869 100644
--- a/lib/ephy-snapshot-service.c
+++ b/lib/ephy-snapshot-service.c
@@ -122,8 +122,7 @@ validate_thumbnail_path (const char *path,
 static char *
 thumbnail_directory (void)
 {
-  return g_build_filename (g_get_user_cache_dir (),
-                           "epiphany",
+  return g_build_filename (ephy_cache_dir (),
                            "thumbnails",
                            NULL);
 }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]