Show
Ignore:
Timestamp:
08/04/08 12:23:14 (5 months ago)
Author:
mbensi
Message:

merge with webkit revision 35534

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/WebKit/gtk/webkit/webkitwebview.cpp

    r427 r429  
    15211521    g_return_val_if_fail(WEBKIT_IS_WEB_HISTORY_ITEM(item), FALSE); 
    15221522 
    1523     // FIXME: This always returns TRUE 
     1523    WebKitWebBackForwardList* backForwardList = webkit_web_view_get_back_forward_list(webView); 
     1524    if (!webkit_web_back_forward_list_contains_item(backForwardList, item)) 
     1525        return FALSE; 
     1526 
    15241527    core(webView)->goToItem(core(item), FrameLoadTypeIndexedBackForward); 
    15251528    return TRUE;