r3082 - in trunk/src/target/OM-2007.2/applications/openmoko-browser2: . src
zecke at sita.openmoko.org
zecke at sita.openmoko.org
Thu Oct 4 15:17:55 CEST 2007
Author: zecke
Date: 2007-10-04 15:17:54 +0200 (Thu, 04 Oct 2007)
New Revision: 3082
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-10-04 Holger 'Siddhartha' Freyther <zecke at selfish.org>
s/WebKitGtk/WebKit/g
s/webkit_gtk_/webkit_/g
s/WEBKIT_GTK_/WEBKIT_/g
* 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:
(main):
* 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-10-04 13:14:05 UTC (rev 3081)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog 2007-10-04 13:17:54 UTC (rev 3082)
@@ -1,3 +1,26 @@
+2007-10-04 Holger 'Siddhartha' Freyther <zecke at selfish.org>
+
+ s/WebKitGtk/WebKit/g
+ s/webkit_gtk_/webkit_/g
+ s/WEBKIT_GTK_/WEBKIT_/g
+
+ * 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:
+ (main):
+ * src/open-pages-page.c:
+ (open_pages_page_cell_data_func):
+
2007-09-30 Holger 'Siddhartha' Freyther <zecke at selfish.org>
Link to WebKitGtk as upstream changed the name from Gdk
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-10-04 13:14:05 UTC (rev 3081)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/browser-data.c 2007-10-04 13:17:54 UTC (rev 3082)
@@ -50,7 +50,7 @@
}
BrowserPage*
-browser_page_new (WebKitGtkPage* webKitPage)
+browser_page_new (WebKitPage* 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-10-04 13:14:05 UTC (rev 3081)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/browser-data.h 2007-10-04 13:17:54 UTC (rev 3082)
@@ -46,7 +46,7 @@
struct _BrowserPage {
GObject parent;
- WebKitGtkPage* webKitPage;
+ WebKitPage* webKitPage;
};
struct _BrowserPageClass {
@@ -54,7 +54,7 @@
};
GType browser_page_get_type (void);
-BrowserPage* browser_page_new (WebKitGtkPage* page);
+BrowserPage* browser_page_new (WebKitPage* page);
/*
* The state of the Browser
@@ -74,8 +74,8 @@
* using HTML and JavaScript and binding the GObject(s) to
* JavaScript.
*/
- WebKitGtkPage* pagesOverviewPage;
- WebKitGtkPage* bookmarkPage;
+ WebKitPage* pagesOverviewPage;
+ WebKitPage* 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-10-04 13:14:05 UTC (rev 3081)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/current-page.c 2007-10-04 13:17:54 UTC (rev 3082)
@@ -34,21 +34,21 @@
/*
* From a list of BrowserPage's in BrowserData::currentPage show
* one as the current one. This means we will GtkContainer::{add,remove}
- * the WebKitGtkPage. To make that work, e.g. not destroying the WebKitGtkPage
+ * the WebKitPage. To make that work, e.g. not destroying the WebKitPage
* when we remove it from the container, we will keep a self added reference
- * on all WebKitGtkPages we have created.
+ * on all WebKitPages we have created.
*/
static void current_back_clicked_closure(GtkWidget* button, struct BrowserData* data)
{
g_return_if_fail (data->currentPage);
- webkit_gtk_page_go_backward(data->currentPage->webKitPage);
+ webkit_page_go_backward(data->currentPage->webKitPage);
}
static void current_forward_clicked_closure(GtkWidget* button, struct BrowserData* data)
{
g_return_if_fail (data->currentPage);
- webkit_gtk_page_go_forward(data->currentPage->webKitPage);
+ webkit_page_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_gtk_frame_get_title (webkit_gtk_page_get_main_frame (data->currentPage->webKitPage)));
+ g_print ("Location to bookmark: %s\n", webkit_frame_get_title (webkit_page_get_main_frame (data->currentPage->webKitPage)));
}
-static void current_progress_changed(WebKitGtkPage* page, int prog, struct BrowserData* data)
+static void current_progress_changed(WebKitPage* page, int prog, struct BrowserData* data)
{
g_assert (page == data->currentPage->webKitPage);
if (prog == 100) {
- gtk_widget_set_sensitive (GTK_WIDGET (data->currentBack), webkit_gtk_page_can_go_backward (page));
- gtk_widget_set_sensitive (GTK_WIDGET (data->currentForward), webkit_gtk_page_can_go_forward (page));
- gtk_widget_set_sensitive (GTK_WIDGET (data->currentAdd), webkit_gtk_frame_get_title (webkit_gtk_page_get_main_frame (page)) != NULL);
+ 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);
}
}
@@ -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_gtk_page_can_go_backward (data->currentPage->webKitPage));
- gtk_widget_set_sensitive (GTK_WIDGET (data->currentForward), webkit_gtk_page_can_go_forward (data->currentPage->webKitPage));
- gtk_widget_set_sensitive (GTK_WIDGET (data->currentAdd), webkit_gtk_frame_get_title (webkit_gtk_page_get_main_frame (data->currentPage->webKitPage)) != NULL);
+ 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->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-10-04 13:14:05 UTC (rev 3081)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/go-page.c 2007-10-04 13:17:54 UTC (rev 3082)
@@ -123,7 +123,7 @@
else
url = autocorrect_url (gtk_entry_get_text (data->goUrlEntry));
- webkit_gtk_page_open (data->currentPage->webKitPage, url);
+ webkit_page_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_GTK_PAGE (webkit_gtk_page_new ()));
+ BrowserPage* page = browser_page_new (WEBKIT_PAGE (webkit_page_new ()));
gtk_list_store_append (data->browserPages, &data->currentPageIter);
gtk_list_store_set (data->browserPages, &data->currentPageIter, 0, page, -1);
- webkit_gtk_page_open (page->webKitPage, url);
+ webkit_page_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-10-04 13:14:05 UTC (rev 3081)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/main.c 2007-10-04 13:17:54 UTC (rev 3082)
@@ -55,7 +55,7 @@
gdk_threads_init ();
gdk_threads_enter ();
gtk_init (&argc, &argv);
- webkit_gtk_init ();
+ 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 2007-10-04 13:14:05 UTC (rev 3081)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/open-pages-page.c 2007-10-04 13:17:54 UTC (rev 3082)
@@ -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_gtk_frame_get_title (webkit_gtk_page_get_main_frame (page->webKitPage)), NULL);
+ g_object_set (G_OBJECT (ren), "text", webkit_frame_get_title (webkit_page_get_main_frame (page->webKitPage)), NULL);
g_object_unref (page);
}
More information about the commitlog
mailing list
