r3646 - in trunk/src/target/OM-2007.2/applications/openmoko-browser2: . src

zecke at sita.openmoko.org zecke at sita.openmoko.org
Wed Dec 12 20:30:21 CET 2007


Author: zecke
Date: 2007-12-12 20:30:20 +0100 (Wed, 12 Dec 2007)
New Revision: 3646

Modified:
   trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog
   trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/browser-data.c
   trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/browser-data.h
   trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/current-page.c
   trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/go-page.c
   trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/main.c
   trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/open-pages-page.c
Log:
2007-12-12  Holger Freyther  <zecke at selfish.org>

        Update to the recent API of WebKit/Gtk

        WebKitFrame -> WebKitWebFrame
        WebKitPage  -> WebKitWebView

        * src/browser-data.c:
        (browser_page_new):
        * src/browser-data.h:
        * src/current-page.c:
        (current_back_clicked_closure):
        (current_forward_clicked_closure):
        (current_add_bookmark_clicked_closure):
        (current_progress_changed):
        (update_current_page_from_iter):
        * src/go-page.c:
        (go_clicked):
        (create_new_page_clicked):
        * src/main.c:
        * src/open-pages-page.c:
        (open_pages_page_cell_data_func):




Modified: trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog	2007-12-12 19:19:33 UTC (rev 3645)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog	2007-12-12 19:30:20 UTC (rev 3646)
@@ -1,3 +1,26 @@
+2007-12-12  Holger Freyther  <zecke at selfish.org>
+
+        Update to the recent API of WebKit/Gtk
+
+        WebKitFrame -> WebKitWebFrame
+        WebKitPage  -> WebKitWebView
+
+        * src/browser-data.c:
+        (browser_page_new):
+        * src/browser-data.h:
+        * src/current-page.c:
+        (current_back_clicked_closure):
+        (current_forward_clicked_closure):
+        (current_add_bookmark_clicked_closure):
+        (current_progress_changed):
+        (update_current_page_from_iter):
+        * src/go-page.c:
+        (go_clicked):
+        (create_new_page_clicked):
+        * src/main.c:
+        * src/open-pages-page.c:
+        (open_pages_page_cell_data_func):
+
 2007-10-04  Holger 'Siddhartha' Freyther  <zecke at selfish.org>
 
         s/WebKitGtk/WebKit/g

Modified: trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/browser-data.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/browser-data.c	2007-12-12 19:19:33 UTC (rev 3645)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/browser-data.c	2007-12-12 19:30:20 UTC (rev 3646)
@@ -50,7 +50,7 @@
 }
 
 BrowserPage*
-browser_page_new (WebKitPage* webKitPage)
+browser_page_new (WebKitWebView* webKitPage)
 {
     BrowserPage* page = BROWSER_PAGE (g_object_new (BROWSER_TYPE_PAGE, 0));
     page->webKitPage = webKitPage;

Modified: trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/browser-data.h
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/browser-data.h	2007-12-12 19:19:33 UTC (rev 3645)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/browser-data.h	2007-12-12 19:30:20 UTC (rev 3646)
@@ -27,7 +27,7 @@
 #ifndef OPENMOKO_BROWSER_DATA_H
 #define OPENMOKO_BROWSER_DATA_H
 
-#include "webkitgtkpage.h"
+#include "webkitwebview.h"
 
 #include <glib.h>
 #include <gtk/gtk.h>
@@ -46,7 +46,7 @@
 
 struct _BrowserPage {
     GObject parent;
-    WebKitPage* webKitPage;
+    WebKitWebView* webKitPage;
 };
 
 struct _BrowserPageClass {
@@ -54,7 +54,7 @@
 };
 
 GType browser_page_get_type (void);
-BrowserPage* browser_page_new (WebKitPage* page);
+BrowserPage* browser_page_new (WebKitWebView* page);
 
 /*
  * The state of the Browser
@@ -74,8 +74,8 @@
      * using HTML and JavaScript and binding the GObject(s) to
      * JavaScript.
      */
-    WebKitPage* pagesOverviewPage;
-    WebKitPage* bookmarkPage;
+    WebKitWebView* pagesOverviewPage;
+    WebKitWebView* bookmarkPage;
 
 
     /*

Modified: trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/current-page.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/current-page.c	2007-12-12 19:19:33 UTC (rev 3645)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/current-page.c	2007-12-12 19:30:20 UTC (rev 3646)
@@ -28,27 +28,27 @@
 #include "current-page.h"
 
 #include <moko-finger-scroll.h>
-#include <webkitgtkframe.h>
-#include <webkitgtkpage.h>
+#include <webkitwebframe.h>
+#include <webkitwebview.h>
 
 /*
  * From a list of BrowserPage's in BrowserData::currentPage show
  * one as the current one. This means we will GtkContainer::{add,remove}
- * the WebKitPage. To make that work, e.g. not destroying the WebKitPage
+ * the WebKitWebView. To make that work, e.g. not destroying the WebKitWebView
  * when we remove it from the container, we will keep a self added reference
- * on all WebKitPages we have created.
+ * on all WebKitWebViews we have created.
  */
 
 static void current_back_clicked_closure(GtkWidget* button, struct BrowserData* data)
 {
     g_return_if_fail (data->currentPage);
-    webkit_page_go_backward(data->currentPage->webKitPage);
+    webkit_web_view_go_backward(data->currentPage->webKitPage);
 }
 
 static void current_forward_clicked_closure(GtkWidget* button, struct BrowserData* data)
 {
     g_return_if_fail (data->currentPage);
-    webkit_page_go_forward(data->currentPage->webKitPage);
+    webkit_web_view_go_forward(data->currentPage->webKitPage);
 }
 
 static void current_stop_reload_clicked_closure(GtkWidget* button, struct BrowserData* data)
@@ -58,17 +58,17 @@
 static void current_add_bookmark_clicked_closure(GtkWidget* button, struct BrowserData* data)
 {
     g_return_if_fail (data->currentPage);
-    g_print ("Location to bookmark: %s\n", webkit_frame_get_title (webkit_page_get_main_frame (data->currentPage->webKitPage)));
+    g_print ("Location to bookmark: %s\n", webkit_web_frame_get_title (webkit_web_view_get_main_frame (data->currentPage->webKitPage)));
 }
 
-static void current_progress_changed(WebKitPage* page, int prog, struct BrowserData* data)
+static void current_progress_changed(WebKitWebView* page, int prog, struct BrowserData* data)
 {
     g_assert (page == data->currentPage->webKitPage);
 
     if (prog == 100) {
-        gtk_widget_set_sensitive (GTK_WIDGET (data->currentBack), webkit_page_can_go_backward (page));
-        gtk_widget_set_sensitive (GTK_WIDGET (data->currentForward), webkit_page_can_go_forward (page));
-        gtk_widget_set_sensitive (GTK_WIDGET (data->currentAdd), webkit_frame_get_title (webkit_page_get_main_frame (page)) != NULL);
+        gtk_widget_set_sensitive (GTK_WIDGET (data->currentBack), webkit_web_view_can_go_backward (page));
+        gtk_widget_set_sensitive (GTK_WIDGET (data->currentForward), webkit_web_view_can_go_forward (page));
+        gtk_widget_set_sensitive (GTK_WIDGET (data->currentAdd), webkit_web_frame_get_title (webkit_web_view_get_main_frame (page)) != NULL);
     }
 }
 
@@ -176,8 +176,8 @@
      * Update the GtkToolItems
      */
     /* XXX ### FIXME TODO check if we should show stop/reload */
-    gtk_widget_set_sensitive (GTK_WIDGET (data->currentBack), webkit_page_can_go_backward (data->currentPage->webKitPage));
-    gtk_widget_set_sensitive (GTK_WIDGET (data->currentForward), webkit_page_can_go_forward (data->currentPage->webKitPage));
-    gtk_widget_set_sensitive (GTK_WIDGET (data->currentAdd), webkit_frame_get_title (webkit_page_get_main_frame (data->currentPage->webKitPage)) != NULL);
+    gtk_widget_set_sensitive (GTK_WIDGET (data->currentBack), webkit_web_view_can_go_backward (data->currentPage->webKitPage));
+    gtk_widget_set_sensitive (GTK_WIDGET (data->currentForward), webkit_web_view_can_go_forward (data->currentPage->webKitPage));
+    gtk_widget_set_sensitive (GTK_WIDGET (data->currentAdd), webkit_web_frame_get_title (webkit_web_view_get_main_frame (data->currentPage->webKitPage)) != NULL);
     gtk_widget_set_sensitive (GTK_WIDGET (data->currentClose), TRUE);
 }

Modified: trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/go-page.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/go-page.c	2007-12-12 19:19:33 UTC (rev 3645)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/go-page.c	2007-12-12 19:30:20 UTC (rev 3646)
@@ -123,7 +123,7 @@
     else
         url = autocorrect_url (gtk_entry_get_text (data->goUrlEntry));
 
-    webkit_page_open (data->currentPage->webKitPage, url);
+    webkit_web_view_open (data->currentPage->webKitPage, url);
     gtk_notebook_set_current_page (GTK_NOTEBOOK (data->mainNotebook), 0);
 }
 
@@ -138,10 +138,10 @@
     else
         url = autocorrect_url (gtk_entry_get_text (data->goUrlEntry));
 
-    BrowserPage* page = browser_page_new (WEBKIT_PAGE (webkit_page_new ()));
+    BrowserPage* page = browser_page_new (WEBKIT_WEB_VIEW (webkit_web_view_new ()));
     gtk_list_store_append (data->browserPages, &data->currentPageIter);
     gtk_list_store_set (data->browserPages, &data->currentPageIter, 0, page, -1);
-    webkit_page_open (page->webKitPage, url);
+    webkit_web_view_open (page->webKitPage, url);
     update_current_page_from_iter (data);
 
     gtk_notebook_set_current_page (GTK_NOTEBOOK (data->mainNotebook), 0);

Modified: trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/main.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/main.c	2007-12-12 19:19:33 UTC (rev 3645)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/main.c	2007-12-12 19:30:20 UTC (rev 3646)
@@ -33,7 +33,7 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
-#include <webkitgtkglobal.h>
+#include <webkit.h>
 
 #include <moko-finger-scroll.h>
 #include <moko-stock.h>

Modified: trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/open-pages-page.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/open-pages-page.c	2007-12-12 19:19:33 UTC (rev 3645)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/open-pages-page.c	2007-12-12 19:30:20 UTC (rev 3646)
@@ -28,8 +28,8 @@
 #include "open-pages-page.h"
 #include "current-page.h"
 
-#include <webkitgtkpage.h>
-#include <webkitgtkframe.h>
+#include <webkitwebframe.h>
+#include <webkitwebview.h>
 #include <moko-finger-scroll.h>
 
 #include <glib/gi18n.h>
@@ -41,7 +41,7 @@
     g_assert (page);
 
     /* XXX, FIXME, TODO check that we don't have any race conditions here. We might get a new title inside WebKit while using that string? */
-    g_object_set (G_OBJECT (ren), "text", webkit_frame_get_title (webkit_page_get_main_frame (page->webKitPage)), NULL);
+    g_object_set (G_OBJECT (ren), "text", webkit_web_frame_get_title (webkit_web_view_get_main_frame (page->webKitPage)), NULL);
     g_object_unref (page);
 }
 





More information about the commitlog mailing list