with_platform=gnome])
AC_SUBST(MODEST_PLATFORM)
+
if test "x$with_platform" = "xmaemo"; then
- PKG_CHECK_MODULES(MODEST_LIBTINYMAIL_MAEMO,libtinymail-maemo-1.0 hildon-libs libosso libossomime osso-addressbook-1.0 wpeditor)
+
+ PKG_CHECK_MODULES(HILDON, hildon-1 >= 0.9.9, hildon1=yes, hildon1=no)
+ if test "$hildon1" == "yes"; then # the 'new' hildon
+ PKG_CHECK_MODULES(MODEST_LIBTINYMAIL_MAEMO, libtinymail-maemo-1.0 hildon-libs libosso libhildonmime osso-addressbook-1.0 wpeditor hildon-help libebook-1.2)
+
+ else # the old hildon
+ PKG_CHECK_MODULES(MODEST_LIBTINYMAIL_MAEMO,libtinymail-maemo-1.0 hildon-libs >= 0.12.0 libosso libossomime libossohelp osso-addressbook-1.0 wpeditor libebook-1.2)
+ AC_DEFINE_UNQUOTED(MODEST_HILDON_VERSION_0, 1, ["The Hildon version we support."])
+ fi
+
AC_SUBST(MODEST_LIBTINYMAIL_MAEMO_CFLAGS)
AC_SUBST(MODEST_LIBTINYMAIL_MAEMO_LIBS)
-
dnl ## setup the testing framework (ie., make check)
build_tests=false
AC_ARG_ENABLE(tests,
esac],[build_tests=false])
AM_CONDITIONAL(BUILD_TESTS, test x$build_tests = xtrue)
+
+
dnl ## is the check package installed?
if test x$build_tests = xtrue; then
PKG_CHECK_MODULES(CHECK, check >= 0.9.4 glib-2.0)
])
-
echo
echo "modest configure results"
echo "-----------------------------------"
Package: modest
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, operator-wizard, osso-af-settings
Description: an e-mail client for platforms with modest resources,
built on top of the tinymail framework
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
+#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <fcntl.h>
#include <glib/gstdio.h>
#include <tny-account-store.h>
#include <tny-fs-stream.h>
-#include <gtk/gtk.h>
+#include <config.h>
+
#include <modest-account-mgr.h>
#include <modest-account-mgr-helpers.h>
#include <wptextbuffer.h>
#include <hildon-widgets/hildon-color-selector.h>
#include <hildon-widgets/hildon-color-button.h>
+
+#ifdef MODEST_HILDON_VERSION_0
#include <hildon-widgets/hildon-file-chooser-dialog.h>
+#else
+#include <hildon/hildon-file-chooser-dialog.h>
+#endif /*MODEST_HILDON_VERSION_0 */
+
#define DEFAULT_FONT_SIZE 3
#define DEFAULT_FONT 2
#include <config.h>
#include <modest-platform.h>
#include <libosso.h>
+
+#ifdef MODEST_HILDON_VERSION_0
#include <osso-mime.h>
+#else
+#include <hildon-mime.h>
+#endif /*MODEST_HILDON_VERSION_0*/
+
#include <tny-maemo-device.h>
#include <gtk/gtkicontheme.h>
mime_str = g_string_new (mime_type);
g_string_ascii_down (mime_str);
}
-
+#ifdef MODEST_HILDON_VERSION_0
icons = osso_mime_get_icon_names (mime_str->str, NULL);
+#else
+ icons = hildon_mime_get_icon_names (mime_str->str, NULL);
+#endif /*MODEST_HILDON_VERSION_0*/
for (cursor = icons; cursor; ++cursor) {
if (gtk_icon_theme_has_icon (gtk_icon_theme_get_default(), *cursor)) {
icon_name = g_strdup (*cursor);