From b28e06396213a7471eaf3f1af0ac7e93bbf72c39 Mon Sep 17 00:00:00 2001 From: Murray Cumming Date: Wed, 4 Apr 2007 10:12:39 +0000 Subject: [PATCH] 2007-04-04 Murray Cumming * configure.ac: Define MODEST_PLATFORM_MAEMO and MODEST_PLATFORM_GNOME in config.h, so we can #ifdef around platform-specific code when necessary. * src/modest-ui-actions.c: (modest_ui_actions_on_new_account): Use MODEST_PLATFORM_MAEMO to allow this to build for the GNOME platform too. pmo-trunk-r1501 --- ChangeLog2 | 7 +++++++ configure.ac | 4 ++++ src/modest-ui-actions.c | 7 ++++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/ChangeLog2 b/ChangeLog2 index 3b63a54..e5c3531 100644 --- a/ChangeLog2 +++ b/ChangeLog2 @@ -1,5 +1,12 @@ 2007-04-04 Murray Cumming + * configure.ac: Define MODEST_PLATFORM_MAEMO and MODEST_PLATFORM_GNOME in config.h, + so we can #ifdef around platform-specific code when necessary. + * src/modest-ui-actions.c: (modest_ui_actions_on_new_account): Use MODEST_PLATFORM_MAEMO + to allow this to build for the GNOME platform too. + +2007-04-04 Murray Cumming + * src/maemo/easysetup/modest-easysetup-wizard.c: Added util_increment_name() and used it in create_page_account_details() to make sure that the default account name is always a new name. diff --git a/configure.ac b/configure.ac index 4327723..40671d7 100644 --- a/configure.ac +++ b/configure.ac @@ -91,6 +91,8 @@ 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) AC_SUBST(MODEST_LIBTINYMAIL_MAEMO_CFLAGS) AC_SUBST(MODEST_LIBTINYMAIL_MAEMO_LIBS) + + AC_DEFINE_UNQUOTED(MODEST_PLATFORM_MAEMO, 1, ["Whether modest is being built for the Maemo platform."]) desktopentrydir=`$PKG_CONFIG osso-af-settings --variable=desktopentrydir` serviceentrydir=`$PKG_CONFIG dbus-glib-1 --variable=prefix`/share/dbus-1/services @@ -125,6 +127,8 @@ else AC_SUBST(MODEST_LIBTINYMAIL_GNOME_DESKTOP_CFLAGS) AC_SUBST(MODEST_LIBTINYMAIL_GNOME_DESKTOP_LIBS) MODEST_PLATFORM_ID=1 + + AC_DEFINE_UNQUOTED(MODEST_PLATFORM_GNOME, 1, ["Whether modest is being built for the GNOME platform."]) fi dnl 1==>gnome, 2==>maemo diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c index 3315b50..8434837 100644 --- a/src/modest-ui-actions.c +++ b/src/modest-ui-actions.c @@ -238,11 +238,16 @@ modest_ui_actions_on_accounts (GtkAction *action, ModestWindow *win) void modest_ui_actions_on_new_account (GtkAction *action, ModestWindow *win) -{ +{ + /* This is currently only implemented for Maemo, + * because it requires a providers preset file which is not publically available. + */ +#ifdef MODEST_PLATFORM_MAEMO /* Defined in config.h */ ModestEasysetupWizardDialog *wizard = modest_easysetup_wizard_dialog_new (); gtk_window_set_transient_for (GTK_WINDOW (wizard), GTK_WINDOW (win)); gtk_dialog_run (GTK_DIALOG (wizard)); gtk_widget_destroy (GTK_WIDGET (wizard)); +#endif MODEST_PLATFORM_MAEMO } void -- 1.7.9.5