* Migrated Modest to the new send queue API

[modest] / src / maemo / modest-main-window.c

diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c
index a39c31a..83039d9 100644 (file)
--- a/src/maemo/modest-main-window.c
+++ b/src/maemo/modest-main-window.c
@@ -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;