Updating branch refs/heads/master to cf1040dbcacee62a6099b33f5e54c9dc3f1fdd77 (commit) from 69355aecfca64ae3ac4bf198ca737b4ae0812196 (commit)
commit cf1040dbcacee62a6099b33f5e54c9dc3f1fdd77 Author: Christian Dywan <christ...@twotoasts.de> Date: Sat Apr 6 21:58:39 2013 +0200 Implement clearing HTTP cache with WebKit2 HAVE_WEBKIT2_A is a placeholder for new API, yet to be tied to a version. katze/midori-paths.vala | 2 +- midori/midori-privatedata.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/katze/midori-paths.vala b/katze/midori-paths.vala index b894b19..382440a 100644 --- a/katze/midori-paths.vala +++ b/katze/midori-paths.vala @@ -131,7 +131,7 @@ namespace Midori { cache_dir = Path.build_path (Path.DIR_SEPARATOR_S, Environment.get_user_cache_dir (), PACKAGE_NAME); user_data_dir = Environment.get_user_data_dir (); -#if 0 // HAVE_WEBKIT2 +#if HAVE_WEBKIT2_A WebKit.WebContext.get_default ().set_disk_cache_directory ( Path.build_path (Path.DIR_SEPARATOR_S, cache_dir, "web")); #endif diff --git a/midori/midori-privatedata.c b/midori/midori-privatedata.c index 35aca15..89cd37d 100644 --- a/midori/midori-privatedata.c +++ b/midori/midori-privatedata.c @@ -303,7 +303,9 @@ midori_clear_saved_logins_cb (void) static void midori_clear_web_cache_cb (void) { -#ifndef HAVE_WEBKIT2 +#ifdef HAVE_WEBKIT2 + webkit_web_context_clear_cache (webkit_web_context_get_default ()); +#else SoupSession* session = webkit_get_default_session (); SoupSessionFeature* feature = soup_session_get_feature (session, SOUP_TYPE_CACHE); gchar* cache = g_build_filename (midori_paths_get_cache_dir (), "web", NULL); _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits