[Xfce4-commits] <midori:master> Stub out _midori_web_view_load_icon for WebKit2

Christian Dywan noreply at xfce.org
Tue Mar 26 08:18:03 CET 2013


Updating branch refs/heads/master
         to 0979301a577b2181c0866ad0c9960437b75dbf83 (commit)
       from 7dcbee43f9cb428bccabbee6b256c2482fdca508 (commit)

commit 0979301a577b2181c0866ad0c9960437b75dbf83
Author: Christian Dywan <christian at twotoasts.de>
Date:   Sun Mar 24 14:10:54 2013 +0100

    Stub out _midori_web_view_load_icon for WebKit2

 midori/midori-view.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/midori/midori-view.c b/midori/midori-view.c
index eb20918..3f63a5a 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -605,7 +605,9 @@ _midori_web_view_load_icon (MidoriView* view)
     GtkSettings* settings = gtk_widget_get_settings (view->web_view);
     gtk_icon_size_lookup_for_settings (settings, GTK_ICON_SIZE_MENU, &icon_width, &icon_height);
     GdkPixbuf* pixbuf = NULL;
-    #if WEBKIT_CHECK_VERSION (1, 8, 0)
+    #ifdef HAVE_WEBKIT2
+    /* FIXME */
+    #elif WEBKIT_CHECK_VERSION (1, 8, 0)
     if ((pixbuf = webkit_web_view_try_get_favicon_pixbuf (
         WEBKIT_WEB_VIEW (view->web_view), icon_width, icon_height)))
         midori_view_apply_icon (view, pixbuf, view->icon_uri);


More information about the Xfce4-commits mailing list