Midori Web Browser

Merge lp:~kalikiana/midori/wk2diskcache into lp:midori

  1. wk2diskcache
  2. Merge into trunk
Proposed by Cris Dywan
Status: Merged
Approved by: Cris Dywan
Approved revision: 6307
Merged at revision: 6315
Proposed branch: lp:~kalikiana/midori/wk2diskcache
Merge into: lp:midori
Diff against target: 16 lines (+1/-3)
1 file modified
katze/midori-paths.vala (+1/-3)
To merge this branch: bzr merge lp:~kalikiana/midori/wk2diskcache
Reviewer Review Type Date Requested Status
gue5t gue5t Approve
Review via email: mp+178358@code.launchpad.net

Commit message

Enable set_disk_cache_directory with WebKit2

HAVE_WEBKIT_A was a placeholder for another WebKit2 version check that is in hindsight not necessary.

To post a comment you must log in.
Revision history for this message
gue5t gue5t (gue5t) wrote :

I had no idea what HAVE_WEBKIT2_A was, but looking at revision 6032 where it was introduced to ifdef-guard wk2 API not yet tied to a particular release makes this an easy r+. Maybe we could mention r6032 in the commit here or such.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'katze/midori-paths.vala'
2--- katze/midori-paths.vala 2013-07-16 14:20:37 +0000
3+++ katze/midori-paths.vala 2013-08-02 18:37:37 +0000
4@@ -140,11 +140,9 @@
5 cache_dir = Path.build_path (Path.DIR_SEPARATOR_S,
6 Environment.get_user_cache_dir (), PACKAGE_NAME);
7 user_data_dir = Environment.get_user_data_dir ();
8-#if HAVE_WEBKIT2_A
9+#if HAVE_WEBKIT2
10 WebKit.WebContext.get_default ().set_disk_cache_directory (
11 Path.build_path (Path.DIR_SEPARATOR_S, cache_dir, "web"));
12-#endif
13-#if HAVE_WEBKIT2
14 var cookie_manager = WebKit.WebContext.get_default ().get_cookie_manager ();
15 cookie_manager.set_persistent_storage (Path.build_filename (config, "cookies.db"),
16 WebKit.CookiePersistentStorage.SQLITE);

Subscribers

People subscribed via source and target branches

to all changes: