* make modest work on pre-OSSO 1.1 once more (don't require the notification stuff)

pmo-trunk-r2267

diff --git a/configure.ac b/configure.ac
index 93d462e..375932e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -95,7 +95,7 @@ if test "x$with_platform" = "xmaemo"; then
       PKG_CHECK_MODULES(MODEST_LIBTINYMAIL_MAEMO, conic libtinymail-maemo-1.0 hildon-1 libosso libhildonmime osso-addressbook-1.0 wpeditor hildon-help libebook-1.2 libalarm hildon-notify libnotify)          
    
     else     # the old hildon
-     PKG_CHECK_MODULES(MODEST_LIBTINYMAIL_MAEMO, conic libtinymail-maemo-1.0 hildon-libs >= 0.12.0 libosso libossomime libossohelp osso-addressbook-1.0 libwpeditor-plus libebook-1.2 libalarm gnome-vfs-module-2.0 hildon-notify libnotify)            
+     PKG_CHECK_MODULES(MODEST_LIBTINYMAIL_MAEMO, conic libtinymail-maemo-1.0 hildon-libs >= 0.12.0 libosso libossomime libossohelp osso-addressbook-1.0 libwpeditor-plus libebook-1.2 libalarm gnome-vfs-module-2.0)            
         AC_DEFINE_UNQUOTED(MODEST_HILDON_VERSION_0, 1, ["The Hildon version we support."])   
     fi         
    
@@ -139,7 +139,7 @@ if test "x$with_platform" = "xmaemo"; then
   CFLAGS="$CFLAGS -Wno-format-extra-args -Werror"
 else
    # gnome frontend 
-   AC_MSG_ERROR([Sorry, the GNOME Frontend is currently not working])
+   #AC_MSG_ERROR([Sorry, the GNOME Frontend is currently not working])
 
    PKG_CHECK_MODULES(MODEST_LIBTINYMAIL_GNOME_DESKTOP,libtinymail-gnome-desktop-1.0 libnm_glib glib-2.0 >= 2.8 gtk+-2.0 >= 2.10 libnotify)
    AC_SUBST(MODEST_LIBTINYMAIL_GNOME_DESKTOP_CFLAGS)

diff --git a/src/maemo/modest-hildon-includes.h b/src/maemo/modest-hildon-includes.h
index 2fa2851..43eff9c 100644 (file)
--- a/src/maemo/modest-hildon-includes.h
+++ b/src/maemo/modest-hildon-includes.h
@@ -46,7 +46,9 @@ k * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
 #include <hildon-widgets/hildon-font-selection-dialog.h>
 #include <hildon-widgets/hildon-find-toolbar.h>
 #include <hildon-widgets/hildon-sort-dialog.h>
+
 #else
+
 #include <hildon-mime.h>
 #include <hildon-uri.h>
 #include <hildon/hildon-file-chooser-dialog.h>
@@ -61,7 +63,8 @@ k * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
 #include <hildon/hildon-sort-dialog.h>
 #include <hildon/hildon-number-editor.h>
 #include <hildon/hildon-help.h>
-#endif /* MODEST_HILDON_VERSION_0*/
+#include <hildon/hildon-notification.h>
 
 
+#endif /*__MODEST_HILDON_VERSION_0_*/
 #endif /*__MODEST_HILDON_INCLUDES__*/

diff --git a/src/maemo/modest-platform.c b/src/maemo/modest-platform.c
index 8844dd6..c621008 100644 (file)
--- a/src/maemo/modest-platform.c
+++ b/src/maemo/modest-platform.c
@@ -47,7 +47,6 @@
 #include <gtk/gtkmenuitem.h>
 #include <gtk/gtkmain.h>
 #include <string.h>
-#include <hildon/hildon-notification.h>
 
 #define HILDON_OSSO_URI_ACTION "uri-action"
 #define URI_ACTION_COPY "copy:"
@@ -833,6 +832,7 @@ void
 modest_platform_on_new_msg (void)
 {
        return; /* TODO: Reenable this later. I disabled it to avoid having one notification per email. */
+#ifndef MODEST_HILDON_VERSION_0
        HildonNotification *not;
 
        /* Create a new notification. FIXME put the right values, need
@@ -854,6 +854,7 @@ modest_platform_on_new_msg (void)
                g_error ("Failed to send notification");
                
        g_object_unref (not);
+#endif /*MODEST_HILDON_VERSION_0*/
 }