-
- cookie_t alarm_cookie = modest_conf_get_int (conf, MODEST_CONF_ALARM_ID, NULL);
-
- /* Delete any existing alarm,
- * because we will replace it: */
- if (alarm_cookie) {
- if (alarmd_event_del(alarm_cookie) != 0)
- g_debug ("%s: alarm %d was not on the queue", __FUNCTION__, (int)alarm_cookie);
- alarm_cookie = 0;
+
+ if (minutes > 0) {
+ GSList *acc_names = modest_account_mgr_account_names (modest_runtime_get_account_mgr (), TRUE);
+ if (!acc_names) {
+ minutes = 0;
+ } else {
+ modest_account_mgr_free_account_names (acc_names);
+ }
+ }
+
+ /* cookie_t alarm_cookie = modest_conf_get_int (conf, MODEST_CONF_ALARM_ID, NULL); */
+
+ /* Delete any existing alarm, because we will replace it: */
+ alarm_cookies = alarmd_event_query (0,0, 0,0, MODEST_ALARMD_APPID);
+ if (alarm_cookies) {
+ /* alarmd_event_query returns a zero terminated array */
+ for (; *alarm_cookies != 0; alarm_cookies++) {
+ alarmd_event_del (*alarm_cookies);
+ }