r3080 - in trunk/src/target/OM-2007.2/applications/openmoko-feedreader2: . src

[zecke at sita.openmoko.org]

Author: zecke
Date: 2007-10-04 15:11:15 +0200 (Thu, 04 Oct 2007)
New Revision: 3080

Modified:
   trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/ChangeLog
   trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/src/callbacks.c
   trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/src/feed-item-view.c
   trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/src/feed-item-view.h
   trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/src/main.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/Makefile.am:
        * src/callbacks.c:
        (cb_treeview_selection_changed):
        * src/feed-item-view.c:
        (do_highlight):
        (feed_item_view_init):
        (feed_item_view_display):
        * src/feed-item-view.h:
        * src/main.c:
  


Modified: trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/ChangeLog	2007-10-04 11:10:11 UTC (rev 3079)
+++ trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/ChangeLog	2007-10-04 13:11:15 UTC (rev 3080)
@@ -1,3 +1,20 @@
+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/Makefile.am:
+        * src/callbacks.c:
+        (cb_treeview_selection_changed):
+        * src/feed-item-view.c:
+        (do_highlight):
+        (feed_item_view_init):
+        (feed_item_view_display):
+        * src/feed-item-view.h:
+        * src/main.c:
+        (main):
+
 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-feedreader2/src/callbacks.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/src/callbacks.c	2007-10-04 11:10:11 UTC (rev 3079)
+++ trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/src/callbacks.c	2007-10-04 13:11:15 UTC (rev 3080)
@@ -96,9 +96,9 @@
         gchar *message;
         gtk_tree_model_get( model, &iter, RSS_READER_COLUMN_TEXT, &message, -1 );
         if ( message )
-            webkit_gtk_page_load_html_string (data->textPage, message, "");
+            webkit_page_load_html_string (data->textPage, message, "");
         else
-            webkit_gtk_page_load_html_string (data->textPage, _("Failed to read the text."), "");
+            webkit_page_load_html_string (data->textPage, _("Failed to read the text."), "");
     }
 }
 

Modified: trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/src/feed-item-view.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/src/feed-item-view.c	2007-10-04 11:10:11 UTC (rev 3079)
+++ trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/src/feed-item-view.c	2007-10-04 13:11:15 UTC (rev 3080)
@@ -59,7 +59,7 @@
 static void
 do_highlight (FeedItemView* view, const gchar* search_string)
 {
-    /* webkit_gtk_page_search (view->page, search_string); */
+    /* webkit_page_search (view->page, search_string); */
 }
 
 static void
@@ -121,7 +121,7 @@
     GtkWidget* scrolled = moko_finger_scroll_new ();
     gtk_box_pack_start (GTK_BOX(view), scrolled, TRUE, TRUE, 0);
 
-    view->page = WEBKIT_GTK_PAGE(webkit_gtk_page_new ());
+    view->page = WEBKIT_PAGE(webkit_page_new ());
     gtk_container_add (GTK_CONTAINER(scrolled), GTK_WIDGET(view->page));
 
     /*
@@ -186,7 +186,7 @@
 {
     gtk_widget_set_sensitive (GTK_WIDGET(view->mail), TRUE);
     gtk_widget_set_sensitive (GTK_WIDGET(view->page), TRUE);
-    webkit_gtk_page_load_html_string (view->page, text, "");
+    webkit_page_load_html_string (view->page, text, "");
 }
 
 void

Modified: trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/src/feed-item-view.h
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/src/feed-item-view.h	2007-10-04 11:10:11 UTC (rev 3079)
+++ trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/src/feed-item-view.h	2007-10-04 13:11:15 UTC (rev 3080)
@@ -27,7 +27,7 @@
 /*
  * Display one Feed Item/Entry.
  *
- *  WebKitGtk will be used to display the entry. This is the whole view including
+ *  WebKit will be used to display the entry. This is the whole view including
  *  a button for the next and previous item to allow fast switching of items.
  *  
  *  The views representing the filtered and sorted FeedData are expected to follow
@@ -56,7 +56,7 @@
 struct _FeedItemView {
     GtkVBox parent;
 
-    WebKitGtkPage  *page;
+    WebKitPage  *page;
     GtkToolItem    *back;
     GtkToolItem    *forward;
     GtkToolItem    *mail;

Modified: trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/src/main.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/src/main.c	2007-10-04 11:10:11 UTC (rev 3079)
+++ trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/src/main.c	2007-10-04 13:11:15 UTC (rev 3080)
@@ -218,7 +218,7 @@
     gdk_threads_init ();
     gdk_threads_enter ();
     gtk_init (&argc, &argv);
-    webkit_gtk_init ();
+    webkit_init ();
     moko_stock_register ();
     g_set_application_name( _("FeedReader") );