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. r2389 - trunk/oe/conf/distro/include ([EMAIL PROTECTED])
2. r2390 - in trunk/oe/packages: . mtd mtd/mtd-utils
([EMAIL PROTECTED])
3. r2391 - trunk/oe/packages/linux ([EMAIL PROTECTED])
4. r2392 - trunk/oe/packages/linux ([EMAIL PROTECTED])
5. r2393 - in
trunk/src/target/OM-2007/applications/openmoko-calculator: . po
src ([EMAIL PROTECTED])
--- Begin Message ---
Author: stefan
Date: 2007-07-25 13:27:14 +0200 (Wed, 25 Jul 2007)
New Revision: 2389
Modified:
trunk/oe/conf/distro/include/preferred-openmoko-versions.inc
Log:
* Pin down the rss-reader version until #648 is fixed properly. I would wait
until oe sync instead pulling all the webkit stuff plus deps into our overlay.
Modified: trunk/oe/conf/distro/include/preferred-openmoko-versions.inc
===================================================================
--- trunk/oe/conf/distro/include/preferred-openmoko-versions.inc
2007-07-25 06:20:03 UTC (rev 2388)
+++ trunk/oe/conf/distro/include/preferred-openmoko-versions.inc
2007-07-25 11:27:14 UTC (rev 2389)
@@ -49,7 +49,7 @@
SRCDATE_openmoko-tasks = "now"
SRCDATE_openmoko-today = "now"
SRCDATE_openmoko-messages = "now"
-SRCDATE_openmoko-rssreader = "now"
+SRCDATE_openmoko-rssreader = "20070723"
#
# Stylus Applications
--- End Message ---
--- Begin Message ---
Author: stefan
Date: 2007-07-25 16:15:07 +0200 (Wed, 25 Jul 2007)
New Revision: 2390
Added:
trunk/oe/packages/mtd/
trunk/oe/packages/mtd/mtd-utils-native.inc
trunk/oe/packages/mtd/mtd-utils-native_1.0.0+git.bb
trunk/oe/packages/mtd/mtd-utils-native_1.0.0.bb
trunk/oe/packages/mtd/mtd-utils/
trunk/oe/packages/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-git.patch
trunk/oe/packages/mtd/mtd-utils/fix-ignoreerrors-git.patch
trunk/oe/packages/mtd/mtd-utils/lzo_1x.patch
trunk/oe/packages/mtd/mtd-utils_1.0.0+git.bb
trunk/oe/packages/mtd/mtd-utils_1.0.0.bb
trunk/oe/packages/mtd/oe-sync
Log:
* Copy over all mtd-utils stuff from OE.dev. Fixes #658
Added: trunk/oe/packages/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-git.patch
===================================================================
--- trunk/oe/packages/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-git.patch
2007-07-25 11:27:14 UTC (rev 2389)
+++ trunk/oe/packages/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-git.patch
2007-07-25 14:15:07 UTC (rev 2390)
@@ -0,0 +1,106 @@
+---
+ mkfs.jffs2.c | 45 ++++++++++++++++++++++++++++++++++++++++++---
+ 1 file changed, 42 insertions(+), 3 deletions(-)
+
+Index: git/mkfs.jffs2.c
+===================================================================
+--- git.orig/mkfs.jffs2.c 2007-01-23 15:42:34.000000000 +0000
++++ git/mkfs.jffs2.c 2007-01-23 15:46:08.000000000 +0000
+@@ -97,7 +97,12 @@ struct filesystem_entry {
+ struct filesystem_entry *files; /* Only relevant to directories */
+ };
+
+-
++struct ignorepath_entry {
++ struct ignorepath_entry* next; /* Points to the next ignorepath
element */
++ char name[PATH_MAX]; /* Name of the entry */
++};
++
++static struct ignorepath_entry* ignorepath = 0;
+ static int out_fd = -1;
+ static int in_fd = -1;
+ static char default_rootdir[] = ".";
+@@ -372,7 +377,7 @@ static struct filesystem_entry *recursiv
+ char *hpath, *tpath;
+ struct dirent *dp, **namelist;
+ struct filesystem_entry *entry;
+-
++ struct ignorepath_entry* element = ignorepath;
+
+ if (lstat(hostpath, &sb)) {
+ perror_msg_and_die("%s", hostpath);
+@@ -381,6 +386,15 @@ static struct filesystem_entry *recursiv
+ entry = add_host_filesystem_entry(targetpath, hostpath,
+ sb.st_uid, sb.st_gid, sb.st_mode, 0, parent);
+
++ while ( element ) {
++ if ( strcmp( element->name, targetpath ) == 0 ) {
++ printf( "Note: ignoring directories below '%s'\n",
targetpath );
++ return entry;
++ break;
++ }
++ element = element->next;
++ }
++
+ n = scandir(hostpath, &namelist, 0, alphasort);
+ if (n < 0) {
+ perror_msg_and_die("opening directory %s", hostpath);
+@@ -1405,6 +1419,7 @@ static struct option long_options[] = {
+ {"root", 1, NULL, 'r'},
+ {"pagesize", 1, NULL, 's'},
+ {"eraseblock", 1, NULL, 'e'},
++ {"ignore", 1, NULL, 'I'},
+ {"output", 1, NULL, 'o'},
+ {"help", 0, NULL, 'h'},
+ {"verbose", 0, NULL, 'v'},
+@@ -1452,6 +1467,7 @@ static char *helptext =
+ " -L, --list-compressors Show the list of the avaiable compressors\n"
+ " -t, --test-compression Call decompress and compare with the original (for
test)\n"
+ " -n, --no-cleanmarkers Don't add a cleanmarker to every eraseblock\n"
++" -I, --ignore=PATH Ignore sub directory and file tree below PATH when
recursing over the file system\n"
+ " -o, --output=FILE Output to FILE (default: stdout)\n"
+ " -l, --little-endian Create a little-endian filesystem\n"
+ " -b, --big-endian Create a big-endian filesystem\n"
+@@ -1617,11 +1633,12 @@ int main(int argc, char **argv)
+ struct filesystem_entry *root;
+ char *compr_name = NULL;
+ int compr_prior = -1;
++ struct ignorepath_entry* element = ignorepath;
+
+ jffs2_compressors_init();
+
+ while ((opt = getopt_long(argc, argv,
+-
"D:d:r:s:o:qUPfh?vVe:lbp::nc:m:x:X:Lty:i:", long_options, &c)) >= 0)
++
"D:d:r:s:I:o:qUPfh?vVe:lbp::nc:m:x:X:Lty:i:", long_options, &c)) >= 0)
+ {
+ switch (opt) {
+ case 'D':
+@@ -1644,6 +1661,28 @@ int main(int argc, char **argv)
+ page_size = strtol(optarg, NULL, 0);
+ break;
+
++ case 'I':
++ printf( "Note: Adding '%s' to ignore Path\n",
optarg );
++ element = ignorepath;
++ if ( !ignorepath ) {
++ ignorepath = xmalloc( sizeof( struct
ignorepath_entry ) );
++ ignorepath->next = 0;
++ strcpy( &ignorepath->name[0], optarg );
++ } else {
++ while ( element->next ) element =
element->next;
++ element->next = xmalloc( sizeof( struct
ignorepath_entry ) );
++ element->next->next = 0;
++ strcpy( &element->next->name[0], optarg
);
++ }
++ printf( "--------- Dumping ignore path list
----------------\n" );
++ element = ignorepath;
++ while ( element ) {
++ printf( " * '%s'\n", &element->name[0]
);
++ element = element->next;
++ }
++ printf(
"---------------------------------------------------\n" );
++ break;
++
+ case 'o':
+ if (out_fd != -1) {
+ error_msg_and_die("output filename
specified more than once");
Added: trunk/oe/packages/mtd/mtd-utils/fix-ignoreerrors-git.patch
===================================================================
--- trunk/oe/packages/mtd/mtd-utils/fix-ignoreerrors-git.patch 2007-07-25
11:27:14 UTC (rev 2389)
+++ trunk/oe/packages/mtd/mtd-utils/fix-ignoreerrors-git.patch 2007-07-25
14:15:07 UTC (rev 2390)
@@ -0,0 +1,26 @@
+---
+ nanddump.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Index: git/nanddump.c
+===================================================================
+--- git.orig/nanddump.c 2007-01-23 15:42:34.000000000 +0000
++++ git/nanddump.c 2007-01-23 15:47:57.000000000 +0000
+@@ -281,7 +281,7 @@ int main(int argc, char **argv)
+ }
+ }
+
+- if (badblock) {
++ if (badblock && !ignoreerrors) {
+ if (omitbad)
+ continue;
+ memset (readbuf, 0xff, bs);
+@@ -335,7 +335,7 @@ int main(int argc, char **argv)
+ if (omitoob)
+ continue;
+
+- if (badblock) {
++ if (badblock && !ignoreerrors) {
+ memset (readbuf, 0xff, meminfo.oobsize);
+ } else {
+ /* Read OOB data and exit on failure */
Added: trunk/oe/packages/mtd/mtd-utils/lzo_1x.patch
===================================================================
--- trunk/oe/packages/mtd/mtd-utils/lzo_1x.patch 2007-07-25 11:27:14 UTC
(rev 2389)
+++ trunk/oe/packages/mtd/mtd-utils/lzo_1x.patch 2007-07-25 14:15:07 UTC
(rev 2390)
@@ -0,0 +1,26 @@
+Index: git/Makefile
+===================================================================
+--- git.orig/Makefile
++++ git/Makefile
+@@ -60,7 +60,7 @@ $(BUILDDIR)/mkfs.jffs2: $(BUILDDIR)/crc3
+ $(BUILDDIR)/compr_zlib.o \
+ $(BUILDDIR)/compr_lzo.o \
+ $(BUILDDIR)/compr.o
+- $(CC) $(LDFLAGS) -o $@ $^ -lz -llzo2
++ $(CC) $(LDFLAGS) -o $@ $^ -lz -llzo
+
+ $(BUILDDIR)/flash_eraseall: $(BUILDDIR)/crc32.o $(BUILDDIR)/flash_eraseall.o
+ $(CC) $(LDFLAGS) -o $@ $^
+Index: git/compr_lzo.c
+===================================================================
+--- git.orig/compr_lzo.c
++++ git/compr_lzo.c
+@@ -26,7 +26,7 @@
+ #include <string.h>
+ #include <asm/types.h>
+ #include <linux/jffs2.h>
+-#include <lzo/lzo1x.h>
++#include <lzo1x.h>
+ #include "compr.h"
+
+ extern int page_size;
Added: trunk/oe/packages/mtd/mtd-utils-native.inc
===================================================================
--- trunk/oe/packages/mtd/mtd-utils-native.inc 2007-07-25 11:27:14 UTC (rev
2389)
+++ trunk/oe/packages/mtd/mtd-utils-native.inc 2007-07-25 14:15:07 UTC (rev
2390)
@@ -0,0 +1,10 @@
+inherit native
+DEPENDS = "zlib-native lzo-native"
+FILESDIR = "[EMAIL PROTECTED](bb.data.getVar('FILE',d,1))}/mtd-utils"
+
+do_stage () {
+ for binary in ${mtd_utils}; do
+ install -m 0755 $binary ${STAGING_BINDIR}
+ done
+}
+
\ No newline at end of file
Added: trunk/oe/packages/mtd/mtd-utils-native_1.0.0+git.bb
===================================================================
--- trunk/oe/packages/mtd/mtd-utils-native_1.0.0+git.bb 2007-07-25 11:27:14 UTC
(rev 2389)
+++ trunk/oe/packages/mtd/mtd-utils-native_1.0.0+git.bb 2007-07-25 14:15:07 UTC
(rev 2390)
@@ -0,0 +1,2 @@
+require mtd-utils_${PV}.bb
+require mtd-utils-native.inc
Added: trunk/oe/packages/mtd/mtd-utils-native_1.0.0.bb
===================================================================
--- trunk/oe/packages/mtd/mtd-utils-native_1.0.0.bb 2007-07-25 11:27:14 UTC
(rev 2389)
+++ trunk/oe/packages/mtd/mtd-utils-native_1.0.0.bb 2007-07-25 14:15:07 UTC
(rev 2390)
@@ -0,0 +1,2 @@
+require mtd-utils_${PV}.bb
+require mtd-utils-native.inc
Added: trunk/oe/packages/mtd/mtd-utils_1.0.0+git.bb
===================================================================
--- trunk/oe/packages/mtd/mtd-utils_1.0.0+git.bb 2007-07-25 11:27:14 UTC
(rev 2389)
+++ trunk/oe/packages/mtd/mtd-utils_1.0.0+git.bb 2007-07-25 14:15:07 UTC
(rev 2390)
@@ -0,0 +1,36 @@
+DESCRIPTION = "Tools for managing memory technology devices."
+SECTION = "base"
+DEPENDS = "zlib lzo"
+HOMEPAGE = "http://www.linux-mtd.infradead.org/";
+LICENSE = "GPLv2"
+PR = "r4"
+
+SRC_URI = "git://git.infradead.org/mtd-utils.git;protocol=git;tag=master \
+ file://add-exclusion-to-mkfs-jffs2-git.patch;patch=1 \
+ file://fix-ignoreerrors-git.patch;patch=1 \
+ file://lzo_1x.patch;patch=1"
+
+S = "${WORKDIR}/git/"
+
+EXTRA_OEMAKE = "'CC=${CC}' 'CFLAGS=${CFLAGS} -I${S}/include -DWITHOUT_XATTR'"
+
+do_stage () {
+ install -d ${STAGING_INCDIR}/mtd
+ for f in ${S}/include/mtd/*.h; do
+ install -m 0644 $f ${STAGING_INCDIR}/mtd/
+ done
+ for binary in ${mtd_utils}; do
+ install -m 0755 $binary ${STAGING_BINDIR}
+ done
+}
+
+mtd_utils = "ftl_format flash_erase flash_eraseall nanddump doc_loadbios \
+ mkfs.jffs ftl_check mkfs.jffs2 flash_lock flash_unlock flash_info
mtd_debug \
+ flashcp nandwrite jffs2dump sumtool"
+
+do_install () {
+ install -d ${D}${bindir}
+ for binary in ${mtd_utils}; do
+ install -m 0755 $binary ${D}${bindir}
+ done
+}
Added: trunk/oe/packages/mtd/mtd-utils_1.0.0.bb
===================================================================
--- trunk/oe/packages/mtd/mtd-utils_1.0.0.bb 2007-07-25 11:27:14 UTC (rev
2389)
+++ trunk/oe/packages/mtd/mtd-utils_1.0.0.bb 2007-07-25 14:15:07 UTC (rev
2390)
@@ -0,0 +1,19 @@
+DESCRIPTION = "Tools for managing memory technology devices."
+SECTION = "base"
+DEPENDS = "zlib"
+HOMEPAGE = "http://www.linux-mtd.infradead.org/";
+LICENSE = "GPLv2"
+PR = "r0"
+
+# RP/kergoth: Builds seem to break with recent mtd-utils
+# Can't pin down the exact problems
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-1.0.0.tar.gz";
+S = "${WORKDIR}/mtd-utils-${PV}"
+
+CFLAGS_prepend = "-I${WORKDIR}/mtd-utils-${PV}/include "
+
+do_install() {
+ oe_runmake install DESTDIR=${D}
+}
Added: trunk/oe/packages/mtd/oe-sync
===================================================================
--- End Message ---
--- Begin Message ---
Author: stefan
Date: 2007-07-25 16:39:27 +0200 (Wed, 25 Jul 2007)
New Revision: 2391
Modified:
trunk/oe/packages/linux/linux-gta01.inc
Log:
* Use ${OBJCOPY} instead of hardcoded arm-linux-objcopy. Patch from Cesar
Eduardo Barros <[EMAIL PROTECTED]> closes #647. Thanks.
(This is already in OE.dev so no problem with the sync)
Modified: trunk/oe/packages/linux/linux-gta01.inc
===================================================================
--- trunk/oe/packages/linux/linux-gta01.inc 2007-07-25 14:15:07 UTC (rev
2390)
+++ trunk/oe/packages/linux/linux-gta01.inc 2007-07-25 14:39:27 UTC (rev
2391)
@@ -89,7 +89,7 @@
install -d ${DEPLOY_DIR_IMAGE}
install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE}
${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}.bin
tar -cvzf
${DEPLOY_DIR_IMAGE}/modules-${KERNEL_RELEASE}-${PR}-${MACHINE}.tgz -C ${D} lib
- arm-linux-objcopy -O binary -R .note -R .comment -S vmlinux linux.bin
+ ${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin
rm -f linux.bin.gz
gzip -9 linux.bin
${STAGING_BINDIR_NATIVE}/uboot-mkimage -A arm -O linux -T kernel -C
gzip -a 30008000 -e 30008000 -n "OpenMoko Kernel Image Neo1973(GTA01)" -d
linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin
--- End Message ---
--- Begin Message ---
Author: stefan
Date: 2007-07-25 17:21:49 +0200 (Wed, 25 Jul 2007)
New Revision: 2392
Modified:
trunk/oe/packages/linux/linux-gta01.inc
Log:
* Remove bashism from linux-gta01.inc (Also commited to OE.dev, no sync problem)
Modified: trunk/oe/packages/linux/linux-gta01.inc
===================================================================
--- trunk/oe/packages/linux/linux-gta01.inc 2007-07-25 14:39:27 UTC (rev
2391)
+++ trunk/oe/packages/linux/linux-gta01.inc 2007-07-25 15:21:49 UTC (rev
2392)
@@ -62,7 +62,7 @@
echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config
- if [ "${TARGET_OS}" == "linux-gnueabi" ]; then
+ if [ "${TARGET_OS}" = "linux-gnueabi" ]; then
echo "CONFIG_AEABI=y" >> ${S}/.config
echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config
else
--- End Message ---
--- Begin Message ---
Author: ortalo
Date: 2007-07-25 22:27:43 +0200 (Wed, 25 Jul 2007)
New Revision: 2393
Modified:
trunk/src/target/OM-2007/applications/openmoko-calculator/AUTHORS
trunk/src/target/OM-2007/applications/openmoko-calculator/configure.ac
trunk/src/target/OM-2007/applications/openmoko-calculator/po/Calculator.pot
trunk/src/target/OM-2007/applications/openmoko-calculator/po/fr.po
trunk/src/target/OM-2007/applications/openmoko-calculator/po/ru.po
trunk/src/target/OM-2007/applications/openmoko-calculator/po/sv.po
trunk/src/target/OM-2007/applications/openmoko-calculator/src/calc-main.c
Log:
bugfix for sign inversion after result
Modified: trunk/src/target/OM-2007/applications/openmoko-calculator/AUTHORS
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-calculator/AUTHORS
2007-07-25 15:21:49 UTC (rev 2392)
+++ trunk/src/target/OM-2007/applications/openmoko-calculator/AUTHORS
2007-07-25 20:27:43 UTC (rev 2393)
@@ -1,3 +1,6 @@
Rodolphe Ortalo <[EMAIL PROTECTED]>
Michael 'Mickey' Lauer <[EMAIL PROTECTED]>
Tony Guan <[EMAIL PROTECTED]>
+
+Thanks for bugfixes:
+dando <[EMAIL PROTECTED]>
Modified: trunk/src/target/OM-2007/applications/openmoko-calculator/configure.ac
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-calculator/configure.ac
2007-07-25 15:21:49 UTC (rev 2392)
+++ trunk/src/target/OM-2007/applications/openmoko-calculator/configure.ac
2007-07-25 20:27:43 UTC (rev 2393)
@@ -1,5 +1,5 @@
AC_PREREQ(2.53)
-AC_INIT(openmoko-calculator, 0.0.3, [EMAIL PROTECTED])
+AC_INIT(openmoko-calculator, 0.0.4, [EMAIL PROTECTED])
AM_INIT_AUTOMAKE()
AC_CONFIG_SRCDIR(src/calc-main.c)
AM_CONFIG_HEADER(config.h)
Modified:
trunk/src/target/OM-2007/applications/openmoko-calculator/po/Calculator.pot
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-calculator/po/Calculator.pot
2007-07-25 15:21:49 UTC (rev 2392)
+++ trunk/src/target/OM-2007/applications/openmoko-calculator/po/Calculator.pot
2007-07-25 20:27:43 UTC (rev 2393)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-24 13:52+0100\n"
+"POT-Creation-Date: 2007-07-25 22:19+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[EMAIL PROTECTED]>\n"
"Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n"
@@ -16,24 +16,24 @@
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/calc-main.c:87
+#: src/calc-main.c:82
msgid "Clear All"
msgstr ""
-#: src/calc-main.c:87
+#: src/calc-main.c:82
msgid "Clear"
msgstr ""
-#: src/calc-main.c:91
+#: src/calc-main.c:86
msgid "<big><b>.</b></big>"
msgstr ""
#. application object
#. MokoApplication* app = MOKO_APPLICATION(moko_application_get_instance());
-#: src/calc-main.c:349
+#: src/calc-main.c:350
msgid "Calculator"
msgstr ""
-#: src/calc-main.c:356
+#: src/calc-main.c:357
msgid "Close"
msgstr ""
Modified: trunk/src/target/OM-2007/applications/openmoko-calculator/po/fr.po
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-calculator/po/fr.po
2007-07-25 15:21:49 UTC (rev 2392)
+++ trunk/src/target/OM-2007/applications/openmoko-calculator/po/fr.po
2007-07-25 20:27:43 UTC (rev 2393)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: openmoko-calculator 0.0.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-24 13:52+0100\n"
+"POT-Creation-Date: 2007-07-25 22:19+0200\n"
"PO-Revision-Date: 2007-03-23 21:34+0100\n"
"Last-Translator: ortalo <[EMAIL PROTECTED]>\n"
"Language-Team: French <[EMAIL PROTECTED]>\n"
@@ -16,24 +16,24 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: src/calc-main.c:87
+#: src/calc-main.c:82
msgid "Clear All"
msgstr "RAZ"
-#: src/calc-main.c:87
+#: src/calc-main.c:82
msgid "Clear"
msgstr "Effacer"
-#: src/calc-main.c:91
+#: src/calc-main.c:86
msgid "<big><b>.</b></big>"
msgstr "<big><b>,</b></big>"
#. application object
#. MokoApplication* app = MOKO_APPLICATION(moko_application_get_instance());
-#: src/calc-main.c:349
+#: src/calc-main.c:350
msgid "Calculator"
msgstr "Calculatrice"
-#: src/calc-main.c:356
+#: src/calc-main.c:357
msgid "Close"
msgstr "Fermer"
Modified: trunk/src/target/OM-2007/applications/openmoko-calculator/po/ru.po
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-calculator/po/ru.po
2007-07-25 15:21:49 UTC (rev 2392)
+++ trunk/src/target/OM-2007/applications/openmoko-calculator/po/ru.po
2007-07-25 20:27:43 UTC (rev 2393)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: openmoko-calculator 0.0.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-24 13:52+0100\n"
+"POT-Creation-Date: 2007-07-25 22:19+0200\n"
"PO-Revision-Date: 2007-04-03 17:33+0300\n"
"Last-Translator: Evgeny Ginzburg <[EMAIL PROTECTED]>\n"
"Language-Team: \n"
@@ -15,24 +15,24 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/calc-main.c:87
+#: src/calc-main.c:82
msgid "Clear All"
msgstr "Очистить всё"
-#: src/calc-main.c:87
+#: src/calc-main.c:82
msgid "Clear"
msgstr "Очистить"
-#: src/calc-main.c:91
+#: src/calc-main.c:86
msgid "<big><b>.</b></big>"
msgstr "<big><b>.</b></big>"
#. application object
#. MokoApplication* app = MOKO_APPLICATION(moko_application_get_instance());
-#: src/calc-main.c:349
+#: src/calc-main.c:350
msgid "Calculator"
msgstr "Калькулятор"
-#: src/calc-main.c:356
+#: src/calc-main.c:357
msgid "Close"
msgstr "Закрыть"
Modified: trunk/src/target/OM-2007/applications/openmoko-calculator/po/sv.po
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-calculator/po/sv.po
2007-07-25 15:21:49 UTC (rev 2392)
+++ trunk/src/target/OM-2007/applications/openmoko-calculator/po/sv.po
2007-07-25 20:27:43 UTC (rev 2393)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: openmoko calculator\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-24 13:52+0100\n"
+"POT-Creation-Date: 2007-07-25 22:19+0200\n"
"PO-Revision-Date: 2007-04-04 11:18+0100\n"
"Last-Translator: Daniel Nylander <[EMAIL PROTECTED]>\n"
"Language-Team: Swedish <[EMAIL PROTECTED]>\n"
@@ -15,24 +15,24 @@
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/calc-main.c:87
+#: src/calc-main.c:82
msgid "Clear All"
msgstr "Töm allt"
-#: src/calc-main.c:87
+#: src/calc-main.c:82
msgid "Clear"
msgstr "Töm"
-#: src/calc-main.c:91
+#: src/calc-main.c:86
msgid "<big><b>.</b></big>"
msgstr "<big><b>.</b></big>"
#. application object
#. MokoApplication* app = MOKO_APPLICATION(moko_application_get_instance());
-#: src/calc-main.c:349
+#: src/calc-main.c:350
msgid "Calculator"
msgstr "Miniräknare"
-#: src/calc-main.c:356
+#: src/calc-main.c:357
msgid "Close"
msgstr "Stäng"
Modified:
trunk/src/target/OM-2007/applications/openmoko-calculator/src/calc-main.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-calculator/src/calc-main.c
2007-07-25 15:21:49 UTC (rev 2392)
+++ trunk/src/target/OM-2007/applications/openmoko-calculator/src/calc-main.c
2007-07-25 20:27:43 UTC (rev 2393)
@@ -215,8 +215,14 @@
update_state_for_digit(9);
break;
case minus:
- the_state.current_operand *= -1;
- update_display(the_state.current_operand);
+ if (the_state.current_operand != 0.0) {
+ the_state.current_operand *= -1;
+ update_display(the_state.current_operand);
+ } else if (the_state.last_operand != 0.0) {
+ the_state.last_operand *= -1;
+ update_display(the_state.last_operand);
+ }
+ /* else: no-op */
break;
case point:
the_state.decimal_point = TRUE;
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
