Refactored modest_platform_on_new_headers_received().

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

diff --git a/src/maemo/modest-platform.c b/src/maemo/modest-platform.c
index a41e3ce..f325631 100644 (file)
--- a/src/maemo/modest-platform.c
+++ b/src/maemo/modest-platform.c
@@ -1336,53 +1336,73 @@ modest_platform_set_update_interval (guint minutes)
        return TRUE;
 }
 
-void 
-modest_platform_on_new_headers_received (TnyList *header_list,
-                                        gboolean show_visual)
+void
+modest_platform_push_email_notification(void)
 {
        gboolean play_sound;
+       ModestWindow *main_window;
+       gboolean screen_on = TRUE, app_in_foreground;
 
        /* Check whether or not we should play a sound */
        play_sound = modest_conf_get_bool (modest_runtime_get_conf (),
                                           MODEST_CONF_PLAY_SOUND_MSG_ARRIVE,
                                           NULL);
 
-       if (!show_visual) {
-               gboolean screen_on, app_in_foreground;
-               ModestWindow *main_window;
-
-               /* Get the screen status */
-               main_window = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (), FALSE);
+       /* Get the screen status */
+       main_window = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (), FALSE);
+       if (main_window)
                screen_on = modest_main_window_screen_is_on (MODEST_MAIN_WINDOW (main_window));
 
-               /* Get the window status */
-               app_in_foreground = hildon_program_get_is_topmost (hildon_program_get_instance ());
+       /* Get the window status */
+       app_in_foreground = hildon_program_get_is_topmost (hildon_program_get_instance ());
 
-               /* If the screen is on and the app is in the
-                  foreground we don't show anything */
-               if (!(screen_on && app_in_foreground)) {
-                       /* Play a sound */
-                       if (play_sound)
-                               hildon_play_system_sound (MODEST_NEW_MAIL_SOUND_FILE);
-                       
-                       /* Activate LED. This must be deactivated by
-                          modest_platform_remove_new_mail_notifications */
+       /* If the screen is on and the app is in the
+          foreground we don't show anything */
+       if (!(screen_on && app_in_foreground)) {
+               /* Play a sound */
+               if (play_sound)
+                       hildon_play_system_sound (MODEST_NEW_MAIL_SOUND_FILE);
+
+               /* Activate LED. This must be deactivated by
+                  modest_platform_remove_new_mail_notifications */
 #ifdef MODEST_HAVE_MCE
-                       osso_rpc_run_system (modest_maemo_utils_get_osso_context (),
-                                            MCE_SERVICE,
-                                            MCE_REQUEST_PATH,
-                                            MCE_REQUEST_IF,
-                                            MCE_ACTIVATE_LED_PATTERN,
-                                            NULL,
-                                            DBUS_TYPE_STRING, MODEST_NEW_MAIL_LIGHTING_PATTERN,
-                                            DBUS_TYPE_INVALID);
+               osso_rpc_run_system (modest_maemo_utils_get_osso_context (),
+                                    MCE_SERVICE,
+                                    MCE_REQUEST_PATH,
+                                    MCE_REQUEST_IF,
+                                    MCE_ACTIVATE_LED_PATTERN,
+                                    NULL,
+                                    DBUS_TYPE_STRING, MODEST_NEW_MAIL_LIGHTING_PATTERN,
+                                    DBUS_TYPE_INVALID);
 #endif
-               }
+       }
+}
+
+void 
+modest_platform_on_new_headers_received (TnyList *header_list,
+                                        gboolean show_visual)
+{
+       g_return_if_fail (TNY_IS_LIST(header_list));
+
+       if (tny_list_get_length(header_list) == 0) {
+               g_warning ("%s: header list is empty", __FUNCTION__);
+               return;
+       }
+       
+       if (!show_visual) {
+                modest_platform_push_email_notification ();
                /* We do a return here to avoid indentation with an else */
                return;
        }
 
 #ifdef MODEST_HAVE_HILDON_NOTIFY
+       gboolean play_sound;
+
+       /* Check whether or not we should play a sound */
+       play_sound = modest_conf_get_bool (modest_runtime_get_conf (),
+                                          MODEST_CONF_PLAY_SOUND_MSG_ARRIVE,
+                                          NULL);
+
        HildonNotification *notification;
        TnyIterator *iter;
        GSList *notifications_list = NULL;