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

zecke at sita.openmoko.org zecke at sita.openmoko.org
Wed Mar 5 12:49:11 CET 2008


Author: zecke
Date: 2008-03-05 12:49:05 +0100 (Wed, 05 Mar 2008)
New Revision: 4172

Modified:
   trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog
   trunk/src/target/OM-2007.2/applications/openmoko-browser2/configure.ac
   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/main.c
   trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/open-pages-page.c
Log:
2008-03-05  Koen Kooi  <k.kooi at student.utwente.nl>

    Keep track of the API changes.

        * configure.ac:
        * src/browser-data.h:
        * src/current-page.c:
        (current_back_clicked_closure):
        (current_progress_changed):
        (update_current_page_from_iter):
        * src/main.c:
        (main):
        * src/open-pages-page.c:




Modified: trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog	2008-03-05 08:09:57 UTC (rev 4171)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog	2008-03-05 11:49:05 UTC (rev 4172)
@@ -1,3 +1,17 @@
+2008-03-05  Koen Kooi  <k.kooi at student.utwente.nl>
+
+	Keep track of the API changes.
+
+        * configure.ac:
+        * src/browser-data.h:
+        * src/current-page.c:
+        (current_back_clicked_closure):
+        (current_progress_changed):
+        (update_current_page_from_iter):
+        * src/main.c:
+        (main):
+        * src/open-pages-page.c:
+
 2007-12-12  Holger Freyther  <zecke at selfish.org>
 
         Update to the recent API of WebKit/Gtk

Modified: trunk/src/target/OM-2007.2/applications/openmoko-browser2/configure.ac
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/configure.ac	2008-03-05 08:09:57 UTC (rev 4171)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/configure.ac	2008-03-05 11:49:05 UTC (rev 4172)
@@ -40,7 +40,7 @@
 # base deps
 PKG_CHECK_MODULES(OPENMOKO,  libmokoui2    >= 0.1.0)
 PKG_CHECK_MODULES(GTHREAD,   gthread-2.0           )
-PKG_CHECK_MODULES(WEBKITGTK, WebKitGtk)
+PKG_CHECK_MODULES(WEBKITGTK, webkit-1.0)
 
 # glib-genmarshal
 GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`

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	2008-03-05 08:09:57 UTC (rev 4171)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/browser-data.h	2008-03-05 11:49:05 UTC (rev 4172)
@@ -27,7 +27,7 @@
 #ifndef OPENMOKO_BROWSER_DATA_H
 #define OPENMOKO_BROWSER_DATA_H
 
-#include "webkitwebview.h"
+#include <webkit/webkitwebview.h>
 
 #include <glib.h>
 #include <gtk/gtk.h>

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	2008-03-05 08:09:57 UTC (rev 4171)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/current-page.c	2008-03-05 11:49:05 UTC (rev 4172)
@@ -28,8 +28,8 @@
 #include "current-page.h"
 
 #include <moko-finger-scroll.h>
-#include <webkitwebframe.h>
-#include <webkitwebview.h>
+#include <webkit/webkitwebframe.h>
+#include <webkit/webkitwebview.h>
 
 /*
  * From a list of BrowserPage's in BrowserData::currentPage show
@@ -42,7 +42,7 @@
 static void current_back_clicked_closure(GtkWidget* button, struct BrowserData* data)
 {
     g_return_if_fail (data->currentPage);
-    webkit_web_view_go_backward(data->currentPage->webKitPage);
+    webkit_web_view_go_back(data->currentPage->webKitPage);
 }
 
 static void current_forward_clicked_closure(GtkWidget* button, struct BrowserData* data)
@@ -66,7 +66,7 @@
     g_assert (page == data->currentPage->webKitPage);
 
     if (prog == 100) {
-        gtk_widget_set_sensitive (GTK_WIDGET (data->currentBack), webkit_web_view_can_go_backward (page));
+        gtk_widget_set_sensitive (GTK_WIDGET (data->currentBack), webkit_web_view_can_go_back (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,7 +176,7 @@
      * Update the GtkToolItems
      */
     /* XXX ### FIXME TODO check if we should show stop/reload */
-    gtk_widget_set_sensitive (GTK_WIDGET (data->currentBack), webkit_web_view_can_go_backward (data->currentPage->webKitPage));
+    gtk_widget_set_sensitive (GTK_WIDGET (data->currentBack), webkit_web_view_can_go_back (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/main.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/main.c	2008-03-05 08:09:57 UTC (rev 4171)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/main.c	2008-03-05 11:49:05 UTC (rev 4172)
@@ -33,7 +33,7 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
-#include <webkit.h>
+#include <webkit/webkit.h>
 
 #include <moko-finger-scroll.h>
 #include <moko-stock.h>
@@ -55,7 +55,6 @@
     gdk_threads_init ();
     gdk_threads_enter ();
     gtk_init (&argc, &argv);
-    webkit_init ();
     moko_stock_register ();
     g_set_application_name (_("Browser"));
 

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	2008-03-05 08:09:57 UTC (rev 4171)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/open-pages-page.c	2008-03-05 11:49:05 UTC (rev 4172)
@@ -28,8 +28,8 @@
 #include "open-pages-page.h"
 #include "current-page.h"
 
-#include <webkitwebframe.h>
-#include <webkitwebview.h>
+#include <webkit/webkitwebframe.h>
+#include <webkit/webkitwebview.h>
 #include <moko-finger-scroll.h>
 
 #include <glib/gi18n.h>





More information about the commitlog mailing list