else
have_easysetup=true
have_dbusapi=true
- PKG_CHECK_MODULES(MODEST_PLATFORM,libosso conic libtinymail-maemo-1.0 libebook-1.2 microb-engine-nss)
+ PKG_CHECK_MODULES(MODEST_PLATFORM,libosso dbus-1 libtinymail-maemo-1.0 libebook-1.2 )
AC_DEFINE_UNQUOTED(MODEST_PLATFORM_MAEMO, 1, ["Whether modest is being built for the MAEMO platform."])
AC_DEFINE_UNQUOTED(MODEST_HAVE_EASYSETUP, 1, ["Whether we have the easysetup feature"])
fi
fi
+
+#
+# check for libconic; this is a trick to check whether we run
+# on a 'real' maemo platform, or on, say, ubuntu embedded
+# this determines whether we build with the non-hildon GTK+
+#
+if test "x$with_platform" == "xmaemo"; then
+PKG_CHECK_MODULES(MODEST_LIBCONIC,conic,have_libconic=true,have_libconic=false)
+if test "x$have_libconic" == "xtrue"; then
+ AC_DEFINE_UNQUOTED(MODEST_HAVE_HILDON_GTK,1,["Whether modest is being built with Hildon/Gtk"])
+ AC_DEFINE_UNQUOTED(MODEST_HAVE_CONIC,1,["Whether modest has conic available"])
+fi
+fi
+
#
# check hildon-help (only for maemo)
#
$(MODEST_GSTUFF_CFLAGS)\
$(MODEST_LIBTINYMAIL_GNOME_DESKTOP_CFLAGS) \
$(MODEST_LIBTINYMAIL_MAEMO_CFLAGS) \
+ $(MODEST_PLATFORM_CFLAGS) \
-I$(MODEST_PLATFORM) \
-I$(top_srcdir)/src \
-DPREFIX=\"@prefix@\" \
/* #define DEBUG_WITHOUT_LIBCONIC 1 */
void
-modest_connection_specific_smtp_window_fill_with_connections (ModestConnectionSpecificSmtpWindow *self, ModestAccountMgr *account_manager)
+modest_connection_specific_smtp_window_fill_with_connections (ModestConnectionSpecificSmtpWindow *self,
+ ModestAccountMgr *account_manager)
{
+#ifdef MODEST_HAVE_CONIC
ModestConnectionSpecificSmtpWindowPrivate *priv =
CONNECTION_SPECIFIC_SMTP_WINDOW_GET_PRIVATE (self);
priv->account_manager = account_manager;
#endif
update_model_server_names (self);
+#endif /*MODEST_HAVE_CONIC */
}
static void
if (!tny_device_is_online (device))
return MODEST_CONNECTED_VIA_ANY;
+#ifdef MODEST_HAVE_CONIC
/* Get iap id */
const gchar *iap_id = tny_maemo_conic_device_get_current_iap_id (TNY_MAEMO_CONIC_DEVICE (device));
if (iap_id) {
g_object_unref (iap);
}
+#else
+ retval = MODEST_CONNECTED_VIA_WLAN; /* assume WLAN (fast) internet */
+#endif /* MODEST_HAVE_CONIC */
g_object_unref (device);
g_return_val_if_fail (self, NULL);
-#ifdef MODEST_PLATFORM_MAEMO
+#ifdef MODEST_HAVE_CONIC
g_assert (TNY_IS_MAEMO_CONIC_DEVICE (device));
TnyMaemoConicDevice *maemo_device = TNY_MAEMO_CONIC_DEVICE (device);
const gchar* iap_id = tny_maemo_conic_device_get_current_iap_id (maemo_device);
return account;
#else
return NULL; /* TODO: Implement this for GNOME, instead of just Maemo? */
-#endif /* MODEST_PLATFORM_MAEMO */
+#endif /* MODEST_HAVE_CONIC */
}
#
# Makefile.am
-# Time-stamp: <2007-06-23 15:40:04 (djcb)>
+# Time-stamp: <2007-11-24 13:34:06 (djcb)>
INCLUDES=\
$(MODEST_GSTUFF_CFLAGS) \
$(MODEST_PLATFORM_CFLAGS) \
$(MODEST_HILDON_WIDGETS_CFLAGS) \
+ $(MODEST_HILDON_HELP_CFLAGS) \
$(MODEST_MOZEMBED_CFLAGS) \
-I ${top_srcdir}/src/$(MODEST_PLATFORM) \
-I ${top_srcdir}/src \