Changeset 28273 in webkit


Ignore:
Timestamp:
Nov 30, 2007 8:24:09 PM (16 years ago)
Author:
alp@webkit.org
Message:

2007-11-30 Alp Toker <alp@atoker.com>

Reviewed by Adam Roben.

http://bugs.webkit.org/show_bug.cgi?id=15691
[GTK] Public API does not follow GTK+ conventions

Refactor the WebKit/GTK+ public API. Changes:

WebKitPage -> WebKitWebView
WebKitFrame -> WebKitWebFrame

Public API source and header names have been updated to mirror the API
changes.

The API is now kept in WebKit/gtk/WebView to match other ports in the
same class such as Mac and Win.

API/ABI-breaking change.

Location:
trunk
Files:
16 added
1 deleted
13 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r28107 r28273  
     12007-11-30  Alp Toker  <alp@atoker.com>
     2
     3        Reviewed by Adam Roben.
     4
     5        http://bugs.webkit.org/show_bug.cgi?id=15691
     6        [GTK] Public API does not follow GTK+ conventions
     7
     8        Refactor the WebKit/GTK+ public API. Changes:
     9          WebKitPage -> WebKitWebView
     10          WebKitFrame -> WebKitWebFrame
     11
     12        Public API source and header names have been updated to mirror the API
     13        changes.
     14
     15        The API is now kept in WebKit/gtk/WebView to match other ports in the
     16        same class such as Mac and Win.
     17
     18        * WebKit.pri:
     19
    1202007-11-26  Rodney Dawes  <dobey@wayofthemonkey.com>
    221
  • trunk/WebCore/ChangeLog

    r28264 r28273  
     12007-11-30  Alp Toker  <alp@atoker.com>
     2
     3        Reviewed by Adam Roben.
     4
     5        http://bugs.webkit.org/show_bug.cgi?id=15691
     6        [GTK] Public API does not follow GTK+ conventions
     7
     8        Refactor the WebKit/GTK+ public API. Changes:
     9          WebKitPage -> WebKitWebView
     10          WebKitFrame -> WebKitWebFrame
     11
     12        Public API source and header names have been updated to mirror the API
     13        changes.
     14
     15        The API is now kept in WebKit/gtk/WebView to match other ports in the
     16        same class such as Mac and Win.
     17
     18        * WebCore.pro:
     19
    1202007-11-30   Anders Carlsson  <andersca@apple.com>
    221
  • trunk/WebCore/WebCore.pro

    r28259 r28273  
    147147    $$PWD/page/gtk \
    148148    $$PWD/../WebKit/gtk/WebCoreSupport \
    149     $$PWD/../WebKit/gtk/Api
     149    $$PWD/../WebKit/gtk/WebView
    150150
    151151    DEPENDPATH += \
     
    165165    page/gtk \
    166166    ../WebKit/gtk/WebCoreSupport \
    167     ../WebKit/gtk/Api
     167    ../WebKit/gtk/WebView
    168168}
    169169
     
    940940    HEADERS += \
    941941        ../WebCore/platform/gtk/ClipboardGtk.h \
    942         ../WebKit/gtk/Api/webkitgtkdefines.h \
    943         ../WebKit/gtk/Api/webkitgtkframe.h \
    944         ../WebKit/gtk/Api/webkitgtkglobal.h \
    945         ../WebKit/gtk/Api/webkitgtknetworkrequest.h \
    946         ../WebKit/gtk/Api/webkitgtkpage.h \
    947         ../WebKit/gtk/Api/webkitgtkprivate.h \
    948         ../WebKit/gtk/Api/webkitgtksettings.h \
     942        ../WebKit/gtk/WebView/webkitdefines.h \
     943        ../WebKit/gtk/WebView/webkitglobal.h \
     944        ../WebKit/gtk/WebView/webkitnetworkrequest.h \
     945        ../WebKit/gtk/WebView/webkitprivate.h \
     946        ../WebKit/gtk/WebView/webkitsettings.h \
     947        ../WebKit/gtk/WebView/webkitwebframe.h \
     948        ../WebKit/gtk/WebView/webkitwebview.h \
    949949        ../WebKit/gtk/WebCoreSupport/ChromeClientGtk.h \
    950950        ../WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.h \
     
    10171017        platform/image-decoders/ico/ICOImageDecoder.cpp \
    10181018        platform/image-decoders/xbm/XBMImageDecoder.cpp \
    1019         ../WebKit/gtk/Api/webkitgtkframe.cpp \
    1020         ../WebKit/gtk/Api/webkitgtkglobal.cpp \
    1021         ../WebKit/gtk/Api/webkitgtknetworkrequest.cpp \
    1022         ../WebKit/gtk/Api/webkitgtkpage.cpp \
    1023         ../WebKit/gtk/Api/webkitgtkprivate.cpp \
    1024         ../WebKit/gtk/Api/webkitgtksettings.cpp \
     1019        ../WebKit/gtk/WebView/webkitglobal.cpp \
     1020        ../WebKit/gtk/WebView/webkitnetworkrequest.cpp \
     1021        ../WebKit/gtk/WebView/webkitprivate.cpp \
     1022        ../WebKit/gtk/WebView/webkitsettings.cpp \
     1023        ../WebKit/gtk/WebView/webkitwebframe.cpp \
     1024        ../WebKit/gtk/WebView/webkitwebview.cpp \
    10251025        ../WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp \
    10261026        ../WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp \
     
    16821682    INSTALLS += target
    16831683
    1684     include($$PWD/../WebKit/gtk/Api/headers.pri)
     1684    include($$PWD/../WebKit/gtk/WebView/headers.pri)
    16851685    headers.files = $$WEBKIT_API_HEADERS
    16861686    headers.path = $$WEBKIT_INC_DIR
     
    17021702    }
    17031703
    1704     GENMARSHALS = ../WebKit/gtk/Api/webkitgtk-marshal.list
     1704    GENMARSHALS = ../WebKit/gtk/WebView/webkit-marshal.list
    17051705    GENMARSHALS_PREFIX = webkit_marshal
    17061706
  • trunk/WebKit.pri

    r28107 r28273  
    1818    QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR
    1919    LIBS += -lWebKitGtk
    20     DEPENDPATH += $$PWD/WebKit/gtk/Api $$PWD/WebKit/gtk/WebCoreSupport
     20    DEPENDPATH += $$PWD/WebKit/gtk/WebView $$PWD/WebKit/gtk/WebCoreSupport
    2121}
    2222
     
    4545    # This set of warnings is borrowed from the Mac build
    4646    QMAKE_CXXFLAGS += -Wall -W -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter -Wundef
     47
     48    DEPENDPATH += $$PWD/JavaScriptCore/API
     49    INCLUDEPATH += $$PWD
    4750}
    4851
     
    6164    $$BASE_DIR/WebCore/loader/gtk \
    6265    $$BASE_DIR/WebCore/page/gtk \
    63     $$BASE_DIR/WebKit/gtk/Api \
     66    $$BASE_DIR/WebKit/gtk/WebView \
    6467    $$BASE_DIR/WebKit/gtk/WebCoreSupport
    6568INCLUDEPATH += \
  • trunk/WebKit/gtk/ChangeLog

    r28231 r28273  
     12007-11-30  Alp Toker  <alp@atoker.com>
     2
     3        Reviewed by Adam Roben.
     4
     5        http://bugs.webkit.org/show_bug.cgi?id=15691
     6        [GTK] Public API does not follow GTK+ conventions
     7
     8        Refactor the WebKit/GTK+ public API. Changes:
     9          WebKitPage -> WebKitWebView
     10          WebKitFrame -> WebKitWebFrame
     11
     12        Public API source and header names have been updated to mirror the API
     13        changes.
     14
     15        The API is now kept in WebKit/gtk/WebView to match other ports in the
     16        same class such as Mac and Win.
     17
     18        API/ABI-breaking change.
     19
     20        * Api: Removed.
     21        * Api/headers.pri: Removed.
     22        * Api/webkitgtk-marshal.list: Removed.
     23        * Api/webkitgtkdefines.h: Removed.
     24        * Api/webkitgtkframe.cpp: Removed.
     25        * Api/webkitgtkframe.h: Removed.
     26        * Api/webkitgtkglobal.cpp: Removed.
     27        * Api/webkitgtkglobal.h: Removed.
     28        * Api/webkitgtknetworkrequest.cpp: Removed.
     29        * Api/webkitgtknetworkrequest.h: Removed.
     30        * Api/webkitgtkpage.cpp: Removed.
     31        * Api/webkitgtkpage.h: Removed.
     32        * Api/webkitgtkprivate.cpp: Removed.
     33        * Api/webkitgtkprivate.h: Removed.
     34        * Api/webkitgtksettings.cpp: Removed.
     35        * Api/webkitgtksettings.h: Removed.
     36        * WebCoreSupport/ChromeClientGtk.cpp:
     37        (WebKit::ChromeClient::ChromeClient):
     38        (WebKit::ChromeClient::createWindow):
     39        * WebCoreSupport/ChromeClientGtk.h:
     40        (WebKit::ChromeClient::webPage):
     41        * WebCoreSupport/EditorClientGtk.cpp:
     42        (WebKit::EditorClient::isEditable):
     43        (WebKit::EditorClient::EditorClient):
     44        * WebCoreSupport/EditorClientGtk.h:
     45        * WebCoreSupport/FrameLoaderClientGtk.cpp:
     46        (WebKit::FrameLoaderClient::FrameLoaderClient):
     47        (WebKit::FrameLoaderClient::postProgressStartedNotification):
     48        (WebKit::FrameLoaderClient::postProgressEstimateChangedNotification):
     49        (WebKit::FrameLoaderClient::postProgressFinishedNotification):
     50        (WebKit::FrameLoaderClient::dispatchDecidePolicyForNavigationAction):
     51        (WebKit::FrameLoaderClient::createFrame):
     52        (WebKit::FrameLoaderClient::windowObjectCleared):
     53        (WebKit::FrameLoaderClient::dispatchDidReceiveIcon):
     54        (WebKit::FrameLoaderClient::setTitle):
     55        * WebCoreSupport/FrameLoaderClientGtk.h:
     56        (WebKit::FrameLoaderClient::webFrame):
     57        * WebView: Added.
     58        * WebView/headers.pri: Added.
     59        * WebView/webkit-marshal.list: Added.
     60        * WebView/webkitdefines.h: Added.
     61        * WebView/webkitglobal.cpp: Added.
     62        * WebView/webkitglobal.h: Added.
     63        * WebView/webkitnetworkrequest.cpp: Added.
     64        * WebView/webkitnetworkrequest.h: Added.
     65        * WebView/webkitprivate.cpp: Added.
     66        (WebKit::apply):
     67        (WebKit::create):
     68        (WebKit::getFrameFromView):
     69        (WebKit::getViewFromFrame):
     70        (WebKit::core):
     71        (WebKit::kit):
     72        * WebView/webkitprivate.h: Added.
     73        * WebView/webkitsettings.cpp: Added.
     74        * WebView/webkitsettings.h: Added.
     75        * WebView/webkitwebframe.cpp: Added.
     76        * WebView/webkitwebframe.h: Added.
     77        * WebView/webkitwebview.cpp: Added.
     78        * WebView/webkitwebview.h: Added.
     79
    1802007-11-28  Alp Toker  <alp@atoker.com>
    281
  • trunk/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp

    r28192 r28273  
    3636#include "HitTestResult.h"
    3737#include "KURL.h"
    38 #include "webkitgtkpage.h"
    39 #include "webkitgtkprivate.h"
     38#include "webkitwebview.h"
     39#include "webkitprivate.h"
    4040#include "NotImplemented.h"
    4141#include "WindowFeatures.h"
     
    4444
    4545namespace WebKit {
    46 ChromeClient::ChromeClient(WebKitPage* page)
     46ChromeClient::ChromeClient(WebKitWebView* page)
    4747    : m_webPage(page)
    4848{
     
    9494    } else {
    9595        /* TODO: FrameLoadRequest is not used */
    96         WebKitPage* page = WEBKIT_PAGE_GET_CLASS(m_webPage)->create_page(m_webPage);
     96        WebKitWebView* page = WEBKIT_WEB_VIEW_GET_CLASS(m_webPage)->create_web_view(m_webPage);
    9797        if (!page)
    9898            return 0;
    9999
    100         WebKitPagePrivate *privateData = WEBKIT_PAGE_GET_PRIVATE(WEBKIT_PAGE(page));
    101         return privateData->page;
     100        WebKitWebViewPrivate *privateData = WEBKIT_WEB_VIEW_GET_PRIVATE(WEBKIT_WEB_VIEW(page));
     101        return privateData->corePage;
    102102    }
    103103}
  • trunk/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h

    r28196 r28273  
    3333#include "KURL.h"
    3434
    35 typedef struct _WebKitPage WebKitPage;
     35typedef struct _WebKitWebView WebKitWebView;
    3636
    3737namespace WebKit {
     
    3939    class ChromeClient : public WebCore::ChromeClient {
    4040    public:
    41         ChromeClient(WebKitPage*);
    42         WebKitPage* webPage() const { return m_webPage; }
     41        ChromeClient(WebKitWebView*);
     42        WebKitWebView* webPage() const { return m_webPage; }
    4343
    4444        virtual void chromeDestroyed();
     
    107107
    108108    private:
    109         WebKitPage* m_webPage;
     109        WebKitWebView* m_webPage;
    110110        WebCore::KURL m_hoveredLinkURL;
    111111    };
  • trunk/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp

    r28013 r28273  
    4141#include "Page.h"
    4242#include "PlatformKeyboardEvent.h"
    43 #include "webkitgtkprivate.h"
     43#include "webkitprivate.h"
    4444
    4545#include <stdio.h>
     
    147147bool EditorClient::isEditable()
    148148{
    149     return webkit_page_get_editable(m_page);
     149    return webkit_web_view_get_editable(m_page);
    150150}
    151151
     
    361361}
    362362
    363 EditorClient::EditorClient(WebKitPage* page)
     363EditorClient::EditorClient(WebKitWebView* page)
    364364    : m_page(page)
    365365{
  • trunk/WebKit/gtk/WebCoreSupport/EditorClientGtk.h

    r27977 r28273  
    3535#include <wtf/Forward.h>
    3636
    37 typedef struct _WebKitPage WebKitPage;
     37typedef struct _WebKitWebView WebKitWebView;
    3838
    3939namespace WebCore {
     
    4545    class EditorClient : public WebCore::EditorClient {
    4646    public:
    47         EditorClient(WebKitPage*);
     47        EditorClient(WebKitWebView*);
    4848
    4949        // from EditorClient
     
    110110
    111111    private:
    112         WebKitPage* m_page;
     112        WebKitWebView* m_page;
    113113    };
    114114}
  • trunk/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp

    r28065 r28273  
    5252#include "kjs_proxy.h"
    5353#include "kjs_window.h"
    54 #include "webkitgtkpage.h"
    55 #include "webkitgtkframe.h"
    56 #include "webkitgtkprivate.h"
     54#include "webkitwebview.h"
     55#include "webkitwebframe.h"
     56#include "webkitprivate.h"
    5757
    5858#include <JavaScriptCore/APICast.h>
     
    6666namespace WebKit {
    6767
    68 FrameLoaderClient::FrameLoaderClient(WebKitFrame* frame)
     68FrameLoaderClient::FrameLoaderClient(WebKitWebFrame* frame)
    6969    : m_frame(frame)
    7070    , m_userAgent("")
     
    200200void FrameLoaderClient::postProgressStartedNotification()
    201201{
    202     WebKitPage* page = getPageFromFrame(m_frame);
     202    WebKitWebView* page = getViewFromFrame(m_frame);
    203203    g_signal_emit_by_name(page, "load_started", m_frame);
    204204}
     
    206206void FrameLoaderClient::postProgressEstimateChangedNotification()
    207207{
    208     WebKitPage* kitPage = getPageFromFrame(m_frame);
     208    WebKitWebView* kitPage = getViewFromFrame(m_frame);
    209209    Page* corePage = core(kitPage);
    210210
     
    214214void FrameLoaderClient::postProgressFinishedNotification()
    215215{
    216     WebKitPage* page = getPageFromFrame(m_frame);
     216    WebKitWebView* page = getViewFromFrame(m_frame);
    217217
    218218    g_signal_emit_by_name(page, "load_finished", m_frame);
     
    255255        return;
    256256
    257     WebKitPage* page = getPageFromFrame(m_frame);
     257    WebKitWebView* page = getViewFromFrame(m_frame);
    258258    WebKitNetworkRequest* request = webkit_network_request_new(resourceRequest.url().url().utf8().data());
    259259    WebKitNavigationResponse response;
     
    282282    Frame* coreFrame = core(webFrame());
    283283
    284     ASSERT(core(getPageFromFrame(webFrame())) == coreFrame->page());
    285     WebKitFrame* gtkFrame = WEBKIT_FRAME(webkit_frame_init_with_page(getPageFromFrame(webFrame()), ownerElement));
     284    ASSERT(core(getViewFromFrame(webFrame())) == coreFrame->page());
     285    WebKitWebFrame* gtkFrame = WEBKIT_WEB_FRAME(webkit_web_frame_init_with_web_view(getViewFromFrame(webFrame()), ownerElement));
    286286    RefPtr<Frame> childFrame(adoptRef(core(gtkFrame)));
    287287
     
    367367    ASSERT(windowObject);
    368368
    369     WebKitPage* page = getPageFromFrame(m_frame);
     369    WebKitWebView* page = getViewFromFrame(m_frame);
    370370    g_signal_emit_by_name(page, "window_object_cleared", m_frame, context, windowObject);
    371371
     
    448448void FrameLoaderClient::dispatchDidReceiveIcon()
    449449{
    450     WebKitPage* page = getPageFromFrame(m_frame);
     450    WebKitWebView* page = getViewFromFrame(m_frame);
    451451
    452452    g_signal_emit_by_name(page, "icon_loaded", m_frame);
     
    508508void FrameLoaderClient::setTitle(const String& title, const KURL& url)
    509509{
    510     WebKitPage* page = getPageFromFrame(m_frame);
     510    WebKitWebView* page = getViewFromFrame(m_frame);
    511511
    512512    CString titleString = title.utf8();
     
    514514    g_signal_emit_by_name(m_frame, "title_changed", titleString.data(), urlString.data());
    515515
    516     if (m_frame == webkit_page_get_main_frame(page))
     516    if (m_frame == webkit_web_view_get_main_frame(page))
    517517        g_signal_emit_by_name(page, "title_changed", titleString.data(), urlString.data());
    518518}
  • trunk/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h

    r27977 r28273  
    3333#include "ResourceResponse.h"
    3434
    35 typedef struct _WebKitFrame WebKitFrame;
     35typedef struct _WebKitWebFrame WebKitWebFrame;
    3636
    3737namespace WebKit {
     
    3939    class FrameLoaderClient : public WebCore::FrameLoaderClient {
    4040    public:
    41         FrameLoaderClient(WebKitFrame*);
     41        FrameLoaderClient(WebKitWebFrame*);
    4242        virtual ~FrameLoaderClient() { }
    4343        virtual void frameLoaderDestroyed();
    4444
    45         WebKitFrame*  webFrame() const { return m_frame; }
     45        WebKitWebFrame*  webFrame() const { return m_frame; }
    4646
    4747        virtual bool hasWebView() const;
     
    179179        virtual void download(WebCore::ResourceHandle*, const WebCore::ResourceRequest&, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&);
    180180    private:
    181         WebKitFrame* m_frame;
     181        WebKitWebFrame* m_frame;
    182182        WebCore::ResourceResponse m_response;
    183183        WebCore::String m_userAgent;
  • trunk/WebKitTools/ChangeLog

    r28254 r28273  
     12007-11-30  Alp Toker  <alp@atoker.com>
     2
     3        Reviewed by Adam Roben.
     4
     5        http://bugs.webkit.org/show_bug.cgi?id=15691
     6        [GTK] Public API does not follow GTK+ conventions
     7
     8        Refactor the WebKit/GTK+ public API. Changes:
     9          WebKitPage -> WebKitWebView
     10          WebKitFrame -> WebKitWebFrame
     11
     12        Public API source and header names have been updated to mirror the API
     13        changes.
     14
     15        The API is now kept in WebKit/gtk/WebView to match other ports in the
     16        same class such as Mac and Win.
     17
     18        * GtkLauncher/main.c:
     19        (activate_uri_entry_cb):
     20        (link_hover_cb):
     21        (title_change_cb):
     22        (progress_change_cb):
     23        (go_back_cb):
     24        (go_forward_cb):
     25        (create_browser):
     26        (main):
     27
    1282007-11-30  Adam Roben  <aroben@apple.com>
    229
  • trunk/WebKitTools/GtkLauncher/main.c

    r28231 r28273  
    2525 */
    2626
    27 #include "webkitgtkpage.h"
    28 #include "webkitgtkglobal.h"
     27#include "webkitwebview.h"
     28#include "webkitglobal.h"
    2929#include <gtk/gtk.h>
    3030
     
    3232static GtkWidget* uri_entry;
    3333static GtkStatusbar* main_statusbar;
    34 static WebKitPage* web_page;
     34static WebKitWebView* web_view;
    3535static gchar* main_title;
    3636static gint load_progress;
     
    4242    const gchar* uri = gtk_entry_get_text (GTK_ENTRY (entry));
    4343    g_assert (uri);
    44     webkit_page_open (web_page, uri);
     44    webkit_web_view_open (web_view, uri);
    4545}
    4646
     
    5858
    5959static void
    60 link_hover_cb (WebKitPage* page, const gchar* title, const gchar* link, gpointer data)
     60link_hover_cb (WebKitWebView* page, const gchar* title, const gchar* link, gpointer data)
    6161{
    6262    /* underflow is allowed */
     
    6767
    6868static void
    69 title_change_cb (WebKitPage* page, const gchar* title, const gchar* uri, gpointer data)
     69title_change_cb (WebKitWebView* page, const gchar* title, const gchar* uri, gpointer data)
    7070{
    7171    gtk_entry_set_text (GTK_ENTRY (uri_entry), uri);
     
    7878
    7979static void
    80 progress_change_cb (WebKitPage* page, gint progress, gpointer data)
     80progress_change_cb (WebKitWebView* page, gint progress, gpointer data)
    8181{
    8282    load_progress = progress;
     
    9393go_back_cb (GtkWidget* widget, gpointer data)
    9494{
    95     webkit_page_go_backward (web_page);
     95    webkit_web_view_go_backward (web_view);
    9696}
    9797
     
    9999go_forward_cb (GtkWidget* widget, gpointer data)
    100100{
    101     webkit_page_go_forward (web_page);
     101    webkit_web_view_go_forward (web_view);
    102102}
    103103
     
    108108    gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
    109109
    110     web_page = WEBKIT_PAGE (webkit_page_new ());
    111     gtk_container_add (GTK_CONTAINER (scrolled_window), GTK_WIDGET (web_page));
     110    web_view = WEBKIT_WEB_VIEW (webkit_web_view_new ());
     111    gtk_container_add (GTK_CONTAINER (scrolled_window), GTK_WIDGET (web_view));
    112112
    113     g_signal_connect (G_OBJECT (web_page), "title-changed", G_CALLBACK (title_change_cb), web_page);
    114     g_signal_connect (G_OBJECT (web_page), "load-progress-changed", G_CALLBACK (progress_change_cb), web_page);
    115     g_signal_connect (G_OBJECT (web_page), "hovering-over-link", G_CALLBACK (link_hover_cb), web_page);
     113    g_signal_connect (G_OBJECT (web_view), "title-changed", G_CALLBACK (title_change_cb), web_view);
     114    g_signal_connect (G_OBJECT (web_view), "load-progress-changed", G_CALLBACK (progress_change_cb), web_view);
     115    g_signal_connect (G_OBJECT (web_view), "hovering-over-link", G_CALLBACK (link_hover_cb), web_view);
    116116
    117117    return scrolled_window;
     
    189189
    190190    gchar* uri = (gchar*) (argc > 1 ? argv[1] : "http://www.google.com/");
    191     webkit_page_open (web_page, uri);
     191    webkit_web_view_open (web_view, uri);
    192192
    193     gtk_widget_grab_focus (GTK_WIDGET (web_page));
     193    gtk_widget_grab_focus (GTK_WIDGET (web_view));
    194194    gtk_widget_show_all (main_window);
    195195    gtk_main ();
Note: See TracChangeset for help on using the changeset viewer.