2007-08-13 Murray Cumming <murrayc@murrayc.com>

* src/maemo/modest-platform.c:
(modest_platform_set_update_interval): Handle the new
alarmd error to warn when alarmd is not running, as is the case in
scratchbox for me now because
Module /usr/lib/alarmd/libretu.so initialization failed

pmo-trunk-r2969

diff --git a/ChangeLog2 b/ChangeLog2
index 0778602..8fa24e4 100644 (file)
--- a/ChangeLog2
+++ b/ChangeLog2
@@ -1,5 +1,13 @@
 2007-08-13  Murray Cumming  <murrayc@murrayc.com>
 
+       * src/maemo/modest-platform.c:
+       (modest_platform_set_update_interval): Handle the new 
+       alarmd error to warn when alarmd is not running, as is the case in  
+       scratchbox for me now because 
+       "Module /usr/lib/alarmd/libretu.so initialization failed"
+
+2007-08-13  Murray Cumming  <murrayc@murrayc.com>
+
        * src/widgets/modest-header-view-render.c:
        (_modest_header_view_compact_header_cell_data):
        NULL some strings after freeing them, trying to deal with 

diff --git a/src/maemo/modest-platform.c b/src/maemo/modest-platform.c
index 523f901..632043d 100644 (file)
--- a/src/maemo/modest-platform.c
+++ b/src/maemo/modest-platform.c
@@ -1223,20 +1223,22 @@ gboolean modest_platform_set_update_interval (guint minutes)
        if (!alarm_cookie) {
            /* Error */
            const alarm_error_t alarm_error = alarmd_get_error ();
-           printf ("Error setting alarm event. Error code: '%d'\n", alarm_error);
+           g_debug ("Error setting alarm event. Error code: '%d'\n", alarm_error);
            
            /* Give people some clue: */
            /* The alarm API should have a function for this: */
            if (alarm_error == ALARMD_ERROR_DBUS) {
-               printf ("  ALARMD_ERROR_DBUS: An error with D-Bus occurred, probably coudn't get a D-Bus connection.\n");
+               g_debug ("  ALARMD_ERROR_DBUS: An error with D-Bus occurred, probably coudn't get a D-Bus connection.\n");
            } else if (alarm_error == ALARMD_ERROR_CONNECTION) {
-               printf ("  ALARMD_ERROR_CONNECTION: Could not contact alarmd via D-Bus.\n");
+               g_debug ("  ALARMD_ERROR_CONNECTION: Could not contact alarmd via D-Bus.\n");
            } else if (alarm_error == ALARMD_ERROR_INTERNAL) {
-               printf ("  ALARMD_ERROR_INTERNAL: Some alarmd or libalarm internal error, possibly a version mismatch.\n");
+               g_debug ("  ALARMD_ERROR_INTERNAL: Some alarmd or libalarm internal error, possibly a version mismatch.\n");
            } else if (alarm_error == ALARMD_ERROR_MEMORY) {
-               printf ("  ALARMD_ERROR_MEMORY: A memory allocation failed.\n");
+               g_debug ("  ALARMD_ERROR_MEMORY: A memory allocation failed.\n");
            } else if (alarm_error == ALARMD_ERROR_ARGUMENT) {
-               printf ("  ALARMD_ERROR_ARGUMENT: An argument given by caller was invalid.\n");
+               g_debug ("  ALARMD_ERROR_ARGUMENT: An argument given by caller was invalid.\n");
+           } else if (alarm_error == ALARMD_ERROR_NOT_RUNNING) {
+               g_debug ("  ALARMD_ERROR_NOT_RUNNING: alarmd is not running.\n");
            }
            
            return FALSE;