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. r2982 - trunk/src/target/OM-2007.2/artwork/sounds
([EMAIL PROTECTED])
2. r2983 - trunk/src/host/qemu-neo1973/hw ([EMAIL PROTECTED])
3. r2984 - trunk/src/host/qemu-neo1973 ([EMAIL PROTECTED])
4. r2985 - trunk/src/target/OM-2007.2/applications
([EMAIL PROTECTED])
5. r2986 - trunk/src/target/OM-2007.2/applications
([EMAIL PROTECTED])
6. r2987 - in
trunk/src/target/OM-2007.2/applications/openmoko-browser2: . m4
po src ([EMAIL PROTECTED])
7. r2988 - in
trunk/src/target/OM-2007.2/applications/openmoko-browser2: . po
src ([EMAIL PROTECTED])
8. r2989 - in
trunk/src/target/OM-2007.2/applications/openmoko-browser2: . src
([EMAIL PROTECTED])
--- Begin Message ---
Author: mickey
Date: 2007-09-17 17:55:56 +0200 (Mon, 17 Sep 2007)
New Revision: 2982
Modified:
trunk/src/target/OM-2007.2/artwork/sounds/touchscreen_click.wav
Log:
OM 2007.2: make touchscreen wav less intrusive (compromise)
Modified: trunk/src/target/OM-2007.2/artwork/sounds/touchscreen_click.wav
===================================================================
(Binary files differ)
--- End Message ---
--- Begin Message ---
Author: andrew
Date: 2007-09-17 19:36:09 +0200 (Mon, 17 Sep 2007)
New Revision: 2983
Modified:
trunk/src/host/qemu-neo1973/hw/usb-hid.c
Log:
Pass correct pointer to HID keyboard event handler, fixes regression from IDLE
mode introduction.
Modified: trunk/src/host/qemu-neo1973/hw/usb-hid.c
===================================================================
--- trunk/src/host/qemu-neo1973/hw/usb-hid.c 2007-09-17 15:55:56 UTC (rev
2982)
+++ trunk/src/host/qemu-neo1973/hw/usb-hid.c 2007-09-17 17:36:09 UTC (rev
2983)
@@ -582,7 +582,7 @@
{
USBHIDState *s = (USBHIDState *)dev;
- qemu_add_kbd_event_handler(usb_keyboard_event, &s->kbd);
+ qemu_add_kbd_event_handler(usb_keyboard_event, s);
s->protocol = 1;
}
--- End Message ---
--- Begin Message ---
Author: andrew
Date: 2007-09-17 23:38:44 +0200 (Mon, 17 Sep 2007)
New Revision: 2984
Modified:
trunk/src/host/qemu-neo1973/usb-linux-gadget.c
trunk/src/host/qemu-neo1973/vl.c
Log:
Force SIGALARM based timers when -usbgadget is used, for now (until gadgetfs
does AIO).
Modified: trunk/src/host/qemu-neo1973/usb-linux-gadget.c
===================================================================
--- trunk/src/host/qemu-neo1973/usb-linux-gadget.c 2007-09-17 17:36:09 UTC
(rev 2983)
+++ trunk/src/host/qemu-neo1973/usb-linux-gadget.c 2007-09-17 21:38:44 UTC
(rev 2984)
@@ -211,7 +211,7 @@
return;
#endif
- /* write() is supposed to not block here */
+ /* write() is supposed to not block here (but it does :-/ ) */
if (write(ep->fd, ep->buffer, 0))
return;
Modified: trunk/src/host/qemu-neo1973/vl.c
===================================================================
--- trunk/src/host/qemu-neo1973/vl.c 2007-09-17 17:36:09 UTC (rev 2983)
+++ trunk/src/host/qemu-neo1973/vl.c 2007-09-17 21:38:44 UTC (rev 2984)
@@ -905,7 +905,7 @@
while (name) {
struct qemu_alarm_timer tmp;
- for (i = 0; i < count; i++) {
+ for (i = 0; i < count && alarm_timers[i].name; i++) {
if (!strcmp(alarm_timers[i].name, name))
break;
}
@@ -8243,6 +8243,17 @@
break;
case QEMU_OPTION_usbgadget:
usbgadget_enabled = 1;
+ /* XXX: Force the "unix" alarm to be used because usbgadget
+ * needs SIGALARM to interrupt the blocking read()s and
+ * write()s until it is rewritten to use AIO - there's no
+ * other way to get non-blocking IO on gadgetfs. */
+ memset(alarm_timers, 0, sizeof(alarm_timers));
+ alarm_timers->name = "unix";
+ alarm_timers->flags = 0;
+ alarm_timers->start = unix_start_timer;
+ alarm_timers->stop = unix_stop_timer;
+ alarm_timers->rearm = 0;
+ alarm_timers->priv = 0;
break;
case QEMU_OPTION_smp:
smp_cpus = atoi(optarg);
--- End Message ---
--- Begin Message ---
Author: zecke
Date: 2007-09-18 03:23:32 +0200 (Tue, 18 Sep 2007)
New Revision: 2985
Added:
trunk/src/target/OM-2007.2/applications/openmoko-browser/
Log:
Add a meaningless directory.
--- End Message ---
--- Begin Message ---
Author: zecke
Date: 2007-09-18 03:25:25 +0200 (Tue, 18 Sep 2007)
New Revision: 2986
Added:
trunk/src/target/OM-2007.2/applications/openmoko-browser2/
Removed:
trunk/src/target/OM-2007.2/applications/openmoko-browser/
Log:
Version 1 is complete, let us start the 2nd one
Copied: trunk/src/target/OM-2007.2/applications/openmoko-browser2 (from rev
2985, trunk/src/target/OM-2007.2/applications/openmoko-browser)
--- End Message ---
--- Begin Message ---
Author: zecke
Date: 2007-09-18 03:40:23 +0200 (Tue, 18 Sep 2007)
New Revision: 2987
Added:
trunk/src/target/OM-2007.2/applications/openmoko-browser2/AUTHORS
trunk/src/target/OM-2007.2/applications/openmoko-browser2/COPYING
trunk/src/target/OM-2007.2/applications/openmoko-browser2/Makefile.am
trunk/src/target/OM-2007.2/applications/openmoko-browser2/NEWS
trunk/src/target/OM-2007.2/applications/openmoko-browser2/README
trunk/src/target/OM-2007.2/applications/openmoko-browser2/autogen.sh
trunk/src/target/OM-2007.2/applications/openmoko-browser2/configure.ac
trunk/src/target/OM-2007.2/applications/openmoko-browser2/m4/
trunk/src/target/OM-2007.2/applications/openmoko-browser2/m4/check.m4
trunk/src/target/OM-2007.2/applications/openmoko-browser2/po/
trunk/src/target/OM-2007.2/applications/openmoko-browser2/po/LINGUAS
trunk/src/target/OM-2007.2/applications/openmoko-browser2/po/POTFILES.in
trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/
trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/Makefile.am
trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/main.c
Log:
2007-09-07 Holger Freyther <[EMAIL PROTECTED]>
Add buildsystem and stubs for the OpenMoko browser
* AUTHORS: Added.
* COPYING: Added.
* Makefile.am: Added.
* NEWS: Added.
* README: Added.
* autogen.sh: Added.
* configure.ac: Added.
* m4/check.m4: Added.
* po/LINGUAS: Added.
* po/POTFILES.in: Added.
* src/Makefile.am: Added.
* src/main.c: Added.
Added: trunk/src/target/OM-2007.2/applications/openmoko-browser2/AUTHORS
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/AUTHORS
2007-09-18 01:25:25 UTC (rev 2986)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/AUTHORS
2007-09-18 01:40:23 UTC (rev 2987)
@@ -0,0 +1 @@
+Holger Hans Peter Freyther
Added: trunk/src/target/OM-2007.2/applications/openmoko-browser2/COPYING
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/COPYING
2007-09-18 01:25:25 UTC (rev 2986)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/COPYING
2007-09-18 01:40:23 UTC (rev 2987)
@@ -0,0 +1,18 @@
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
Added: trunk/src/target/OM-2007.2/applications/openmoko-browser2/Makefile.am
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/Makefile.am
2007-09-18 01:25:25 UTC (rev 2986)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/Makefile.am
2007-09-18 01:40:23 UTC (rev 2987)
@@ -0,0 +1,2 @@
+SUBDIRS = src po
+
Added: trunk/src/target/OM-2007.2/applications/openmoko-browser2/NEWS
===================================================================
Added: trunk/src/target/OM-2007.2/applications/openmoko-browser2/README
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/README
2007-09-18 01:25:25 UTC (rev 2986)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/README
2007-09-18 01:40:23 UTC (rev 2987)
@@ -0,0 +1,38 @@
+==== New Design (Plan) ====
+
+ * Feed Handling is a Model
+ * We provide a renderer
+ * And the sort and filter model on top of it.
+ * Generic View to show any two of the available types
+ * So that searching and filtering is easy.
+ * The searched string gets highlighted when switching to the text view
+ * TextView is going to use WebKit
+ * We need a nice HTML header for the text
+ * And use CSS to use max-width for the images of the feeds
+ * Changing next/previous, should be easy...
+ * Configuration
+ * Inline editing of account settings, similiar to contact
+ * URL, Name, Poll Interval, Authentication, Number of items to
Cache
+
+
+ TODO:
+ * How to do unread/read handling?
+
+
+==== History =====
+
+First try to get a Gtk+ GUI for libmrss
+
+
+Known design flaws:
+ -No real model for the feed
+ -No proxy model that makes use of the filter
+ -No caching of images
+ -Storage size is not limited
+ -There is no way to merge feed entries from two planets... instead two
entries will be presented
+ (this is another reason for a better model)
+ -Separate MRSS, Model and CellRender allocation into a model manager class
which
+ knows the secret of the used types, the to be used cell renderer and the
sort
+
+Main objective:
+ -Get familiar with the joy/pain of Gtk+
Added: trunk/src/target/OM-2007.2/applications/openmoko-browser2/autogen.sh
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/autogen.sh
2007-09-18 01:25:25 UTC (rev 2986)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/autogen.sh
2007-09-18 01:40:23 UTC (rev 2987)
@@ -0,0 +1,23 @@
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+REQUIRED_AUTOMAKE_VERSION=1.8
+PKG_NAME=openmoko-browser
+ACLOCAL_FLAGS="-I m4"
+
+(test -f $srcdir/configure.ac \
+ && test -f $srcdir/src/main.c) || {
+ echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+ echo " top-level $PKG_NAME directory"
+ exit 1
+}
+
+
+which gnome-autogen.sh || {
+ echo "You need to install gnome-common from the GNOME CVS"
+ exit 1
+}
+USE_GNOME2_MACROS=1 . gnome-autogen.sh
+
Property changes on:
trunk/src/target/OM-2007.2/applications/openmoko-browser2/autogen.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/src/target/OM-2007.2/applications/openmoko-browser2/configure.ac
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/configure.ac
2007-09-18 01:25:25 UTC (rev 2986)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/configure.ac
2007-09-18 01:40:23 UTC (rev 2987)
@@ -0,0 +1,53 @@
+AC_PREREQ([2.59])
+AC_INIT([openmoko-browser], [0.0.1], [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)
+
+AC_PROG_CC
+AC_STDC_HEADERS
+AC_PROG_LIBTOOL
+
+#i18n
+AC_PROG_INTLTOOL([0.23])
+GETTEXT_PACKAGE=openmoko-browser
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package])
+AC_SUBST(GETTEXT_PACKAGE)
+AM_GLIB_GNU_GETTEXT
+
+# unit testing (inspired by opensync)
+# enable gcov profiling
+GCOV_CPPFLAGS=""
+GCOV_LDFLAGS=""
+AC_ARG_ENABLE([profiling],
+ [AS_HELP_STRING([--enable-profiling], [enable gcov profiling])],
+ [case "${enableval}" in
+ yes) GCOV_PROFILING="yes"
+ GCOV_CPPFLAGS="-ftest-coverage -fprofile-arcs"
+ GCOV_LDFLAGS="-lgcov"
+ ;;
+ no) ;;
+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-profiling]) ;;
+ esac],[GCOV_PROFILING="no"])
+AC_SUBST(GCOV_CPPFLAGS)
+AC_SUBST(GCOV_LDFLAGS)
+AM_CONDITIONAL(ENABLE_PROFILING, test "x${GCOV_PROFILING}" = "xyes")
+
+#check for check
+AM_PATH_CHECK([0.9.2], [ENABLE_TESTING="yes"], [ENABLE_TESTING="no"])
+AM_CONDITIONAL(ENABLE_TESTING, test "x${ENABLE_TESTING}" = "xyes")
+
+# base deps
+PKG_CHECK_MODULES(OPENMOKO, libmokoui2 >= 0.1.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
+src/Makefile
+po/Makefile.in
+])
Added: trunk/src/target/OM-2007.2/applications/openmoko-browser2/m4/check.m4
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/m4/check.m4
2007-09-18 01:25:25 UTC (rev 2986)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/m4/check.m4
2007-09-18 01:40:23 UTC (rev 2987)
@@ -0,0 +1,132 @@
+dnl AM_PATH_CHECK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+dnl Test for check, and define CHECK_CFLAGS and CHECK_LIBS
+dnl
+
+AC_DEFUN([AM_PATH_CHECK],
+[
+ AC_MSG_WARN([A@&[EMAIL PROTECTED]() is deprecated])
+ AC_MSG_WARN([[use P@&[EMAIL PROTECTED]([CHECK], [check >= 0.9.4]) instead]])
+ AC_ARG_WITH([check],
+ [ --with-check=PATH prefix where check is installed [default=auto]])
+
+ min_check_version=ifelse([$1], ,0.8.2,$1)
+
+ AC_MSG_CHECKING(for check - version >= $min_check_version)
+
+ if test x$with_check = xno; then
+ AC_MSG_RESULT(disabled)
+ ifelse([$3], , AC_MSG_ERROR([disabling check is not supported]), [$3])
+ else
+ if test "x$with_check" != x; then
+ CHECK_CFLAGS="-I$with_check/include"
+ CHECK_LIBS="-L$with_check/lib -lcheck"
+ else
+ CHECK_CFLAGS=""
+ CHECK_LIBS="-lcheck"
+ fi
+
+ ac_save_CFLAGS="$CFLAGS"
+ ac_save_LIBS="$LIBS"
+
+ CFLAGS="$CFLAGS $CHECK_CFLAGS"
+ LIBS="$CHECK_LIBS $LIBS"
+
+ rm -f conf.check-test
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([AC_INCLUDES_DEFAULT([])
+#include <check.h>
+
+int main ()
+{
+ int major, minor, micro;
+ char *tmp_version;
+
+ system ("touch conf.check-test");
+
+ /* HP/UX 9 ([EMAIL PROTECTED]) writes to sscanf strings */
+ tmp_version = strdup("$min_check_version");
+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
+ printf("%s, bad version string\n", "$min_check_version");
+ return 1;
+ }
+
+ if ((CHECK_MAJOR_VERSION != check_major_version) ||
+ (CHECK_MINOR_VERSION != check_minor_version) ||
+ (CHECK_MICRO_VERSION != check_micro_version))
+ {
+ printf("\n*** The check header file (version %d.%d.%d) does not match\n",
+ CHECK_MAJOR_VERSION, CHECK_MINOR_VERSION, CHECK_MICRO_VERSION);
+ printf("*** the check library (version %d.%d.%d).\n",
+ check_major_version, check_minor_version, check_micro_version);
+ return 1;
+ }
+
+ if ((check_major_version > major) ||
+ ((check_major_version == major) && (check_minor_version > minor)) ||
+ ((check_major_version == major) && (check_minor_version == minor) &&
(check_micro_version >= micro)))
+ {
+ return 0;
+ }
+ else
+ {
+ printf("\n*** An old version of check (%d.%d.%d) was found.\n",
+ check_major_version, check_minor_version, check_micro_version);
+ printf("*** You need a version of check being at least %d.%d.%d.\n",
major, minor, micro);
+ printf("***\n");
+ printf("*** If you have already installed a sufficiently new version,
this error\n");
+ printf("*** probably means that the wrong copy of the check library and
header\n");
+ printf("*** file is being found. Rerun configure with the
--with-check=PATH option\n");
+ printf("*** to specify the prefix where the correct version was
installed.\n");
+ }
+
+ return 1;
+}
+])],, no_check=yes, [echo $ac_n "cross compiling; assumed OK... $ac_c"])
+
+ CFLAGS="$ac_save_CFLAGS"
+ LIBS="$ac_save_LIBS"
+
+ if test "x$no_check" = x ; then
+ AC_MSG_RESULT(yes)
+ ifelse([$2], , :, [$2])
+ else
+ AC_MSG_RESULT(no)
+ if test -f conf.check-test ; then
+ :
+ else
+ echo "*** Could not run check test program, checking why..."
+ CFLAGS="$CFLAGS $CHECK_CFLAGS"
+ LIBS="$CHECK_LIBS $LIBS"
+ AC_TRY_LINK([
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <check.h>
+], , [ echo "*** The test program compiled, but did not run. This usually
means"
+ echo "*** that the run-time linker is not finding check. You'll need
to set your"
+ echo "*** LD_LIBRARY_PATH environment variable, or edit
/etc/ld.so.conf to point"
+ echo "*** to the installed location Also, make sure you have run
ldconfig if that"
+ echo "*** is required on your system"
+ echo "***"
+ echo "*** If you have an old version installed, it is best to remove
it, although"
+ echo "*** you may also be able to get things to work by modifying
LD_LIBRARY_PATH"],
+ [ echo "*** The test program failed to compile or link. See the file
config.log for"
+ echo "*** the exact error that occured." ])
+
+ CFLAGS="$ac_save_CFLAGS"
+ LIBS="$ac_save_LIBS"
+ fi
+
+ CHECK_CFLAGS=""
+ CHECK_LIBS=""
+
+ rm -f conf.check-test
+ ifelse([$3], , AC_MSG_ERROR([check not found]), [$3])
+ fi
+
+ AC_SUBST(CHECK_CFLAGS)
+ AC_SUBST(CHECK_LIBS)
+
+ rm -f conf.check-test
+
+ fi
+])
Added: trunk/src/target/OM-2007.2/applications/openmoko-browser2/po/LINGUAS
===================================================================
Added: trunk/src/target/OM-2007.2/applications/openmoko-browser2/po/POTFILES.in
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/po/POTFILES.in
2007-09-18 01:25:25 UTC (rev 2986)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/po/POTFILES.in
2007-09-18 01:40:23 UTC (rev 2987)
@@ -0,0 +1 @@
+src/main.c
Added: trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/Makefile.am
===================================================================
Added: trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/main.c
===================================================================
--- End Message ---
--- Begin Message ---
Author: zecke
Date: 2007-09-18 03:40:26 +0200 (Tue, 18 Sep 2007)
New Revision: 2988
Added:
trunk/src/target/OM-2007.2/applications/openmoko-browser2/.gitignore
trunk/src/target/OM-2007.2/applications/openmoko-browser2/po/.gitignore
trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/.gitignore
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/main.c
Log:
2007-09-16 Holger Hans Peter Freyther <[EMAIL PROTECTED]>
Ignore certain autogenerated files.
* .gitignore: Added.
* configure.ac:
* po/.gitignore: Added.
* src/.gitignore: Added.
Added: trunk/src/target/OM-2007.2/applications/openmoko-browser2/.gitignore
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/.gitignore
2007-09-18 01:40:23 UTC (rev 2987)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/.gitignore
2007-09-18 01:40:26 UTC (rev 2988)
@@ -0,0 +1,15 @@
+stamp*
+Makefile*
+intl*
+config.*
+configure
+*.swp
+aclocal.m4
+autom4te.cache
+*.*~
+depcomp
+install-sh
+libtool
+ltmain.sh
+missing
+mkinstalldirs
Added: trunk/src/target/OM-2007.2/applications/openmoko-browser2/po/.gitignore
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/po/.gitignore
2007-09-18 01:40:23 UTC (rev 2987)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/po/.gitignore
2007-09-18 01:40:26 UTC (rev 2988)
@@ -0,0 +1,16 @@
+stamp*
+Makefile*
+intl*
+config.*
+configure
+*.swp
+aclocal.m4
+autom4te.cache
+*.*~
+depcomp
+install-sh
+libtool
+ltmain.sh
+missing
+mkinstalldirs
+POTFILES
Added: trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/.gitignore
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/.gitignore
2007-09-18 01:40:23 UTC (rev 2987)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/.gitignore
2007-09-18 01:40:26 UTC (rev 2988)
@@ -0,0 +1,19 @@
+stamp*
+Makefile*
+intl*
+config.*
+configure
+*.swp
+aclocal.m4
+autom4te.cache
+*.*~
+depcomp
+install-sh
+libtool
+ltmain.sh
+missing
+mkinstalldirs
+.deps
+*.o
+.libs
+openmoko-browser
Modified: trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/main.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/main.c
2007-09-18 01:40:23 UTC (rev 2987)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/main.c
2007-09-18 01:40:26 UTC (rev 2988)
@@ -0,0 +1,9 @@
+2007-09-16 Holger Hans Peter Freyther <[EMAIL PROTECTED]>
+
+ Ignore certain autogenerated files.
+
+ * .gitignore: Added.
+ * configure.ac:
+ * po/.gitignore: Added.
+ * src/.gitignore: Added.
+
--- End Message ---
--- Begin Message ---
Author: zecke
Date: 2007-09-18 03:40:27 +0200 (Tue, 18 Sep 2007)
New Revision: 2989
Added:
trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/browser-data.h
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-browser2/configure.ac
trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/Makefile.am
trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/main.c
Log:
2007-09-16 Holger Hans Peter Freyther <[EMAIL PROTECTED]>
Create the browser skeleton. It compiles but is not
doing anything useful.
* configure.ac:
* src/Makefile.am:
* src/browser-data.h: Added.
* src/main.c:
(main):
Added: trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog
2007-09-18 01:40:26 UTC (rev 2988)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog
2007-09-18 01:40:27 UTC (rev 2989)
@@ -0,0 +1,20 @@
+2007-09-16 Holger Hans Peter Freyther <[EMAIL PROTECTED]>
+
+ Create the browser skeleton. It compiles but is not
+ doing anything useful.
+
+ * configure.ac:
+ * src/Makefile.am:
+ * src/browser-data.h: Added.
+ * src/main.c:
+ (main):
+
+2007-09-16 Holger Hans Peter Freyther <[EMAIL PROTECTED]>
+
+ Ignore certain autogenerated files.
+
+ * .gitignore: Added.
+ * configure.ac:
+ * po/.gitignore: Added.
+ * src/.gitignore: Added.
+
Modified: trunk/src/target/OM-2007.2/applications/openmoko-browser2/configure.ac
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/configure.ac
2007-09-18 01:40:26 UTC (rev 2988)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/configure.ac
2007-09-18 01:40:27 UTC (rev 2989)
@@ -39,6 +39,7 @@
# base deps
PKG_CHECK_MODULES(OPENMOKO, libmokoui2 >= 0.1.0)
+PKG_CHECK_MODULES(GTHREAD, gthread-2.0 )
PKG_CHECK_MODULES(WEBKITGTK, WebKitGdk)
# glib-genmarshal
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/Makefile.am
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/Makefile.am
2007-09-18 01:40:26 UTC (rev 2988)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/Makefile.am
2007-09-18 01:40:27 UTC (rev 2989)
@@ -0,0 +1,16 @@
+AM_CPPFLAGS = -DDATADIR=\"$(datadir)\" \
+ -DPKGDATADIR=\"$(pkgdatadir)\" \
+ -DBROWSER_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
+
+
+AM_CFLAGS = -Wall -Werror -std=c99 @OPENMOKO_CFLAGS@ @WEBKITGTK_CFLAGS@
@GTHREAD_CFLAGS@
+
+bin_PROGRAMS = openmoko-browser
+
+#EXTRA_DIST =
+openmoko_browser_SOURCES = main.c
+openmoko_browser_LDADD = @OPENMOKO_LIBS@ @WEBKITGTK_LIBS@ @GTHREAD_LIBS@
+
+CLEANFILES = $(stamp_files)
+DISTCLEANFILES = $(stamp_files)
+MAINTAINERCLEANFILES = $(stamp_files)
Added:
trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/browser-data.h
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/browser-data.h
2007-09-18 01:40:26 UTC (rev 2988)
+++
trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/browser-data.h
2007-09-18 01:40:27 UTC (rev 2989)
@@ -0,0 +1,46 @@
+/*
+ * A simple WebBrowser
+ *
+ * Copyright (C) 2007 Holger Hans Peter Freyther
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Current Version: $Rev$ ($Date$) [$Author$]
+ */
+
+#ifndef OPENMOKO_BROWSER_DATA_H
+#define OPENMOKO_BROWSER_DATA_H
+
+#include "webkitgtkpage.h"
+
+/*
+ * representation of one page
+ */
+struct BrowserPage {
+ WebKitGtkPage* webKitPage;
+};
+
+/*
+ * The state of the Browser
+ */
+struct BrowserData {
+ GList* browserPages;
+};
+
+#endif
Modified: trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/main.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/main.c
2007-09-18 01:40:26 UTC (rev 2988)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/main.c
2007-09-18 01:40:27 UTC (rev 2989)
@@ -1,9 +1,72 @@
-2007-09-16 Holger Hans Peter Freyther <[EMAIL PROTECTED]>
+/*
+ * A simple WebBrowser
+ *
+ * Copyright (C) 2007 Holger Hans Peter Freyther
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Current Version: $Rev$ ($Date$) [$Author$]
+ */
- Ignore certain autogenerated files.
+#include "config.h"
+#include "browser-data.h"
- * .gitignore: Added.
- * configure.ac:
- * po/.gitignore: Added.
- * src/.gitignore: Added.
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+#include <webkitgtkglobal.h>
+
+#include <moko-finger-scroll.h>
+#include <moko-stock.h>
+
+#include <stdlib.h>
+
+
+static void setup_ui (struct BrowserData*);
+
+int main (int argc, char** argv)
+{
+ g_debug ("openmoko-browser starting up");
+
+ bindtextdomain (GETTEXT_PACKAGE, BROWSER_LOCALE_DIR);
+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+ textdomain (GETTEXT_PACKAGE);
+
+ g_thread_init (NULL);
+ gdk_threads_init ();
+ gdk_threads_enter ();
+ gtk_init (&argc, &argv);
+ webkit_gtk_init ();
+ moko_stock_register ();
+ g_set_application_name (_("Browser"));
+
+ struct BrowserData* data = g_new (struct BrowserData, 1);
+ setup_ui (data);
+
+ gtk_main ();
+ gdk_threads_leave ();
+ g_free (data);
+
+ return EXIT_SUCCESS;
+}
+
+
+static void setup_ui (struct BrowserData* data)
+{
+}
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
