#include <hildon/hildon-notification.h>
#endif /*MODEST_HILDON_NOTIFY*/
-
-#ifdef MODEST_HAVE_HILDON0_WIDGETS
+#if MODEST_HILDON_API == 0
#include <hildon-widgets/hildon-color-selector.h>
#include <hildon-widgets/hildon-color-button.h>
#include <hildon-widgets/hildon-banner.h>
#include <hildon-widgets/hildon-font-selection-dialog.h>
#include <hildon-widgets/hildon-find-toolbar.h>
#include <hildon-widgets/hildon-sort-dialog.h>
+#include <hildon-widgets/hildon-program.h>
#else
-#ifdef MODEST_HAVE_HILDON1_WIDGETS
+#if MODEST_HILDON_API >= 1
#include <hildon/hildon-helper.h>
#include <hildon/hildon-file-chooser-dialog.h>
#include <hildon/hildon-color-chooser.h>
#include <hildon/hildon-find-toolbar.h>
#include <hildon/hildon-sort-dialog.h>
#include <hildon/hildon-number-editor.h>
+#include <hildon/hildon-program.h>
#endif /*__MODEST_HAVE_HILDON1_WIDGETS*/
#endif /*__MODEST_HAVE_HILDON0_WIDGETS_*/
} HildonGtkInputMode;
#endif /* !MODEST_HAVE_HILDON_GTK */
-
-
-
#endif /*__MODEST_HILDON_INCLUDES__*/