Changeset Navigation

Changeset 3008

Timestamp:

11/26/07 20:19:10

Author:

djcb

Message:

* add a dummy conic device, so libtinymail-maemo does

no require libconic anymore

Files:

r2937	r3008
426	426	dnl ### libtinymail-maemo, a platform library implementation for the maemo platform ##
427	427	if test x$PLATFORMDIR = xlibtinymail-maemo; then
428		PKG_CHECK_MODULES(LIBTINYMAIL_MAEMO, glib-2.0 >= 2.8 gobject-2.0 gconf-2.0 gtk+-2.0 ~~libosso~~)
	428	PKG_CHECK_MODULES(LIBTINYMAIL_MAEMO, glib-2.0 >= 2.8 gobject-2.0 gconf-2.0 gtk+-2.0)
429	429	if $PKG_CONFIG --exists conic; then
430	430	PKG_CHECK_MODULES(LIBTINYMAIL_MAEMO_CONIC,conic,HAVE_CONIC=yes,HAVE_CONIC=no)
…	…
439	439	AC_DEFINE_UNQUOTED(MAEMO_CONIC_DUMMY,1,["Whether to hack the TnyMaemoConicDevice to somewhat work in sbox"])
440	440	fi
	441	AC_DEFINE_UNQUOTED(MAEMO_HAVE_CONIC,1,["whether libconic is available"])
441	442	fi
	443
442	444	AC_SUBST(LIBTINYMAIL_MAEMO_CFLAGS)
443	445	AC_SUBST(LIBTINYMAIL_MAEMO_LIBS)
444	446	fi
445
	447
446	448	AM_CONDITIONAL(MAEMO_CONIC_DEVICE_DUMMY, test -n "$use_conic_device_dummy")
	449	AM_CONDITIONAL(MAEMO_CONIC_HAVE_CONIC, test "x$HAVE_CONIC" = "xyes")
447	450	AM_CONDITIONAL(BUILD_MAEMO, test x$build_maemo = xtrue)
448	451

r2979	r3008
26	26	tny-maemo-platform-factory.c
27	27
	28
	29	#
	30	# if we have libconic and build for ARM: use tny-maemo-conic-device.c (the real one)
	31	# if we have libconic and build for x86 (scratchbox): use tny-maemo-conic-dummy-device.c
	32	# if we don't have libconic: use tny-maemo-noconic-device.c
	33	#
	34	if MAEMO_CONIC_HAVE_CONIC
28	35	if MAEMO_CONIC_DEVICE_DUMMY
29	36	libtinymail_maemo_1_0_la_SOURCES += tny-maemo-conic-dummy-device.c
…	…
31	38	libtinymail_maemo_1_0_la_SOURCES += tny-maemo-conic-device.c
32	39	endif
	40	else
	41	libtinymail_maemo_1_0_la_SOURCES += tny-maemo-noconic-device.c
	42	endif
	43
33	44
34	45	libtinymail_maemo_1_0_la_LIBADD = \

r2956	r3008
25	25
26	26	#include <tny-device.h>
	27
	28	/* this TnyMaemoConicDevice comes with three different implementations;
	29	* one is chosen at configure time:
	30	* 1) the real TnyMaemoConicDevice (tny-maemo-conic-device.c for use on real N800/N810)
	31	* 2) a dummy TnyMaemoConicDevice (tny-maemo-conic-dummy-device.c, for use in Scratchbox)
	32	* 3) another dummy TnyMaemoConicDevice (tny-maemo-noconic-device.c. for use if
	33	* libconic is not available at all (such as in Ubuntu Embedded)
	34	*/
	35
	36	#ifdef MAEMO_HAVE_CONIC
27	37	#include <coniciap.h>
	38	#else
	39	typedef struct {
	40	} ConIcIap;
	41	#endif /MAEMO_HAVE_CONIC/
28	42
29	43	G_BEGIN_DECLS
…	…
41	55	typedef struct _TnyMaemoConicDeviceClass TnyMaemoConicDeviceClass;
42	56
43		struct _TnyMaemoConicDevice
44		{
	57	struct _TnyMaemoConicDevice {
45	58	GObject parent;
46	59	};
47	60
48		struct _TnyMaemoConicDeviceClass
49		{
	61	struct _TnyMaemoConicDeviceClass {
50	62	GObjectClass parent;
51	63	};
52	64
53		typedef void (TnyMaemoConicDeviceConnectCallback) (TnyMaemoConicDevice self, const gchar* iap_id, gboolean canceled, GError *err, gpointer user_data);
	65	typedef void (TnyMaemoConicDeviceConnectCallback) (TnyMaemoConicDevice self, const gchar* iap_id,
	66	gboolean canceled, GError *err, gpointer user_data);
54	67
55	68
56	69	GType tny_maemo_conic_device_get_type (void);
57
58	70	TnyDevice* tny_maemo_conic_device_new (void);
59	71