Changeset 2386


Ignore:
Timestamp:
07/23/07 20:23:18 (6 years ago)
Author:
zecke
Message:

2007-07-23 Holger Hans Peter Freyther <zecke@…>

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):
Location:
trunk/src/target/OM-2007/applications/openmoko-rssreader
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/target/OM-2007/applications/openmoko-rssreader/ChangeLog

    r2042 r2386  
     12007-07-23  Holger Hans Peter Freyther  <zecke@selfish.org> 
     2 
     3        Switch to the newly created WebKit/Gtk API 
     4 
     5        * configure.ac: 
     6        * src/Makefile.am: 
     7        * src/application-data.h: 
     8        * src/callbacks.c: 
     9        (cb_treeview_selection_changed): 
     10        * src/main.c: 
     11        (create_details_area): 
     12        (main): 
     13 
    1142007-05-19  Holger Freyther  <zecke@selfish.org> 
    215 

  • trunk/src/target/OM-2007/applications/openmoko-rssreader/configure.ac

    r1701 r2386  
    11AC_PREREQ([2.59]) 
    2 AC_INIT([openmoko-rssreader], [0.0.4], [http://openmoko.org]) 
     2AC_INIT([openmoko-rssreader], [0.0.5], [http://openmoko.org]) 
    33AM_INIT_AUTOMAKE([1.9 foreign dist-bzip2 no-dist-gzip]) 
    44AC_CONFIG_SRCDIR(src/main.c) 
    … …  
    4242PKG_CHECK_MODULES(MRSS,     mrss          >= 0.17 ) 
    4343PKG_CHECK_MODULES(GTHREAD,  gthread-2.0           ) 
     44PKG_CHECK_MODULES(WEBKITGTK, WebKitGdk) 
    4445 
    4546# output stuff 

  • trunk/src/target/OM-2007/applications/openmoko-rssreader/src/Makefile.am

    r1872 r2386  
    44 
    55 
    6 AM_CFLAGS  = -Wall -Werror -pedantic -std=c99 @OPENMOKO_CFLAGS@ @MRSS_CFLAGS@ 
     6AM_CFLAGS  = -Wall -Werror -pedantic -std=c99 @OPENMOKO_CFLAGS@ @MRSS_CFLAGS@ @WEBKITGTK_CFLAGS@ 
    77 
    88bin_PROGRAMS = openmoko-rssreader 
    … …  
    1111 
    1212openmoko_rssreader_SOURCES = main.c callbacks.c rfcdate.c moko_cache.c 
    13 openmoko_rssreader_LDADD = @OPENMOKO_LIBS@ @MRSS_LIBS@ @GTHREAD_LIBS@ 
     13openmoko_rssreader_LDADD = @OPENMOKO_LIBS@ @MRSS_LIBS@ @GTHREAD_LIBS@ @WEBKITGTK_LIBS@ 
    1414 

  • trunk/src/target/OM-2007/applications/openmoko-rssreader/src/application-data.h

    r2028 r2386  
    3434#include <libmokoui/moko-tool-box.h> 
    3535 
     36#include <webkitgtkpage.h> 
     37 
    3638#include "moko_cache.h" 
    3739 
    … …  
    5355    GtkTreeModelSort  *sort_model; 
    5456 
    55  
    56     GtkTextTagTable   *tagTable; 
    57     GtkTextBuffer     *textBuffer; 
    58     GtkTextView       *textView; 
     57    WebKitGtkPage     *textPage; 
    5958 
    6059    gchar             *current_filter; 

  • trunk/src/target/OM-2007/applications/openmoko-rssreader/src/callbacks.c

    r2042 r2386  
    298298        gtk_tree_model_get( model, &iter, RSS_READER_COLUMN_TEXT, &message, -1 ); 
    299299        if ( message ) 
    300             gtk_text_buffer_set_text( data->textBuffer, message, -1 ); 
     300            webkit_gtk_page_load_html_string (data->textPage, message, ""); 
    301301        else 
    302             gtk_text_buffer_set_text( data->textBuffer, g_strdup( _("Failed to read the text") ), -1 ); 
     302            webkit_gtk_page_load_html_string (data->textPage, _("Failed to read the text."), ""); 
    303303    } 
    304304} 

  • trunk/src/target/OM-2007/applications/openmoko-rssreader/src/main.c

    r2029 r2386  
    3333 
    3434#include <libmokoui/moko-scrolled-pane.h> 
     35 
     36#include <webkitgtkpage.h> 
     37#include <webkitgtkglobal.h> 
    3538 
    3639#include <string.h> 
    … …  
    218221 
    219222static void create_details_area( struct RSSReaderData* data ) { 
    220     data->tagTable   = GTK_TEXT_TAG_TABLE(gtk_text_tag_table_new()); 
    221     data->textBuffer = GTK_TEXT_BUFFER(gtk_text_buffer_new(data->tagTable)); 
    222     data->textView   = GTK_TEXT_VIEW(gtk_text_view_new_with_buffer(GTK_TEXT_BUFFER(data->textBuffer))); 
    223  
    224     GValue value = { 0, }; 
    225     g_value_init( &value, G_TYPE_BOOLEAN ); 
    226     g_value_set_boolean( &value, FALSE ); 
    227     g_object_set_property( G_OBJECT(data->textView), "editable",       &value ); 
    228     g_object_set_property( G_OBJECT(data->textView), "cursor-visible", &value ); 
    229     gtk_text_view_set_wrap_mode( data->textView, GTK_WRAP_WORD_CHAR ); 
     223    data->textPage = WEBKIT_GTK_PAGE(webkit_gtk_page_new ()); 
    230224 
    231225    GtkWidget *scrollWindow = GTK_WIDGET(moko_scrolled_pane_new()); 
    232     moko_scrolled_pane_pack_with_viewport (MOKO_SCROLLED_PANE(scrollWindow), GTK_WIDGET (data->textView)); 
     226    moko_scrolled_pane_pack (MOKO_SCROLLED_PANE(scrollWindow), GTK_WIDGET (data->textPage)); 
    233227    moko_paned_window_set_details_pane( MOKO_PANED_WINDOW(data->window), scrollWindow ) ; 
    234228} 
    … …  
    287281    gdk_threads_enter(); 
    288282    gtk_init( &argc, &argv ); 
     283    webkit_gtk_init (); 
    289284 
    290285    struct RSSReaderData *data = g_new0( struct RSSReaderData, 1 ); 
Note: See TracChangeset for help on using the changeset viewer.