r1275 - in trunk/src/target/OM-2007/applications/openmoko-today: . src

[thomas at sita.openmoko.org]

Author: thomas
Date: 2007-03-08 15:58:00 +0100 (Thu, 08 Mar 2007)
New Revision: 1275

Modified:
   trunk/src/target/OM-2007/applications/openmoko-today/configure.ac
   trunk/src/target/OM-2007/applications/openmoko-today/src/today-main.c
Log:
* openmoko-today/configure.ac: Check for libebook and libecal
* openmoko-today/src/today-main.c: Use %I rather than %l in strftime to prevent
  an ISO C warning.


Modified: trunk/src/target/OM-2007/applications/openmoko-today/configure.ac
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-today/configure.ac	2007-03-08 14:34:25 UTC (rev 1274)
+++ trunk/src/target/OM-2007/applications/openmoko-today/configure.ac	2007-03-08 14:58:00 UTC (rev 1275)
@@ -4,6 +4,9 @@
 AC_CONFIG_SRCDIR(src/today-main.c)
 AM_MAINTAINER_MODE
 
+LIBEBOOK_VERSION=1.4.2
+LIBECAL_VERSION=1.4.2
+
 AC_ISC_POSIX
 AC_PROG_CC
 AC_STDC_HEADERS
@@ -17,7 +20,10 @@
 ALL_LINGUAS=""
 AM_GLIB_GNU_GETTEXT
 
-PKG_CHECK_MODULES(TODAY, openmoko-libs)
+PKG_CHECK_MODULES(TODAY,
+                  openmoko-libs
+                  libebook-1.2 >= $LIBEBOOK_VERSION
+                  libecal-1.2 >= $LIBEBOOK_VERSION)
 
 CFLAGS=$TODAY_CFLAGS
 LIBS=$TODAY_LIBS

Modified: trunk/src/target/OM-2007/applications/openmoko-today/src/today-main.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-today/src/today-main.c	2007-03-08 14:34:25 UTC (rev 1274)
+++ trunk/src/target/OM-2007/applications/openmoko-today/src/today-main.c	2007-03-08 14:58:00 UTC (rev 1275)
@@ -73,7 +73,7 @@
   }
 
   /* TODO: make 12/24 hr optional */
-  strftime (time_str, sizeof (time_str), "<big>%l:%M</big> %p", tmp);
+  strftime (time_str, sizeof (time_str), "<big>%I:%M</big> %p", tmp);
   gtk_label_set_markup (label, time_str);
 }