r2386 - in trunk/src/target/OM-2007/applications/openmoko-rssreader: . src
zecke at sita.openmoko.org
zecke at sita.openmoko.org
Mon Jul 23 20:23:19 CEST 2007
Author: zecke
Date: 2007-07-23 20:23:18 +0200 (Mon, 23 Jul 2007)
New Revision: 2386
Modified:
trunk/src/target/OM-2007/applications/openmoko-rssreader/ChangeLog
trunk/src/target/OM-2007/applications/openmoko-rssreader/configure.ac
trunk/src/target/OM-2007/applications/openmoko-rssreader/src/Makefile.am
trunk/src/target/OM-2007/applications/openmoko-rssreader/src/application-data.h
trunk/src/target/OM-2007/applications/openmoko-rssreader/src/callbacks.c
trunk/src/target/OM-2007/applications/openmoko-rssreader/src/main.c
Log:
2007-07-23 Holger Hans Peter Freyther <zecke at selfish.org>
Switch to the newly created WebKit/Gtk API
* configure.ac:
* src/Makefile.am:
* src/application-data.h:
* src/callbacks.c:
(cb_treeview_selection_changed):
* src/main.c:
(create_details_area):
(main):
Modified: trunk/src/target/OM-2007/applications/openmoko-rssreader/ChangeLog
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-rssreader/ChangeLog 2007-07-23 15:57:18 UTC (rev 2385)
+++ trunk/src/target/OM-2007/applications/openmoko-rssreader/ChangeLog 2007-07-23 18:23:18 UTC (rev 2386)
@@ -1,3 +1,16 @@
+2007-07-23 Holger Hans Peter Freyther <zecke at selfish.org>
+
+ Switch to the newly created WebKit/Gtk API
+
+ * configure.ac:
+ * src/Makefile.am:
+ * src/application-data.h:
+ * src/callbacks.c:
+ (cb_treeview_selection_changed):
+ * src/main.c:
+ (create_details_area):
+ (main):
+
2007-05-19 Holger Freyther <zecke at selfish.org>
Improve caching. org.openembedded.dev has a patch to libmrss
Modified: trunk/src/target/OM-2007/applications/openmoko-rssreader/configure.ac
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-rssreader/configure.ac 2007-07-23 15:57:18 UTC (rev 2385)
+++ trunk/src/target/OM-2007/applications/openmoko-rssreader/configure.ac 2007-07-23 18:23:18 UTC (rev 2386)
@@ -1,5 +1,5 @@
AC_PREREQ([2.59])
-AC_INIT([openmoko-rssreader], [0.0.4], [http://openmoko.org])
+AC_INIT([openmoko-rssreader], [0.0.5], [http://openmoko.org])
AM_INIT_AUTOMAKE([1.9 foreign dist-bzip2 no-dist-gzip])
AC_CONFIG_SRCDIR(src/main.c)
AM_CONFIG_HEADER(config.h)
@@ -41,6 +41,7 @@
PKG_CHECK_MODULES(OPENMOKO, openmoko-libs >= 0.0.1)
PKG_CHECK_MODULES(MRSS, mrss >= 0.17 )
PKG_CHECK_MODULES(GTHREAD, gthread-2.0 )
+PKG_CHECK_MODULES(WEBKITGTK, WebKitGdk)
# output stuff
AC_OUTPUT([
Modified: trunk/src/target/OM-2007/applications/openmoko-rssreader/src/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-rssreader/src/Makefile.am 2007-07-23 15:57:18 UTC (rev 2385)
+++ trunk/src/target/OM-2007/applications/openmoko-rssreader/src/Makefile.am 2007-07-23 18:23:18 UTC (rev 2386)
@@ -3,12 +3,12 @@
-DRSSREADER_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
-AM_CFLAGS = -Wall -Werror -pedantic -std=c99 @OPENMOKO_CFLAGS@ @MRSS_CFLAGS@
+AM_CFLAGS = -Wall -Werror -pedantic -std=c99 @OPENMOKO_CFLAGS@ @MRSS_CFLAGS@ @WEBKITGTK_CFLAGS@
bin_PROGRAMS = openmoko-rssreader
EXTRA_DIST = application-data.h callbacks.h rfcdate.h moko_cache.h
openmoko_rssreader_SOURCES = main.c callbacks.c rfcdate.c moko_cache.c
-openmoko_rssreader_LDADD = @OPENMOKO_LIBS@ @MRSS_LIBS@ @GTHREAD_LIBS@
+openmoko_rssreader_LDADD = @OPENMOKO_LIBS@ @MRSS_LIBS@ @GTHREAD_LIBS@ @WEBKITGTK_LIBS@
Modified: trunk/src/target/OM-2007/applications/openmoko-rssreader/src/application-data.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-rssreader/src/application-data.h 2007-07-23 15:57:18 UTC (rev 2385)
+++ trunk/src/target/OM-2007/applications/openmoko-rssreader/src/application-data.h 2007-07-23 18:23:18 UTC (rev 2386)
@@ -33,6 +33,8 @@
#include <libmokoui/moko-tree-view.h>
#include <libmokoui/moko-tool-box.h>
+#include <webkitgtkpage.h>
+
#include "moko_cache.h"
#include <gtk/gtk.h>
@@ -52,11 +54,8 @@
GtkTreeModelFilter *filter_model;
GtkTreeModelSort *sort_model;
+ WebKitGtkPage *textPage;
- GtkTextTagTable *tagTable;
- GtkTextBuffer *textBuffer;
- GtkTextView *textView;
-
gchar *current_filter;
int is_all_filter;
gchar *current_search_text;
Modified: trunk/src/target/OM-2007/applications/openmoko-rssreader/src/callbacks.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-rssreader/src/callbacks.c 2007-07-23 15:57:18 UTC (rev 2385)
+++ trunk/src/target/OM-2007/applications/openmoko-rssreader/src/callbacks.c 2007-07-23 18:23:18 UTC (rev 2386)
@@ -297,9 +297,9 @@
gchar *message;
gtk_tree_model_get( model, &iter, RSS_READER_COLUMN_TEXT, &message, -1 );
if ( message )
- gtk_text_buffer_set_text( data->textBuffer, message, -1 );
+ webkit_gtk_page_load_html_string (data->textPage, message, "");
else
- gtk_text_buffer_set_text( data->textBuffer, g_strdup( _("Failed to read the text") ), -1 );
+ webkit_gtk_page_load_html_string (data->textPage, _("Failed to read the text."), "");
}
}
Modified: trunk/src/target/OM-2007/applications/openmoko-rssreader/src/main.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-rssreader/src/main.c 2007-07-23 15:57:18 UTC (rev 2385)
+++ trunk/src/target/OM-2007/applications/openmoko-rssreader/src/main.c 2007-07-23 18:23:18 UTC (rev 2386)
@@ -33,6 +33,9 @@
#include <libmokoui/moko-scrolled-pane.h>
+#include <webkitgtkpage.h>
+#include <webkitgtkglobal.h>
+
#include <string.h>
#include <assert.h>
@@ -217,19 +220,10 @@
}
static void create_details_area( struct RSSReaderData* data ) {
- data->tagTable = GTK_TEXT_TAG_TABLE(gtk_text_tag_table_new());
- data->textBuffer = GTK_TEXT_BUFFER(gtk_text_buffer_new(data->tagTable));
- data->textView = GTK_TEXT_VIEW(gtk_text_view_new_with_buffer(GTK_TEXT_BUFFER(data->textBuffer)));
+ data->textPage = WEBKIT_GTK_PAGE(webkit_gtk_page_new ());
- GValue value = { 0, };
- g_value_init( &value, G_TYPE_BOOLEAN );
- g_value_set_boolean( &value, FALSE );
- g_object_set_property( G_OBJECT(data->textView), "editable", &value );
- g_object_set_property( G_OBJECT(data->textView), "cursor-visible", &value );
- gtk_text_view_set_wrap_mode( data->textView, GTK_WRAP_WORD_CHAR );
-
GtkWidget *scrollWindow = GTK_WIDGET(moko_scrolled_pane_new());
- moko_scrolled_pane_pack_with_viewport (MOKO_SCROLLED_PANE(scrollWindow), GTK_WIDGET (data->textView));
+ moko_scrolled_pane_pack (MOKO_SCROLLED_PANE(scrollWindow), GTK_WIDGET (data->textPage));
moko_paned_window_set_details_pane( MOKO_PANED_WINDOW(data->window), scrollWindow ) ;
}
@@ -286,6 +280,7 @@
gdk_threads_init();
gdk_threads_enter();
gtk_init( &argc, &argv );
+ webkit_gtk_init ();
struct RSSReaderData *data = g_new0( struct RSSReaderData, 1 );
More information about the commitlog
mailing list
