* forgot these (see r3591)

pmo-trunk-r3592

diff --git a/src/maemo/modest-hildon-includes.h b/src/maemo/modest-hildon-includes.h
index bef1283..2b056f4 100644 (file)
--- a/src/maemo/modest-hildon-includes.h
+++ b/src/maemo/modest-hildon-includes.h
@@ -125,5 +125,4 @@ k * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
 #endif /*MODEST_HAVE_OSSO_HELP*/
 
 
-
 #endif /*__MODEST_HILDON_INCLUDES__*/

diff --git a/src/maemo/modest-platform.c b/src/maemo/modest-platform.c
index 576a2cb..c778bde 100644 (file)
--- a/src/maemo/modest-platform.c
+++ b/src/maemo/modest-platform.c
@@ -38,7 +38,6 @@
 #include <modest-hildon-includes.h>
 #include <modest-maemo-utils.h>
 #include <dbus_api/modest-dbus-callbacks.h>
-#include <libosso-abook/osso-abook.h>
 #include <maemo/modest-osso-autosave-callbacks.h>
 #include <libosso.h>
 #include <alarmd/alarm_event.h> /* For alarm_event_add(), etc. */
@@ -55,6 +54,10 @@
 #include <string.h>
 #include <libgnomevfs/gnome-vfs-mime-utils.h>
 
+#ifdef MODEST_HAVE_ABOOK
+#include <libosso-abook/osso-abook.h>
+#endif /*MODEST_HAVE_ABOOK*/
+
 
 #define HILDON_OSSO_URI_ACTION "uri-action"
 #define URI_ACTION_COPY "copy:"
@@ -199,12 +202,16 @@ modest_platform_init (int argc, char *argv[])
                modest_account_mgr_free_account_names (acc_names);
        }
 
+       
+#ifdef MODEST_HAVE_ABOOK
        /* initialize the addressbook */
        if (!osso_abook_init (&argc, &argv, osso_context)) {
                g_printerr ("modest: failed to initialized addressbook\n");
                return FALSE;
        }
-               
+#endif /*MODEST_HAVE_ABOOK*/
+
+
        return TRUE;
 }