2007-06-18 Murray Cumming <murrayc@murrayc.com>

* configure.ac: Do not require hildon-notify for Maemo Bora. It is not
        available.
        * src/modest-init.c: (modest_init_init_ui): Do not call notify_init()
        for Mameo Bora, to fix the build.

pmo-trunk-r2270

diff --git a/ChangeLog2 b/ChangeLog2
index b5264bd..0d8d88e 100644 (file)
--- a/ChangeLog2
+++ b/ChangeLog2
@@ -1,3 +1,10 @@
+2007-06-18  Murray Cumming  <murrayc@murrayc.com>
+
+       * configure.ac: Do not require hildon-notify for Maemo Bora. It is not 
+       available.
+       * src/modest-init.c: (modest_init_init_ui): Do not call notify_init() 
+       for Mameo Bora, to fix the build.
+       
 2007-06-17  Johannes Schmid <johannes.schmid@openismus.com>
 
        * configure.ac:

diff --git a/configure.ac b/configure.ac
index e3a4bf4..25fad32 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -95,7 +95,8 @@ 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)            AC_DEFINE_UNQUOTED(MODEST_HILDON_VERSION_0, 1, ["The Hildon version we support."])   
+     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         
    
    AC_SUBST(MODEST_LIBTINYMAIL_MAEMO_CFLAGS)

diff --git a/src/modest-init.c b/src/modest-init.c
index f75354f..e0f8048 100644 (file)
--- a/src/modest-init.c
+++ b/src/modest-init.c
@@ -49,9 +49,7 @@
 #include "widgets/modest-global-settings-dialog.h"
 #include "modest-tny-msg.h"
 #ifdef MODEST_PLATFORM_MAEMO
-#include <hildon/hildon-notification.h>
-#else
-#include <libnotify/notify.h>
+#include "modest-hildon-includes.h"
 #endif
 
 static gboolean init_header_columns (ModestConf *conf, gboolean overwrite);
@@ -251,7 +249,9 @@ modest_init_init_ui (gint argc, gchar** argv)
        init_stock_icons ();
 
        /* Init notification system */
+       #ifndef MODEST_HILDON_VERSION_0
        notify_init ("Basics");
+       #endif
 
        return TRUE;
 }