[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

abarth at webkit.org abarth at webkit.org
Thu Oct 29 20:38:41 UTC 2009


The following commit has been merged in the webkit-1.1 branch:
commit c3819dbd4874f41d4fd64727eee07a4153890ce3
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Oct 4 00:36:35 2009 +0000

    2009-10-03  Adam Barth  <abarth at webkit.org>
    
            More build fixing.
    
            * webkit/webkitwebview.cpp:
            (webkit_web_view_go_back_or_forward):
            (webkit_web_view_can_go_back_or_forward):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49069 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 724fa0e..a9ef344 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,5 +1,13 @@
 2009-10-03  Adam Barth  <abarth at webkit.org>
 
+        More build fixing.
+
+        * webkit/webkitwebview.cpp:
+        (webkit_web_view_go_back_or_forward):
+        (webkit_web_view_can_go_back_or_forward):
+
+2009-10-03  Adam Barth  <abarth at webkit.org>
+
         Unreviewed build fix.
 
         * webkit/webkitwebview.cpp:
diff --git a/WebKit/gtk/webkit/webkitwebview.cpp b/WebKit/gtk/webkit/webkitwebview.cpp
index 9c95781..47d7d98 100644
--- a/WebKit/gtk/webkit/webkitwebview.cpp
+++ b/WebKit/gtk/webkit/webkitwebview.cpp
@@ -2829,7 +2829,7 @@ void webkit_web_view_go_back_or_forward(WebKitWebView* webView, gint steps)
 {
     g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
 
-    core(webView)->page()->goBackOrForward(steps);
+    core(webView)->goBackOrForward(steps);
 }
 
 /**
@@ -2878,7 +2878,7 @@ gboolean webkit_web_view_can_go_back_or_forward(WebKitWebView* webView, gint ste
 {
     g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), FALSE);
 
-    return core(webView)->goBackOrForward(steps);
+    return core(webView)->canGoBackOrForward(steps);
 }
 
 /**

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list