Send commitlog mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:
1. r3076 - in
trunk/src/target/OM-2007.2/applications/openmoko-today2: . src
([EMAIL PROTECTED])
2. r3077 - in
trunk/src/target/OM-2007.2/applications/openmoko-today2: . src
([EMAIL PROTECTED])
3. r3078 - in trunk/src/target/OM-2007.2/libraries/libmokoui2: .
libmokoui ([EMAIL PROTECTED])
4. r3079 - in
trunk/src/target/OM-2007.2/libraries/libmokojournal2: . doc
doc/reference ([EMAIL PROTECTED])
5. r3080 - in
trunk/src/target/OM-2007.2/applications/openmoko-feedreader2: .
src ([EMAIL PROTECTED])
6. r3081 -
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src
([EMAIL PROTECTED])
--- Begin Message ---
Author: thomas
Date: 2007-10-04 12:04:00 +0200 (Thu, 04 Oct 2007)
New Revision: 3076
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-pim-summary.c
Log:
* src/today-pim-summary.c:
(today_pim_summary_tasks_selection_changed_cb): Update binary name for
openmoko-tasks
Modified: trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
2007-10-03 12:30:29 UTC (rev 3075)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
2007-10-04 10:04:00 UTC (rev 3076)
@@ -1,3 +1,9 @@
+2007-10-04 Thomas Wood <[EMAIL PROTECTED]>
+
+ * src/today-pim-summary.c:
+ (today_pim_summary_tasks_selection_changed_cb): Update binary name for
+ openmoko-tasks
+
2007-09-28 Chris Lord <[EMAIL PROTECTED]>
* src/today-task-manager.c: (get_utf8_property),
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-pim-summary.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-pim-summary.c
2007-10-03 12:30:29 UTC (rev 3075)
+++
trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-pim-summary.c
2007-10-04 10:04:00 UTC (rev 3076)
@@ -130,7 +130,7 @@
if (gtk_tree_selection_count_selected_rows (selection)) {
gtk_tree_selection_unselect_all (selection);
launcher_start (data->window, today_get_launcher (
- (const gchar *[]){ "openmoko-tasks", NULL },
+ (const gchar *[]){ "tasks", NULL },
TRUE, TRUE));
}
}
--- End Message ---
--- Begin Message ---
Author: chris
Date: 2007-10-04 12:16:48 +0200 (Thu, 04 Oct 2007)
New Revision: 3077
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-pim-journal.c
Log:
* src/today-pim-journal.c:
Fix bug #901, thanks to Roman Moravcik
Modified: trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
2007-10-04 10:04:00 UTC (rev 3076)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
2007-10-04 10:16:48 UTC (rev 3077)
@@ -1,3 +1,10 @@
+2007-10-04 Chris Lord <[EMAIL PROTECTED]>
+
+ * src/today-pim-journal.c: (today_pim_journal_entry_changed),
+ (today_pim_journal_entry_added_cb),
+ (today_pim_journal_entry_removed_cb):
+ Fix bug #901, thanks to Roman Moravcik
+
2007-10-04 Thomas Wood <[EMAIL PROTECTED]>
* src/today-pim-summary.c:
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-pim-journal.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-pim-journal.c
2007-10-04 10:04:00 UTC (rev 3076)
+++
trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-pim-journal.c
2007-10-04 10:16:48 UTC (rev 3077)
@@ -39,19 +39,27 @@
}
static void
-today_pim_journal_entry_added_cb (MokoJournal *journal,
- MokoJournalEntry *entry,
- TodayData *data)
+today_pim_journal_entry_changed (MokoJournal *journal,
+ MokoJournalEntry *entry,
+ TodayData *data,
+ gint added)
{
+ MessageDirection dir;
+
switch (moko_journal_entry_get_entry_type (entry)) {
case SMS_JOURNAL_ENTRY :
case EMAIL_JOURNAL_ENTRY :
- data->n_unread_messages ++;
+ data->n_unread_messages += added;
today_pim_journal_update_messages (data);
break;
case VOICE_JOURNAL_ENTRY :
- data->n_missed_calls ++;
- today_pim_journal_update_messages (data);
+ moko_journal_entry_get_direction (entry, &dir);
+ if (dir == DIRECTION_IN) {
+ if (moko_journal_voice_info_get_was_missed (entry)) {
+ data->n_missed_calls += added;
+ today_pim_journal_update_messages (data);
+ }
+ }
break;
default :
break;
@@ -59,23 +67,19 @@
}
static void
+today_pim_journal_entry_added_cb (MokoJournal *journal,
+ MokoJournalEntry *entry,
+ TodayData *data)
+{
+ today_pim_journal_entry_changed (journal, entry, data, 1);
+}
+
+static void
today_pim_journal_entry_removed_cb (MokoJournal *journal,
MokoJournalEntry *entry,
TodayData *data)
{
- switch (moko_journal_entry_get_entry_type (entry)) {
- case SMS_JOURNAL_ENTRY :
- case EMAIL_JOURNAL_ENTRY :
- data->n_unread_messages --;
- today_pim_journal_update_messages (data);
- break;
- case VOICE_JOURNAL_ENTRY :
- data->n_missed_calls --;
- today_pim_journal_update_messages (data);
- break;
- default :
- break;
- }
+ today_pim_journal_entry_changed (journal, entry, data, -1);
}
static void
--- End Message ---
--- Begin Message ---
Author: chris
Date: 2007-10-04 13:08:44 +0200 (Thu, 04 Oct 2007)
New Revision: 3078
Modified:
trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog
trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-finger-scroll.c
Log:
* libmokoui/moko-finger-scroll.c:
Really don't allow clicks after scrolling has begun, fix crash when
destroying widget while scrolling timeout is active
Modified: trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog 2007-10-04
10:16:48 UTC (rev 3077)
+++ trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog 2007-10-04
11:08:44 UTC (rev 3078)
@@ -1,3 +1,12 @@
+2007-10-04 Chris Lord <[EMAIL PROTECTED]>
+
+ * libmokoui/moko-finger-scroll.c: (moko_finger_scroll_timeout),
+ (moko_finger_scroll_motion_notify_cb),
+ (moko_finger_scroll_button_release_cb),
+ (moko_finger_scroll_dispose):
+ Really don't allow clicks after scrolling has begun, fix crash when
+ destroying widget while scrolling timeout is active
+
2007-10-01 Chris Lord <[EMAIL PROTECTED]>
* libmokoui/moko-finger-scroll.c: (moko_finger_scroll_get_topmost),
Modified:
trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-finger-scroll.c
===================================================================
---
trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-finger-scroll.c
2007-10-04 10:16:48 UTC (rev 3077)
+++
trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-finger-scroll.c
2007-10-04 11:08:44 UTC (rev 3078)
@@ -66,6 +66,7 @@
gint iy;
gint cx; /* Initial click child window mouse co-ordinates */
gint cy;
+ guint idle_id;
GtkWidget *align;
gboolean hscroll;
@@ -345,13 +346,18 @@
MokoFingerScrollPrivate *priv = FINGER_SCROLL_PRIVATE (scroll);
if ((!priv->enabled) ||
- (priv->mode != MOKO_FINGER_SCROLL_MODE_ACCEL)) return FALSE;
+ (priv->mode != MOKO_FINGER_SCROLL_MODE_ACCEL)) {
+ priv->idle_id = 0;
+ return FALSE;
+ }
if (!priv->clicked) {
/* Decelerate gradually when pointer is raised */
priv->vel_x *= priv->decel;
priv->vel_y *= priv->decel;
- if ((ABS (priv->vel_x) < 1.0) && (ABS (priv->vel_y) < 1.0))
+ if ((ABS (priv->vel_x) < 1.0) && (ABS (priv->vel_y) < 1.0)) {
+ priv->idle_id = 0;
return FALSE;
+ }
}
moko_finger_scroll_scroll (scroll, priv->vel_x, priv->vel_y, &sx, &sy);
@@ -390,7 +396,8 @@
(ABS (x) > dnd_threshold) || (ABS (y) > dnd_threshold))) {
priv->moved = TRUE;
if (priv->mode == MOKO_FINGER_SCROLL_MODE_ACCEL) {
- g_timeout_add ((gint)(1000.0/(gdouble)priv->sps),
+ priv->idle_id = g_timeout_add (
+ (gint)(1000.0/(gdouble)priv->sps),
(GSourceFunc)moko_finger_scroll_timeout,
scroll);
}
@@ -461,7 +468,6 @@
g_get_current_time (¤t);
priv->clicked = FALSE;
- priv->moved = FALSE;
child = moko_finger_scroll_get_topmost (
GTK_BIN (priv->align)->child->window,
@@ -470,7 +476,10 @@
event->x = x;
event->y = y;
- if (!priv->child) return TRUE;
+ if (!priv->child) {
+ priv->moved = FALSE;
+ return TRUE;
+ }
/* Leave the widget if we've moved - This doesn't break selection,
* but stops buttons from being clicked.
@@ -493,6 +502,8 @@
if (priv->child)
g_object_remove_weak_pointer ((GObject *)priv->child,
&priv->child);
+
+ priv->moved = FALSE;
return TRUE;
}
@@ -674,6 +685,13 @@
static void
moko_finger_scroll_dispose (GObject * object)
{
+ MokoFingerScrollPrivate *priv = FINGER_SCROLL_PRIVATE (object);
+
+ if (priv->idle_id) {
+ g_source_remove (priv->idle_id);
+ priv->idle_id = 0;
+ }
+
if (G_OBJECT_CLASS (moko_finger_scroll_parent_class)->dispose)
G_OBJECT_CLASS (moko_finger_scroll_parent_class)->
dispose (object);
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-10-04 13:10:11 +0200 (Thu, 04 Oct 2007)
New Revision: 3079
Added:
trunk/src/target/OM-2007.2/libraries/libmokojournal2/doc/
trunk/src/target/OM-2007.2/libraries/libmokojournal2/doc/Makefile.am
trunk/src/target/OM-2007.2/libraries/libmokojournal2/doc/reference/
trunk/src/target/OM-2007.2/libraries/libmokojournal2/doc/reference/Makefile.am
trunk/src/target/OM-2007.2/libraries/libmokojournal2/doc/reference/libmokojournal-docs.sgml
trunk/src/target/OM-2007.2/libraries/libmokojournal2/doc/reference/version.xml.in
Modified:
trunk/src/target/OM-2007.2/libraries/libmokojournal2/ChangeLog
trunk/src/target/OM-2007.2/libraries/libmokojournal2/Makefile.am
trunk/src/target/OM-2007.2/libraries/libmokojournal2/autogen.sh
trunk/src/target/OM-2007.2/libraries/libmokojournal2/configure.ac
Log:
* Makefile.am:
* autogen.sh:
* configure.ac:
* doc/reference/Makefile.am:
* doc/reference/libmokojournal-docs.sgml:
Add gtk-doc support
Modified: trunk/src/target/OM-2007.2/libraries/libmokojournal2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokojournal2/ChangeLog
2007-10-04 11:08:44 UTC (rev 3078)
+++ trunk/src/target/OM-2007.2/libraries/libmokojournal2/ChangeLog
2007-10-04 11:10:11 UTC (rev 3079)
@@ -1,3 +1,13 @@
+2007-10-04 Thomas Wood <[EMAIL PROTECTED]>
+
+ * Makefile.am:
+ * autogen.sh:
+ * configure.ac:
+ * doc/reference/Makefile.am:
+ * doc/reference/libmokojournal-docs.sgml:
+
+ Add gtk-doc support
+
2007-08-22 Holger Freyther <[EMAIL PROTECTED]>
Rubberstamped by Mickey.
Modified: trunk/src/target/OM-2007.2/libraries/libmokojournal2/Makefile.am
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokojournal2/Makefile.am
2007-10-04 11:08:44 UTC (rev 3078)
+++ trunk/src/target/OM-2007.2/libraries/libmokojournal2/Makefile.am
2007-10-04 11:10:11 UTC (rev 3079)
@@ -1,4 +1,4 @@
-SUBDIRS = mokojournal mokojournal-tool tests
+SUBDIRS = mokojournal mokojournal-tool tests doc
pcdata_DATA= libmokojournal2.pc
pcdatadir= $(libdir)/pkgconfig
Modified: trunk/src/target/OM-2007.2/libraries/libmokojournal2/autogen.sh
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokojournal2/autogen.sh
2007-10-04 11:08:44 UTC (rev 3078)
+++ trunk/src/target/OM-2007.2/libraries/libmokojournal2/autogen.sh
2007-10-04 11:10:11 UTC (rev 3079)
@@ -1,4 +1,5 @@
#! /bin/sh
+gtkdocize || exit 1
autoreconf -v --install || exit 1
glib-gettextize --force --copy || exit 1
./configure --enable-maintainer-mode "$@"
Modified: trunk/src/target/OM-2007.2/libraries/libmokojournal2/configure.ac
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokojournal2/configure.ac
2007-10-04 11:08:44 UTC (rev 3078)
+++ trunk/src/target/OM-2007.2/libraries/libmokojournal2/configure.ac
2007-10-04 11:10:11 UTC (rev 3079)
@@ -35,6 +35,8 @@
AC_SUBST(LIBS)
+GTK_DOC_CHECK([1.4])
+
# output stuff
AC_OUTPUT([
Makefile
@@ -42,6 +44,9 @@
mokojournal/Makefile
mokojournal-tool/Makefile
tests/Makefile
+doc/Makefile
+doc/reference/Makefile
+doc/reference/version.xml
])
echo "CFLAGS = $CFLAGS"
Added: trunk/src/target/OM-2007.2/libraries/libmokojournal2/doc/Makefile.am
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokojournal2/doc/Makefile.am
2007-10-04 11:08:44 UTC (rev 3078)
+++ trunk/src/target/OM-2007.2/libraries/libmokojournal2/doc/Makefile.am
2007-10-04 11:10:11 UTC (rev 3079)
@@ -0,0 +1 @@
+SUBDIRS=reference
Added:
trunk/src/target/OM-2007.2/libraries/libmokojournal2/doc/reference/Makefile.am
===================================================================
---
trunk/src/target/OM-2007.2/libraries/libmokojournal2/doc/reference/Makefile.am
2007-10-04 11:08:44 UTC (rev 3078)
+++
trunk/src/target/OM-2007.2/libraries/libmokojournal2/doc/reference/Makefile.am
2007-10-04 11:10:11 UTC (rev 3079)
@@ -0,0 +1,87 @@
+## Process this file with automake to produce Makefile.in
+
+# We require automake 1.6 at least.
+AUTOMAKE_OPTIONS = 1.6
+
+# This is a blank Makefile.am for using gtk-doc.
+# Copy this to your project's API docs directory and modify the variables to
+# suit your project. See the GTK+ Makefiles in gtk+/docs/reference for examples
+# of using the various options.
+
+# The name of the module, e.g. 'glib'.
+DOC_MODULE=libmokojournal
+
+# The top-level SGML file. You can change this if you want to.
+DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
+
+# The directory containing the source code. Relative to $(srcdir).
+# gtk-doc will search all .c & .h files beneath here for inline comments
+# documenting the functions and macros.
+# e.g. DOC_SOURCE_DIR=../../../gtk
+DOC_SOURCE_DIR=../../mokojournal
+
+# Extra options to pass to gtkdoc-scangobj. Not normally needed.
+SCANGOBJ_OPTIONS=
+
+# Extra options to supply to gtkdoc-scan.
+# e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"
+SCAN_OPTIONS=
+
+# Extra options to supply to gtkdoc-mkdb.
+# e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml
+MKDB_OPTIONS=--sgml-mode --output-format=xml
+
+# Extra options to supply to gtkdoc-mktmpl
+# e.g. MKTMPL_OPTIONS=--only-section-tmpl
+MKTMPL_OPTIONS=
+
+# Extra options to supply to gtkdoc-fixref. Not normally needed.
+# e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html
+FIXXREF_OPTIONS=
+
+# Used for dependencies. The docs will be rebuilt if any of these change.
+# e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
+# e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
+HFILE_GLOB=$(top_srcdir)/mokojournal/*.h
+CFILE_GLOB=$(top_srcdir)/mokojournal/*.c
+
+# Header files to ignore when scanning.
+# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
+IGNORE_HFILES=
+
+# Images to copy into HTML directory.
+# e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
+HTML_IMAGES=
+
+# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
+# e.g. content_files=running.sgml building.sgml changes-2.0.sgml
+content_files=version.xml
+
+# SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
+# These files must be listed here *and* in content_files
+# e.g. expand_content_files=running.sgml
+expand_content_files=
+
+# CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library.
+# Only needed if you are using gtkdoc-scangobj to dynamically query widget
+# signals and properties.
+# e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
+# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
+INCLUDES=-I$(top_scrdir) $(CFLAGS)
+GTKDOC_LIBS=$(LIBS) $(top_builddir)/mokojournal/libmokojournal2.la
+
+# This includes the standard gtk-doc make rules, copied by gtkdocize.
+include $(top_srcdir)/gtk-doc.make
+
+# Other files to distribute
+# e.g. EXTRA_DIST += version.xml.in
+EXTRA_DIST = version.xml.in
+
+# Files not to distribute
+# for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types
+# for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt
+#DISTCLEANFILES +=
+
+# Comment this out if you want your docs-status tested during 'make check'
+#TESTS = $(GTKDOC_CHECK)
+
Added:
trunk/src/target/OM-2007.2/libraries/libmokojournal2/doc/reference/libmokojournal-docs.sgml
===================================================================
---
trunk/src/target/OM-2007.2/libraries/libmokojournal2/doc/reference/libmokojournal-docs.sgml
2007-10-04 11:08:44 UTC (rev 3078)
+++
trunk/src/target/OM-2007.2/libraries/libmokojournal2/doc/reference/libmokojournal-docs.sgml
2007-10-04 11:10:11 UTC (rev 3079)
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd";>
+<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude";>
+ <bookinfo>
+ <title>libmokojournal Reference Manual</title>
+<!--
+ <releaseinfo>
+ for libmokojournal [VERSION]
+ The latest version of this documentation can be found on-line at
+ <ulink role="online-location"
url="http://[SERVER]/libmokojournal/index.html";>http://[SERVER]/libmokojournal/</ulink>.
+ </releaseinfo>
+ -->
+ </bookinfo>
+
+ <chapter>
+ <title>libmokojournal2</title>
+ <xi:include href="xml/moko-journal.xml"/>
+ <xi:include href="xml/moko-time-priv.xml"/>
+ <xi:include href="xml/moko-time.xml"/>
+ </chapter>
+</book>
Added:
trunk/src/target/OM-2007.2/libraries/libmokojournal2/doc/reference/version.xml.in
===================================================================
---
trunk/src/target/OM-2007.2/libraries/libmokojournal2/doc/reference/version.xml.in
2007-10-04 11:08:44 UTC (rev 3078)
+++
trunk/src/target/OM-2007.2/libraries/libmokojournal2/doc/reference/version.xml.in
2007-10-04 11:10:11 UTC (rev 3079)
@@ -0,0 +1 @@
[EMAIL PROTECTED]@
--- End Message ---
--- Begin Message ---
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 <[EMAIL PROTECTED]>
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 <[EMAIL PROTECTED]>
+
+ 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 <[EMAIL PROTECTED]>
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") );
--- End Message ---
--- Begin Message ---
Author: abraxa
Date: 2007-10-04 15:14:05 +0200 (Thu, 04 Oct 2007)
New Revision: 3081
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/guitools.c
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/guitools.h
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/main.c
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/playback.c
Log:
Make sure the error dialog is readable if gst-plugin-pulse is missing and exit
gracefully afterwards
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/guitools.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/guitools.c
2007-10-04 13:11:15 UTC (rev 3080)
+++
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/guitools.c
2007-10-04 13:14:05 UTC (rev 3081)
@@ -133,7 +133,7 @@
}
/**
- * Presents a simple modal error dialog to the user
+ * Presents a simple non-modal error dialog to the user
*/
void
error_dialog(gchar *message)
@@ -152,6 +152,25 @@
}
/**
+ * Presents a simple modal error dialog to the user
+ */
+void
+error_dialog_modal(gchar *message)
+{
+ GtkWidget *dialog;
+
+ dialog = gtk_message_dialog_new(0,
+ GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR,
GTK_BUTTONS_OK,
+ "%s", message);
+
+ // We don't want a title of "<unnamed>"
+ gtk_window_set_title(GTK_WINDOW(dialog), " ");
+
+ gtk_dialog_run(dialog);
+ gtk_widget_destroy(dialog);
+}
+
+/**
* Loads an image from disk and adds it to a given container, returning a
reference to the image as well
*/
void
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/guitools.h
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/guitools.h
2007-10-04 13:11:15 UTC (rev 3080)
+++
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/guitools.h
2007-10-04 13:14:05 UTC (rev 3081)
@@ -40,6 +40,7 @@
GtkWidget *button_create_with_image(gchar *image_name, GtkWidget **image,
GCallback callback);
void error_dialog(gchar *message);
+void error_dialog_modal(gchar *message);
void container_add_image_with_ref(GtkContainer *container, gchar *image_name,
GtkWidget **image);
void container_add_image(GtkContainer *container, gchar *image_name);
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/main.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/main.c
2007-10-04 13:11:15 UTC (rev 3080)
+++ trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/main.c
2007-10-04 13:14:05 UTC (rev 3081)
@@ -403,7 +403,7 @@
omp_session_init();
omp_config_init();
omp_window_create();
- omp_playback_init();
+ if (!omp_playback_init()) return EXIT_FAILURE;
omp_playlist_init();
omp_window_create_pages();
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/playback.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/playback.c
2007-10-04 13:11:15 UTC (rev 3080)
+++
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/playback.c
2007-10-04 13:14:05 UTC (rev 3081)
@@ -110,7 +110,7 @@
if (!omp_gst_audiosink)
{
- error_dialog(_("Error: gstreamer failed to create the
PulseAudio sink.\nPlease make sure gstreamer and its modules are properly
installed (esp. gst-plugin-pulse)."));
+ error_dialog_modal(_("Error: gstreamer failed to create the
PulseAudio sink.\nPlease make sure gstreamer and its modules are properly
installed (esp. gst-plugin-pulse)."));
return FALSE;
}
@@ -120,7 +120,7 @@
if (!omp_gst_playbin)
{
- error_dialog(_("Error: gstreamer failed to initialize.\nPlease
make sure gstreamer and its modules are properly installed (esp.
gst-meta-audio)."));
+ error_dialog_modal(_("Error: gstreamer failed to
initialize.\nPlease make sure gstreamer and its modules are properly installed
(esp. gst-meta-audio)."));
return FALSE;
}
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
