* check some parameters (give BUG: warnings instead of crashing)

[modest] / src / modest-init.c

diff --git a/src/modest-init.c b/src/modest-init.c
index 3fe6eb8..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;
 }
@@ -658,7 +658,7 @@ init_default_settings (ModestConf *conf)
 static void
 init_device_name (ModestConf *conf)
 {
-       int len = 255; /* max len */
+       unsigned int len = 255; /* max len */
        gchar *devname = NULL;
        
        if (!g_file_get_contents("/etc/hostname", &devname, &len, NULL) || len < 2 || len > 254) {