Properly use libalarm API (fixes NB#91719).

[modest] / src / hildon2 / modest-platform.c

diff --git a/src/hildon2/modest-platform.c b/src/hildon2/modest-platform.c
index f48a81c..c909a50 100644 (file)
--- 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 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);
 
 
 static void _modest_platform_play_email_tone (void);

@@ -520,7 +521,7 @@ modest_platform_get_icon (const gchar *name, guint icon_size)
         */
        if (!name || strlen(name) == 0)
                return NULL;
         */
        if (!name || strlen(name) == 0)
                return NULL;

-       
+

        current_theme = gtk_icon_theme_get_default ();
        pixbuf = gtk_icon_theme_load_icon (current_theme, name, icon_size,
                                           GTK_ICON_LOOKUP_NO_SVG,
        current_theme = gtk_icon_theme_get_default ();
        pixbuf = gtk_icon_theme_load_icon (current_theme, name, icon_size,
                                           GTK_ICON_LOOKUP_NO_SVG,

@@ -703,10 +704,11 @@ folder_chooser_dialog_run (ModestFolderView *original)
 
        gtk_container_add (GTK_CONTAINER (GTK_DIALOG (userdata.dialog)->vbox), pannable);
        gtk_container_add (GTK_CONTAINER (pannable), folder_view);
 
        gtk_container_add (GTK_CONTAINER (GTK_DIALOG (userdata.dialog)->vbox), pannable);
        gtk_container_add (GTK_CONTAINER (pannable), folder_view);

+       gtk_widget_set_size_request (pannable, -1, 320);
+

        gtk_widget_show (folder_view);
        gtk_widget_show (pannable);
        gtk_widget_show (folder_view);
        gtk_widget_show (pannable);

-       gtk_widget_show_all (userdata.dialog);
-       gtk_widget_set_size_request (pannable, -1, 320);
+       gtk_widget_show (userdata.dialog);

        g_signal_connect (G_OBJECT (folder_view), "folder-activated", 
                          G_CALLBACK (folder_chooser_activated), 
                          (gpointer) &userdata);
        g_signal_connect (G_OBJECT (folder_view), "folder-activated", 
                          G_CALLBACK (folder_chooser_activated), 
                          (gpointer) &userdata);

@@ -1323,7 +1325,7 @@ modest_platform_set_update_interval (guint minutes)
        /* Delete any existing alarm,
         * because we will replace it: */
        if (alarm_cookie) {
        /* 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);
                        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);

@@ -1340,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_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: */
        event->alarm_time = minutes * 60; /* seconds */
        
        /* Set recurrence every few minutes: */

@@ -1353,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->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.
 
        /* 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.