[Xfce4-commits] <midori:master> Fix call to webkit_web_frame_get_dom_document

[Christian Dywan]

Updating branch refs/heads/master
         to 713928329f5c5e7a66af2b1d4284a49692f8e208 (commit)
       from abb1f27404e680d6434412060fbd73caf73b8981 (commit)

commit 713928329f5c5e7a66af2b1d4284a49692f8e208
Author: Christian Dywan <christian at twotoasts.de>
Date:   Sat Nov 3 14:14:09 2012 +0100

    Fix call to webkit_web_frame_get_dom_document

 midori/midori-searchaction.c |    2 +-
 midori/midori-view.h         |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/midori/midori-searchaction.c b/midori/midori-searchaction.c
index 7d01734..6444431 100644
--- a/midori/midori-searchaction.c
+++ b/midori/midori-searchaction.c
@@ -951,7 +951,7 @@ midori_search_action_get_engine_for_form (WebKitWebView*     web_view,
     gchar** parts;
 
     #if WEBKIT_CHECK_VERSION (1, 9, 5)
-    doc = webkit_web_frame_get_dom_document (web_view);
+    doc = webkit_web_frame_get_dom_document (webkit_web_view_get_focused_frame (web_view));
     #else
     if (webkit_web_view_get_focused_frame (web_view) != webkit_web_view_get_main_frame (web_view))
         return NULL;
diff --git a/midori/midori-view.h b/midori/midori-view.h
index bf21b12..5e41d1a 100644
--- a/midori/midori-view.h
+++ b/midori/midori-view.h
@@ -232,7 +232,7 @@ midori_view_fallback_extension         (MidoriView*        view,
                                         const gchar*       extension);
 
 GList*
-midori_view_get_subresources           (MidoriView* view);
+midori_view_get_resources              (MidoriView*        view);
 
 G_END_DECLS