Properly use libalarm API (fixes NB#91719).

[modest] / src / hildon2 / modest-hildon2-window-mgr.c

diff --git a/src/hildon2/modest-hildon2-window-mgr.c b/src/hildon2/modest-hildon2-window-mgr.c
index ffa54a8..0ea0451 100644 (file)
--- a/src/hildon2/modest-hildon2-window-mgr.c
+++ b/src/hildon2/modest-hildon2-window-mgr.c
@@ -42,6 +42,7 @@
 #include "modest-tny-folder.h"
 #include "modest-folder-window.h"
 #include "modest-accounts-window.h"
+#include <modest-maemo-utils.h>
 
 /* 'private'/'protected' functions */
 static void modest_hildon2_window_mgr_class_init (ModestHildon2WindowMgrClass *klass);
@@ -77,6 +78,10 @@ static gboolean modest_hildon2_window_mgr_close_all_windows (ModestWindowMgr *se
 static gboolean window_can_close (ModestWindow *window);
 static gboolean window_has_modals (ModestWindow *window);
 static ModestWindow *modest_hildon2_window_mgr_show_initial_window (ModestWindowMgr *self);
+static ModestWindow *modest_hildon2_window_mgr_get_current_top (ModestWindowMgr *self);
+static gboolean modest_hildon2_window_mgr_screen_is_on (ModestWindowMgr *self);
+static void osso_display_event_cb (osso_display_state_t state, 
+                                  gpointer data);
 
 typedef struct _ModestHildon2WindowMgrPrivate ModestHildon2WindowMgrPrivate;
 struct _ModestHildon2WindowMgrPrivate {
@@ -94,6 +99,9 @@ struct _ModestHildon2WindowMgrPrivate {
 
        GSList       *modal_handler_uids;
        ModestWindow *current_top;
+
+       /* Display state */
+       osso_display_state_t display_state;
 };
 #define MODEST_HILDON2_WINDOW_MGR_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
                                                                                   MODEST_TYPE_HILDON2_WINDOW_MGR, \
@@ -148,6 +156,8 @@ modest_hildon2_window_mgr_class_init (ModestHildon2WindowMgrClass *klass)
        mgr_class->get_window_list = modest_hildon2_window_mgr_get_window_list;
        mgr_class->close_all_windows = modest_hildon2_window_mgr_close_all_windows;
        mgr_class->show_initial_window = modest_hildon2_window_mgr_show_initial_window;
+       mgr_class->get_current_top = modest_hildon2_window_mgr_get_current_top;
+       mgr_class->screen_is_on = modest_hildon2_window_mgr_screen_is_on;
 
        g_type_class_add_private (gobject_class, sizeof(ModestHildon2WindowMgrPrivate));
 
@@ -175,6 +185,14 @@ modest_hildon2_window_mgr_instance_init (ModestHildon2WindowMgr *obj)
        priv->closing_time = 0;
 
        priv->modal_handler_uids = NULL;
+       priv->display_state = OSSO_DISPLAY_ON;
+
+       /* Listen for changes in the screen, we don't want to show a
+          led pattern when the display is on for example */
+       osso_hw_set_display_event_cb (modest_maemo_utils_get_osso_context (),
+                                     osso_display_event_cb,
+                                     obj); 
+
 }
 
 static void
@@ -185,6 +203,9 @@ modest_hildon2_window_mgr_finalize (GObject *obj)
        modest_signal_mgr_disconnect_all_and_destroy (priv->window_state_uids);
        priv->window_state_uids = NULL;
 
+       osso_hw_set_display_event_cb (modest_maemo_utils_get_osso_context (),
+                                     NULL,
+                                     NULL); 
        if (priv->window_list) {
                GList *iter = priv->window_list;
                /* unregister pending windows */
@@ -336,7 +357,6 @@ modest_hildon2_window_mgr_register_window (ModestWindowMgr *self,
        ModestHildon2WindowMgrPrivate *priv;
        gint *handler_id;
        HildonProgram *program;
-       GtkWidget *current_top;
        HildonWindowStack *stack;
        gboolean nested_msg = FALSE;
 
@@ -364,27 +384,28 @@ modest_hildon2_window_mgr_register_window (ModestWindowMgr *self,
        g_object_ref (window);
        priv->window_list = g_list_prepend (priv->window_list, window);
 
-       current_top = hildon_window_stack_peek (stack);
+       if (priv->current_top == NULL)
+               priv->current_top = (ModestWindow *) hildon_window_stack_peek (stack);
        nested_msg = MODEST_IS_MSG_VIEW_WINDOW (window) && 
                MODEST_IS_MSG_VIEW_WINDOW (parent);
 
        /* Close views if they're being shown. Nevertheless we must
           allow nested messages */
        if (!nested_msg &&
-           (MODEST_IS_MSG_EDIT_WINDOW (current_top) ||
-            MODEST_IS_MSG_VIEW_WINDOW (current_top))) {
+           (MODEST_IS_MSG_EDIT_WINDOW (priv->current_top) ||
+            MODEST_IS_MSG_VIEW_WINDOW (priv->current_top))) {
                gboolean retval;
 
                /* If the current view has modal dialogs then
                   we fail to register the new view */
-               if ((current_top != NULL) &&
-                   window_has_modals (MODEST_WINDOW (current_top))) {
+               if ((priv->current_top != NULL) &&
+                   window_has_modals (MODEST_WINDOW (priv->current_top))) {
                        /* Window on top but it has opened dialogs */
                        goto fail;
                }
 
                /* Close the current view */
-               g_signal_emit_by_name (G_OBJECT (current_top), "delete-event", NULL, &retval);
+               g_signal_emit_by_name (G_OBJECT (priv->current_top), "delete-event", NULL, &retval);
                if (retval == TRUE) {
                        /* Cancelled closing top window, then we fail to register */
                        goto fail;
@@ -404,9 +425,9 @@ fail:
        /* Add to list. Keep a reference to the window */
        priv->window_list = g_list_remove (priv->window_list, window);
        g_object_unref (window);
-       current_top = hildon_window_stack_peek (stack);
-       if (current_top)
-               gtk_window_present (GTK_WINDOW (current_top));
+       priv->current_top = (ModestWindow *) hildon_window_stack_peek (stack);
+       if (priv->current_top)
+               gtk_window_present (GTK_WINDOW (priv->current_top));
        return FALSE;
 }
 
@@ -721,7 +742,17 @@ modest_hildon2_window_mgr_show_initial_window (ModestWindowMgr *self)
        return initial_window;
 }
 
-gint 
+
+static ModestWindow *
+modest_hildon2_window_mgr_get_current_top (ModestWindowMgr *self)
+{
+       ModestHildon2WindowMgrPrivate *priv;
+
+       priv = MODEST_HILDON2_WINDOW_MGR_GET_PRIVATE (self);
+       return priv->current_top;
+}
+
+static gint 
 find_folder_window (gconstpointer a,
                    gconstpointer b)
 {
@@ -744,3 +775,29 @@ modest_hildon2_window_mgr_get_folder_window (ModestHildon2WindowMgr *self)
 
        return (window != NULL) ? MODEST_WINDOW (window->data) : NULL;
 }
+
+static gboolean
+modest_hildon2_window_mgr_screen_is_on (ModestWindowMgr *self)
+{
+       ModestHildon2WindowMgrPrivate *priv = NULL;
+
+       g_return_val_if_fail (MODEST_IS_HILDON2_WINDOW_MGR (self), FALSE);
+
+       priv = MODEST_HILDON2_WINDOW_MGR_GET_PRIVATE (self);
+       
+       return (priv->display_state == OSSO_DISPLAY_ON) ? TRUE : FALSE;
+}
+
+static void 
+osso_display_event_cb (osso_display_state_t state, 
+                      gpointer data)
+{
+       ModestHildon2WindowMgrPrivate *priv = MODEST_HILDON2_WINDOW_MGR_GET_PRIVATE (data);
+
+       priv->display_state = state;
+
+       /* Stop blinking if the screen becomes on */
+       if (priv->display_state == OSSO_DISPLAY_ON)
+               modest_platform_remove_new_mail_notifications (TRUE);
+}
+