r2560 - in trunk/src/target/OM-2007.2/applications/openmoko-today: . libtaku src
zecke at sita.openmoko.org
zecke at sita.openmoko.org
Sun Jul 29 13:42:20 CEST 2007
Author: zecke
Date: 2007-07-29 13:42:19 +0200 (Sun, 29 Jul 2007)
New Revision: 2560
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-today/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-today/configure.ac
trunk/src/target/OM-2007.2/applications/openmoko-today/libtaku/launcher-util.c
trunk/src/target/OM-2007.2/applications/openmoko-today/src/today-launcher.c
trunk/src/target/OM-2007.2/applications/openmoko-today/src/today-main.c
trunk/src/target/OM-2007.2/applications/openmoko-today/src/today-task-manager.c
Log:
2007-07-29 Holger Freyther <zecke at selfish.org>
Use version two of the libraries. Make taku compile without libsn
* configure.ac:
* libtaku/launcher-util.c: Taco's don't need libsn.
(launcher_start):
* src/today-launcher.c:
* src/today-main.c:
* src/today-task-manager.c:
Modified: trunk/src/target/OM-2007.2/applications/openmoko-today/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today/ChangeLog 2007-07-29 11:37:34 UTC (rev 2559)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today/ChangeLog 2007-07-29 11:42:19 UTC (rev 2560)
@@ -1,3 +1,14 @@
+2007-07-29 Holger Freyther <zecke at selfish.org>
+
+ Use version two of the libraries. Make taku compile without libsn
+
+ * configure.ac:
+ * libtaku/launcher-util.c: Taco's don't need libsn.
+ (launcher_start):
+ * src/today-launcher.c:
+ * src/today-main.c:
+ * src/today-task-manager.c:
+
2007-07-17 Chris Lord <chris at openedhand.com>
* configure.ac:
Modified: trunk/src/target/OM-2007.2/applications/openmoko-today/configure.ac
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today/configure.ac 2007-07-29 11:37:34 UTC (rev 2559)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today/configure.ac 2007-07-29 11:42:19 UTC (rev 2560)
@@ -28,7 +28,7 @@
AC_DEFINE(HAVE_SEXY, 1, [We are sexy enough])],
enable_sexy=false)
-PKG_CHECK_MODULES(MOKOUI, libmokoui >= $LIBMOKOUI_VERSION)
+PKG_CHECK_MODULES(MOKOUI, libmokoui2 >= $LIBMOKOUI_VERSION)
PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $LIBGTK_VERSION)
PKG_CHECK_MODULES(ECAL, libecal-1.2 >= $LIBECAL_VERSION)
PKG_CHECK_MODULES(EBOOK, libebook-1.2 >= $LIBEBOOK_VERSION)
Modified: trunk/src/target/OM-2007.2/applications/openmoko-today/libtaku/launcher-util.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today/libtaku/launcher-util.c 2007-07-29 11:37:34 UTC (rev 2559)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today/libtaku/launcher-util.c 2007-07-29 11:42:19 UTC (rev 2560)
@@ -344,11 +344,18 @@
if (!g_spawn_async (
#endif
NULL, data->argv, NULL,
- G_SPAWN_SEARCH_PATH, child_setup, data->use_sn ? context : NULL,
+ G_SPAWN_SEARCH_PATH, child_setup,
+#ifdef USE_LIBSN
+ data->use_sn ? context : NULL,
+#else
+ NULL,
+#endif
NULL, &error)) {
g_warning ("Cannot launch %s: %s", data->argv[0], error->message);
g_error_free (error);
+#ifdef USE_LIBSN
sn_launcher_context_complete (context);
+#endif
}
#ifdef USE_LIBSN
Modified: trunk/src/target/OM-2007.2/applications/openmoko-today/src/today-launcher.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today/src/today-launcher.c 2007-07-29 11:37:34 UTC (rev 2559)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today/src/today-launcher.c 2007-07-29 11:42:19 UTC (rev 2560)
@@ -7,7 +7,7 @@
#include <ctype.h>
#include <libtaku/taku-table.h>
#include <libtaku/taku-launcher-tile.h>
-#include <libmokoui/moko-finger-scroll.h>
+#include <moko-finger-scroll.h>
#include "today.h"
/* NOTE: Following 4 functions (as well as libtaku) taken from
Modified: trunk/src/target/OM-2007.2/applications/openmoko-today/src/today-main.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today/src/today-main.c 2007-07-29 11:37:34 UTC (rev 2559)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today/src/today-main.c 2007-07-29 11:42:19 UTC (rev 2560)
@@ -4,7 +4,7 @@
#include <glib.h>
#include <glib/gi18n.h>
#include <gtk/gtk.h>
-#include <libmokoui/moko-finger-scroll.h>
+#include <moko-finger-scroll.h>
#include <libtaku/launcher-util.h>
#include <libtaku/xutil.h>
#include <unistd.h>
Modified: trunk/src/target/OM-2007.2/applications/openmoko-today/src/today-task-manager.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today/src/today-task-manager.c 2007-07-29 11:37:34 UTC (rev 2559)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today/src/today-task-manager.c 2007-07-29 11:42:19 UTC (rev 2560)
@@ -1,6 +1,6 @@
-#include <libmokoui/moko-stock.h>
-#include <libmokoui/moko-finger-scroll.h>
+#include <moko-stock.h>
+#include <moko-finger-scroll.h>
#include <libtaku/taku-table.h>
#include "today-task-manager.h"
#include "today-utils.h"
More information about the commitlog
mailing list