[Xfce4-commits] <midori:master> Implement WebKit2 code path of clearing page icons

[Christian Dywan]

Updating branch refs/heads/master
         to f0207c45c717f5acac5503f1be04513851908b2a (commit)
       from 2a50de7911ca3a1a98876ca0161a7435eb3ffaa7 (commit)

commit f0207c45c717f5acac5503f1be04513851908b2a
Author: Christian Dywan <christian at twotoasts.de>
Date:   Sat Apr 6 23:16:45 2013 +0200

    Implement WebKit2 code path of clearing page icons

 katze/midori-paths.vala |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/katze/midori-paths.vala b/katze/midori-paths.vala
index 382440a..24b0e0a 100644
--- a/katze/midori-paths.vala
+++ b/katze/midori-paths.vala
@@ -404,13 +404,13 @@ namespace Midori {
         public static void clear_icons () {
             assert (cache_dir != null);
             assert (user_data_dir != null);
-#if !HAVE_WEBKIT2
-#if HAVE_WEBKIT_1_8_0
+#if HAVE_WEBKIT2
+            WebKit.WebContext.get_default ().get_favicon_database ().clear ();
+#elif HAVE_WEBKIT_1_8_0
             WebKit.get_favicon_database ().clear ();
 #elif HAVE_WEBKIT_1_3_13
             WebKit.get_icon_database ().clear ();
 #endif
-#endif
             /* FIXME: Exclude search engine icons */
             remove_path (Path.build_filename (cache_dir, "icons"));
             remove_path (Path.build_filename (user_data_dir, "webkit", "icondatabase"));