X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-platform.c;h=c909a50f839ef102666bac50f4819bd8fc0e0ba6;hp=f49690f43cb3de0ecf312b1db80fc2e3d4ce9753;hb=eb21ca4b354fede1b81f4f1441b3fa77cf439d12;hpb=47e59a3f8bc90d80baf789ed0e0f684eef07e4eb

diff --git a/src/hildon2/modest-platform.c b/src/hildon2/modest-platform.c
index f49690f..c909a50 100644
--- a/src/hildon2/modest-platform.c
+++ b/src/hildon2/modest-platform.c
@@ -92,6 +92,7 @@
 #define COMMON_FOLDER_DIALOG_ENTRY "entry"
 #define COMMON_FOLDER_DIALOG_ACCOUNT_PICKER "account-picker"
 #define FOLDER_PICKER_CURRENT_FOLDER "current-folder"
+#define MODEST_ALARMD_APPID PACKAGE_NAME
 
 
 static void _modest_platform_play_email_tone (void);
@@ -1324,7 +1325,7 @@ modest_platform_set_update_interval (guint minutes)
 	/* Delete any existing alarm,
 	 * because we will replace it: */
 	if (alarm_cookie) {
-		if (alarmd_event_del(alarm_cookie) != 1)
+		if (alarmd_event_del(alarm_cookie) != 0)
 			g_warning ("%s: alarm %d was not on the queue", __FUNCTION__, (int)alarm_cookie);
 		alarm_cookie = 0;
 		modest_conf_set_int (conf, MODEST_CONF_ALARM_ID, 0, NULL);
@@ -1341,6 +1342,7 @@ modest_platform_set_update_interval (guint minutes)
 	alarm_event_t *event = alarm_event_create ();
 	alarm_event_add_actions (event, 1);
 	alarm_action_t *action = alarm_event_get_action (event, 0);
+	alarm_event_set_alarm_appid (event, MODEST_ALARMD_APPID);
 	event->alarm_time = minutes * 60; /* seconds */
 	
 	/* Set recurrence every few minutes: */
@@ -1354,7 +1356,7 @@ modest_platform_set_update_interval (guint minutes)
 	action->dbus_interface = g_strdup (MODEST_DBUS_IFACE);
 	action->dbus_service = g_strdup (MODEST_DBUS_SERVICE);
 	action->dbus_name = g_strdup (MODEST_DBUS_METHOD_SEND_RECEIVE);
-	action->flags = ALARM_ACTION_TYPE_DBUS | ALARM_ACTION_DBUS_USE_ACTIVATION;
+	action->flags = ALARM_ACTION_WHEN_TRIGGERED | ALARM_ACTION_TYPE_DBUS | ALARM_ACTION_DBUS_USE_ACTIVATION;
 
 	/* Use ALARM_EVENT_NO_DIALOG: Otherwise, a dialog will be shown if 
 	 * exec_name or dbus_path is NULL, even though we have specified no dialog text.