X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-main-window.c;h=80abed1dc0d386cfcab8d7a6449c91f58d3dee48;hp=a39c31af0b478ad5b1d0edaf8e37b887f9a60372;hb=e0521cac248602856888d8dffd4e34857737e57a;hpb=d8f84008fa1e26dc63a2aaf44fd37da8bdfc6207

diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c
index a39c31a..80abed1 100644
--- a/src/maemo/modest-main-window.c
+++ b/src/maemo/modest-main-window.c
@@ -1923,7 +1923,7 @@ on_msg_count_changed (ModestHeaderView *header_view,
 
 		/* Play a sound (if configured) and make the LED blink  */
 		if (changed & TNY_FOLDER_CHANGE_CHANGED_ADDED_HEADERS) {
-			modest_platform_on_new_headers_received (NULL, FALSE);
+			modest_platform_push_email_notification ();
 		}
 	}
 
@@ -2233,6 +2233,7 @@ get_toolbar_mode_from_mail_operation (ModestMainWindow *self,
 
 	/* Get toolbar mode from operation id*/
 	switch (modest_mail_operation_get_type_operation (mail_op)) {
+	case MODEST_MAIL_OPERATION_TYPE_SEND_AND_RECEIVE:
 	case MODEST_MAIL_OPERATION_TYPE_RECEIVE:
 	case MODEST_MAIL_OPERATION_TYPE_OPEN:
 		mode = TOOLBAR_MODE_TRANSFER;
@@ -2694,6 +2695,8 @@ modest_main_window_screen_is_on (ModestMainWindow *self)
 {
 	ModestMainWindowPrivate *priv = NULL;
 
+	g_return_val_if_fail (MODEST_IS_MAIN_WINDOW(self), FALSE);
+
 	priv = MODEST_MAIN_WINDOW_GET_PRIVATE (self);
 	
 	return (priv->display_state == OSSO_DISPLAY_ON) ? TRUE : FALSE;