r2655 - in trunk/src/target/OM-2007.2/applications/openmoko-feedreader2: . src
zecke at sita.openmoko.org
zecke at sita.openmoko.org
Mon Aug 6 22:19:28 CEST 2007
Author: zecke
Date: 2007-08-06 22:19:27 +0200 (Mon, 06 Aug 2007)
New Revision: 2655
Added:
trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/src/feed-marshal.list
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/configure.ac
trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/src/
trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/src/Makefile.am
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-selection-view.c
trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/src/main.c
Log:
2007-08-06 Holger Hans Peter Freyther <zecke at selfish.org>
Make the Backward and Forward button sensitive/unsensitive depending on if
one can go backward/forward.
The backward/forward signals are not yet connected.
* configure.ac: Search for genmarshal
* src/Makefile.am: build the custom marshaler
* src/feed-item-view.c: when asked to highlight text, change the entry as well
(feed_item_view_highlight):
* src/feed-marshal.list: Added.
* src/feed-selection-view.c: Emit the new signal with can_go_backward/_forward
(treeview_selection_changed):
(feed_selection_view_class_init):
* src/main.c:
(feed_selection_changed): Use the two booleans and pass it on to item-view
Modified: trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/ChangeLog 2007-08-06 17:00:47 UTC (rev 2654)
+++ trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/ChangeLog 2007-08-06 20:19:27 UTC (rev 2655)
@@ -1,5 +1,22 @@
2007-08-06 Holger Hans Peter Freyther <zecke at selfish.org>
+ Make the Backward and Forward button sensitive/unsensitive depending on if
+ one can go backward/forward.
+ The backward/forward signals are not yet connected.
+
+ * configure.ac: Search for genmarshal
+ * src/Makefile.am: build the custom marshaler
+ * src/feed-item-view.c: when asked to highlight text, change the entry as well
+ (feed_item_view_highlight):
+ * src/feed-marshal.list: Added.
+ * src/feed-selection-view.c: Emit the new signal with can_go_backward/_forward
+ (treeview_selection_changed):
+ (feed_selection_view_class_init):
+ * src/main.c:
+ (feed_selection_changed): Use the two booleans and pass it on to item-view
+
+2007-08-06 Holger Hans Peter Freyther <zecke at selfish.org>
+
Blind compile fix for GNU libc.
* src/feed-data.c:
Modified: trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/configure.ac
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/configure.ac 2007-08-06 17:00:47 UTC (rev 2654)
+++ trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/configure.ac 2007-08-06 20:19:27 UTC (rev 2655)
@@ -43,6 +43,10 @@
PKG_CHECK_MODULES(GTHREAD, gthread-2.0 )
PKG_CHECK_MODULES(WEBKITGTK, WebKitGdk)
+# glib-genmarshal
+GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
+AC_SUBST(GLIB_GENMARSHAL)
+
# output stuff
AC_OUTPUT([
Makefile
Property changes on: trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/src
___________________________________________________________________
Name: svn:ignore
- *.*swp
*.swp
Makefile.in
Makefile
.libs
.deps
openmoko-feedreader22
+ *.*swp
*.swp
Makefile.in
Makefile
.libs
.deps
openmoko-feedreader2
.gdb_*
*feed-marshal.h
*feed-marshal.c
Modified: trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/src/Makefile.am
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/src/Makefile.am 2007-08-06 17:00:47 UTC (rev 2654)
+++ trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/src/Makefile.am 2007-08-06 20:19:27 UTC (rev 2655)
@@ -3,12 +3,32 @@
-DRSSREADER_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
-AM_CFLAGS = -Wall -Werror -pedantic -std=c99 @OPENMOKO_CFLAGS@ @MRSS_CFLAGS@ @WEBKITGTK_CFLAGS@
+AM_CFLAGS = -Wall -Werror -std=c99 @OPENMOKO_CFLAGS@ @MRSS_CFLAGS@ @WEBKITGTK_CFLAGS@
bin_PROGRAMS = openmoko-feedreader2
EXTRA_DIST = rfcdate.h moko_cache.h feed-configuration.h feed-data.h feed-item-view.h feed-selection-view.h application-data.h
-openmoko_feedreader2_SOURCES = feed-configuration.c feed-item-view.c feed-selection-view.c feed-data.c rfcdate.c moko_cache.c main.c
+built_sources = feed-marshal.h feed-marshal.c
+stamp_files = stamp-feed-marshal.h stamp-feed-marshal.c
+
+$(openmoko_feedreader2_OBJECTS): $(built_sources)
+openmoko_feedreader2_SOURCES = feed-configuration.c feed-item-view.c feed-selection-view.c feed-data.c rfcdate.c moko_cache.c main.c $(built_sources)
openmoko_feedreader2_LDADD = @OPENMOKO_LIBS@ @MRSS_LIBS@ @GTHREAD_LIBS@ @WEBKITGTK_LIBS@
+feed-marshal.c: stamp-feed-marshal.c
+ @true
+stamp-feed-marshal.c: feed-marshal.list
+ $(GLIB_GENMARSHAL) --prefix=feed_marshal $(srcdir)/feed-marshal.list --header --body > feed-marshal.c \
+ && echo timestamp >$(@F)
+
+feed-marshal.h: stamp-feed-marshal.h
+ @true
+
+stamp-feed-marshal.h:
+ $(GLIB_GENMARSHAL) --prefix=feed_marshal $(srcdir)/feed-marshal.list --header >feed-marshal.h \
+ && echo timestamp >$(@F)
+
+CLEANFILES = $(stamp_files) $(built_sources)
+DISTCLEANFILES = $(stamp_files) $(built_sources)
+MAINTAINERCLEANFILES = $(stamp_files) $(built_sources)
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-08-06 17:00:47 UTC (rev 2654)
+++ trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/src/feed-item-view.c 2007-08-06 20:19:27 UTC (rev 2655)
@@ -192,5 +192,6 @@
void
feed_item_view_highlight (FeedItemView* view, const gchar* search_string)
{
+ gtk_entry_set_text (GTK_ENTRY(view->search_entry), search_string);
do_highlight (view, search_string);
}
Added: trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/src/feed-marshal.list
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/src/feed-marshal.list 2007-08-06 17:00:47 UTC (rev 2654)
+++ trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/src/feed-marshal.list 2007-08-06 20:19:27 UTC (rev 2655)
@@ -0,0 +1 @@
+VOID:STRING,BOOLEAN,BOOLEAN
Modified: trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/src/feed-selection-view.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/src/feed-selection-view.c 2007-08-06 17:00:47 UTC (rev 2654)
+++ trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/src/feed-selection-view.c 2007-08-06 20:19:27 UTC (rev 2655)
@@ -27,6 +27,7 @@
#include "config.h"
#include "feed-selection-view.h"
#include "feed-configuration.h"
+#include "feed-marshal.h"
#include <moko-finger-scroll.h>
#include <glib/gi18n.h>
@@ -46,15 +47,26 @@
GtkTreeIter iter;
gboolean has_selection = gtk_tree_selection_get_selected (selection, &model, &iter);
gchar* message = 0;
+ gboolean backward, forward;
+ backward = forward = FALSE;
if (has_selection) {
gtk_tree_model_get (model, &iter, RSS_READER_COLUMN_TEXT, &message, -1 );
if (!message)
message = g_strdup (_("Failed to read the text."));
+
+ /*
+ * check if we can go backward/forward in the model
+ */
+ GtkTreePath *previous = gtk_tree_model_get_path (model, &iter);
+ backward = gtk_tree_path_prev (previous);
+ forward = gtk_tree_model_iter_next (model, &iter);
+ gtk_tree_path_free (previous);
} else
message = g_strdup (_("Please select a feed."));
- g_signal_emit (view, feed_selection_view_signals[ITEM_CHANGED], 0, message);
+
+ g_signal_emit (view, feed_selection_view_signals[ITEM_CHANGED], 0, message, backward, forward);
g_free (message);
}
@@ -197,8 +209,8 @@
0,
NULL,
NULL,
- g_cclosure_marshal_VOID__STRING,
- G_TYPE_NONE, 1, G_TYPE_STRING);
+ feed_marshal_VOID__STRING_BOOLEAN_BOOLEAN,
+ G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN);
}
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-08-06 17:00:47 UTC (rev 2654)
+++ trunk/src/target/OM-2007.2/applications/openmoko-feedreader2/src/main.c 2007-08-06 20:19:27 UTC (rev 2655)
@@ -45,9 +45,12 @@
}
static void
-feed_selection_changed (FeedSelectionView* view, const gchar* text, struct ApplicationData* data)
+feed_selection_changed (FeedSelectionView* view, const gchar* text, const gboolean backward, const gboolean forward, struct ApplicationData* data)
{
feed_item_view_display (data->view, text ? text : _("Failed to read the text."));
+ feed_item_view_set_can_go_back (data->view, backward);
+ feed_item_view_set_can_go_forward (data->view, forward);
+
if (feed_selection_view_get_search_string (view))
feed_item_view_highlight (data->view, feed_selection_view_get_search_string (view));
}
More information about the commitlog
mailing list
