Dbus open message faster user feedback (WIP 1)

diff --git a/src/gnome/modest-msg-view-window.c b/src/gnome/modest-msg-view-window.c
index 8197a02..000f090 100644 (file)
--- a/src/gnome/modest-msg-view-window.c
+++ b/src/gnome/modest-msg-view-window.c
@@ -414,6 +414,15 @@ modest_msg_view_window_get_message_uid (ModestMsgViewWindow *self)
        return priv->msg_uid;
 }
 
        return priv->msg_uid;
 }
 

+ModestWindow *
+modest_msg_view_window_new_from_uid (const gchar *modest_account_name,
+                                    const gchar *mailbox,
+                                    const gchar *msg_uid)
+{
+       /* NOT IMPLEMENTED */
+       return NULL;
+}
+

 ModestWindow*   
 modest_msg_view_window_new_with_header_model (TnyMsg *msg, 
                                              const gchar *modest_account_name, 
 ModestWindow*   
 modest_msg_view_window_new_with_header_model (TnyMsg *msg, 
                                              const gchar *modest_account_name, 

diff --git a/src/hildon2/modest-msg-view-window.c b/src/hildon2/modest-msg-view-window.c
index 70effef..d5926f6 100644 (file)
--- a/src/hildon2/modest-msg-view-window.c
+++ b/src/hildon2/modest-msg-view-window.c
@@ -222,6 +222,8 @@ static gboolean modest_msg_view_window_scroll_child (ModestMsgViewWindow *self,
 static gboolean message_reader (ModestMsgViewWindow *window,
                                ModestMsgViewWindowPrivate *priv,
                                TnyHeader *header,
 static gboolean message_reader (ModestMsgViewWindow *window,
                                ModestMsgViewWindowPrivate *priv,
                                TnyHeader *header,

+                               const gchar *msg_uid,
+                               TnyFolder *folder,

                                GtkTreeRowReference *row_reference);
 
 static void setup_menu (ModestMsgViewWindow *self);
                                GtkTreeRowReference *row_reference);
 
 static void setup_menu (ModestMsgViewWindow *self);

@@ -923,6 +925,83 @@ modest_msg_view_window_new_with_header_model (TnyMsg *msg,
 }
 
 ModestWindow *
 }
 
 ModestWindow *

+modest_msg_view_window_new_from_uid (const gchar *modest_account_name,
+                                    const gchar *mailbox,
+                                    const gchar *msg_uid)
+{
+       ModestMsgViewWindow *window = NULL;
+       ModestMsgViewWindowPrivate *priv = NULL;
+       ModestWindowMgr *mgr = NULL;
+       gboolean is_merge;
+       TnyAccount *account = NULL;
+
+       mgr = modest_runtime_get_window_mgr ();
+       window = MODEST_MSG_VIEW_WINDOW (modest_window_mgr_get_msg_view_window (mgr));
+       g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window), NULL);
+
+       modest_msg_view_window_construct (window, modest_account_name, mailbox, msg_uid);
+
+       priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
+
+
+
+       is_merge = g_str_has_prefix (msg_uid, "merge:");
+
+       /* Get the account */
+       if (!is_merge)
+               account = tny_account_store_find_account (TNY_ACCOUNT_STORE (modest_runtime_get_account_store ()),
+                                                         msg_uid);
+
+       
+       if (is_merge || account) {
+               TnyFolder *folder = NULL;
+
+               /* Try to get the message, if it's already downloaded
+                  we don't need to connect */
+               if (account) {
+                       folder = tny_store_account_find_folder (TNY_STORE_ACCOUNT (account), msg_uid, NULL);
+               } else {
+                       ModestTnyAccountStore *account_store;
+                       ModestTnyLocalFoldersAccount *local_folders_account;
+
+                       account_store = modest_runtime_get_account_store ();
+                       local_folders_account = MODEST_TNY_LOCAL_FOLDERS_ACCOUNT (
+                               modest_tny_account_store_get_local_folders_account (account_store));
+                       folder = modest_tny_local_folders_account_get_merged_outbox (local_folders_account);
+                       g_object_unref (local_folders_account);
+               }
+               if (folder) {
+                       TnyDevice *device;
+                       gboolean device_online;
+
+                       device = modest_runtime_get_device();
+                       device_online = tny_device_is_online (device);
+                       if (device_online) {
+                               message_reader (window, priv, NULL, msg_uid, folder, NULL);
+                       } else {
+                               TnyMsg *msg = tny_folder_find_msg (folder, msg_uid, NULL);
+                               if (msg) {
+                                       tny_msg_view_set_msg (TNY_MSG_VIEW (priv->msg_view), msg);
+                                       update_branding (MODEST_MSG_VIEW_WINDOW (window));
+                                       g_object_unref (msg);
+                               } else {
+                                       message_reader (window, priv, NULL, msg_uid, folder, NULL);
+                               }
+                       }
+                       g_object_unref (folder);
+               }
+
+       }
+
+       /* Check dimming rules */
+       modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window));
+       modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (window));
+       modest_window_check_dimming_rules_group (MODEST_WINDOW (window), MODEST_DIMMING_RULES_CLIPBOARD);
+
+       return MODEST_WINDOW(window);
+}
+
+ModestWindow *

 modest_msg_view_window_new_from_header_view (ModestHeaderView *header_view,
                                             const gchar *modest_account_name,
                                             const gchar *mailbox,
 modest_msg_view_window_new_from_header_view (ModestHeaderView *header_view,
                                             const gchar *modest_account_name,
                                             const gchar *mailbox,

@@ -1006,7 +1085,7 @@ modest_msg_view_window_new_from_header_view (ModestHeaderView *header_view,
                gtk_tree_model_get (priv->header_model, &iter, 
                                    TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN,
                                    &header, -1);
                gtk_tree_model_get (priv->header_model, &iter, 
                                    TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN,
                                    &header, -1);

-               message_reader (window, priv, header, row_reference);
+               message_reader (window, priv, header, NULL, NULL, row_reference);

                g_object_unref (header);
        }
        gtk_tree_path_free (path);
                g_object_unref (header);
        }
        gtk_tree_path_free (path);

@@ -1020,7 +1099,7 @@ modest_msg_view_window_new_from_header_view (ModestHeaderView *header_view,
 }
 
 ModestWindow *
 }
 
 ModestWindow *

-modest_msg_view_window_new_for_search_result (TnyMsg *msg, 
+modest_msg_view_window_new_for_search_result (TnyMsg *msg,

                                              const gchar *modest_account_name,
                                              const gchar *mailbox,
                                              const gchar *msg_uid)
                                              const gchar *modest_account_name,
                                              const gchar *mailbox,
                                              const gchar *msg_uid)

@@ -1818,6 +1897,8 @@ modest_msg_view_window_first_message_selected (ModestMsgViewWindow *window)
 
 typedef struct {
        TnyHeader *header;
 
 typedef struct {
        TnyHeader *header;

+       gchar *msg_uid;
+       TnyFolder *folder;

        GtkTreeRowReference *row_reference;
 } MsgReaderInfo;
 
        GtkTreeRowReference *row_reference;
 } MsgReaderInfo;
 

@@ -1846,7 +1927,10 @@ message_reader_performer (gboolean canceled,
                                                                 NULL, NULL);
 
        modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
                                                                 NULL, NULL);
 
        modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);

-       modest_mail_operation_get_msg (mail_op, info->header, TRUE, view_msg_cb, info->row_reference);
+       if (info->header)
+               modest_mail_operation_get_msg (mail_op, info->header, TRUE, view_msg_cb, info->row_reference);
+       else
+               modest_mail_operation_find_msg (mail_op, info->folder, info->msg_uid, TRUE, view_msg_cb, NULL);

        g_object_unref (mail_op);
 
        /* Update dimming rules */
        g_object_unref (mail_op);
 
        /* Update dimming rules */

@@ -1855,7 +1939,11 @@ message_reader_performer (gboolean canceled,
 
  frees:
        /* Frees. The row_reference will be freed by the view_msg_cb callback */
 
  frees:
        /* Frees. The row_reference will be freed by the view_msg_cb callback */

-       g_object_unref (info->header);
+       g_free (info->msg_uid);
+       if (info->folder)
+               g_object_unref (info->folder);
+       if (info->header)
+               g_object_unref (info->header);

        g_slice_free (MsgReaderInfo, info);
 }
 
        g_slice_free (MsgReaderInfo, info);
 }
 

@@ -1876,22 +1964,21 @@ static gboolean
 message_reader (ModestMsgViewWindow *window,
                ModestMsgViewWindowPrivate *priv,
                TnyHeader *header,
 message_reader (ModestMsgViewWindow *window,
                ModestMsgViewWindowPrivate *priv,
                TnyHeader *header,

+               const gchar *msg_uid,
+               TnyFolder *folder,

                GtkTreeRowReference *row_reference)
 {
        ModestWindowMgr *mgr;
        TnyAccount *account;
                GtkTreeRowReference *row_reference)
 {
        ModestWindowMgr *mgr;
        TnyAccount *account;

-       TnyFolder *folder;

        MsgReaderInfo *info;
 
        MsgReaderInfo *info;
 

-       g_return_val_if_fail (row_reference != NULL, FALSE);
-

        /* We set the header from model while we're loading */
        tny_header_view_set_header (TNY_HEADER_VIEW (priv->msg_view), header);
        gtk_window_set_title (GTK_WINDOW (window), _CS("ckdg_pb_updating"));
 
        mgr = modest_runtime_get_window_mgr ();
        /* Msg download completed */
        /* We set the header from model while we're loading */
        tny_header_view_set_header (TNY_HEADER_VIEW (priv->msg_view), header);
        gtk_window_set_title (GTK_WINDOW (window), _CS("ckdg_pb_updating"));
 
        mgr = modest_runtime_get_window_mgr ();
        /* Msg download completed */

-       if (!(tny_header_get_flags (header) & TNY_HEADER_FLAG_CACHED)) {
+       if (!header || !(tny_header_get_flags (header) & TNY_HEADER_FLAG_CACHED)) {

 
                /* Ask the user if he wants to download the message if
                   we're not online */
 
                /* Ask the user if he wants to download the message if
                   we're not online */

@@ -1905,10 +1992,26 @@ message_reader (ModestMsgViewWindow *window,
                                return FALSE;
                        }
 
                                return FALSE;
                        }
 

-                       folder = tny_header_get_folder (header);
+                       if (header) {
+                               folder = tny_header_get_folder (header);
+                       } else {
+                               g_object_ref (folder);
+                       }

                        info = g_slice_new (MsgReaderInfo);
                        info = g_slice_new (MsgReaderInfo);

-                       info->header = g_object_ref (header);
-                       info->row_reference = gtk_tree_row_reference_copy (row_reference);
+                       info->msg_uid = g_strdup (msg_uid);
+                       if (header)
+                               info->header = g_object_ref (header);
+                       else
+                               info->header = NULL;    
+                       if (folder)
+                               info->folder = g_object_ref (folder);
+                       else
+                               info->folder = NULL;
+                       if (row_reference) {
+                               info->row_reference = gtk_tree_row_reference_copy (row_reference);
+                       } else {
+                               info->row_reference = NULL;
+                       }

 
                        /* Offer the connection dialog if necessary */
                        modest_platform_connect_if_remote_and_perform ((GtkWindow *) window, 
 
                        /* Offer the connection dialog if necessary */
                        modest_platform_connect_if_remote_and_perform ((GtkWindow *) window, 

@@ -1921,11 +2024,26 @@ message_reader (ModestMsgViewWindow *window,
                }
        }
 
                }
        }
 

-       folder = tny_header_get_folder (header);
+       if (header) {
+               folder = tny_header_get_folder (header);
+       } else {
+               g_object_ref (folder);
+       }

        account = tny_folder_get_account (folder);
        info = g_slice_new (MsgReaderInfo);
        account = tny_folder_get_account (folder);
        info = g_slice_new (MsgReaderInfo);

-       info->header = g_object_ref (header);
-       info->row_reference = gtk_tree_row_reference_copy (row_reference);
+       info->msg_uid = g_strdup (msg_uid);
+       if (info->folder)
+               info->folder = g_object_ref (folder);
+       else
+               info->folder = NULL;
+       if (info->header)
+               info->header = g_object_ref (header);
+       else
+               info->header = NULL;
+       if (row_reference)
+               info->row_reference = gtk_tree_row_reference_copy (row_reference);
+       else
+               info->row_reference = NULL;

 
        message_reader_performer (FALSE, NULL, (GtkWindow *) window, account, info);
        g_object_unref (account);
 
        message_reader_performer (FALSE, NULL, (GtkWindow *) window, account, info);
        g_object_unref (account);

@@ -1979,7 +2097,7 @@ modest_msg_view_window_select_next_message (ModestMsgViewWindow *window)
                            &header, -1);
        
        /* Read the message & show it */
                            &header, -1);
        
        /* Read the message & show it */

-       if (!message_reader (window, priv, header, row_reference)) {
+       if (!message_reader (window, priv, header, NULL, NULL, row_reference)) {

                retval = FALSE;
        }
        gtk_tree_row_reference_free (row_reference);
                retval = FALSE;
        }
        gtk_tree_row_reference_free (row_reference);

@@ -2020,7 +2138,7 @@ modest_msg_view_window_select_previous_message (ModestMsgViewWindow *window)
                                GtkTreeRowReference *row_reference;
                                row_reference = gtk_tree_row_reference_new (priv->header_model, path);
                                /* Read the message & show it */
                                GtkTreeRowReference *row_reference;
                                row_reference = gtk_tree_row_reference_new (priv->header_model, path);
                                /* Read the message & show it */

-                               retval = message_reader (window, priv, header, row_reference);
+                               retval = message_reader (window, priv, header, NULL, NULL, row_reference);

                                gtk_tree_row_reference_free (row_reference);
                        } else {
                                finished = FALSE;
                                gtk_tree_row_reference_free (row_reference);
                        } else {
                                finished = FALSE;

@@ -2050,7 +2168,8 @@ view_msg_cb (ModestMailOperation *mail_op,
 
        row_reference = (GtkTreeRowReference *) user_data;
        if (canceled) {
 
        row_reference = (GtkTreeRowReference *) user_data;
        if (canceled) {

-               gtk_tree_row_reference_free (row_reference);
+               if (row_reference)
+                       gtk_tree_row_reference_free (row_reference);

                self = (ModestMsgViewWindow *) modest_mail_operation_get_source (mail_op);
                if (self) {
                        /* Restore window title */
                self = (ModestMsgViewWindow *) modest_mail_operation_get_source (mail_op);
                if (self) {
                        /* Restore window title */

@@ -2062,7 +2181,8 @@ view_msg_cb (ModestMailOperation *mail_op,
 
        /* If there was any error */
        if (!modest_ui_actions_msg_retrieval_check (mail_op, header, msg)) {
 
        /* If there was any error */
        if (!modest_ui_actions_msg_retrieval_check (mail_op, header, msg)) {

-               gtk_tree_row_reference_free (row_reference);
+               if (row_reference)
+                       gtk_tree_row_reference_free (row_reference);

                self = (ModestMsgViewWindow *) modest_mail_operation_get_source (mail_op);
                if (self) {
                        /* Restore window title */
                self = (ModestMsgViewWindow *) modest_mail_operation_get_source (mail_op);
                if (self) {
                        /* Restore window title */

@@ -2113,7 +2233,8 @@ view_msg_cb (ModestMailOperation *mail_op,
 
        /* Frees */
        g_object_unref (self);
 
        /* Frees */
        g_object_unref (self);

-       gtk_tree_row_reference_free (row_reference);            
+       if (row_reference)
+               gtk_tree_row_reference_free (row_reference);            

 }
 
 TnyFolderType
 }
 
 TnyFolderType

@@ -3457,7 +3578,7 @@ modest_msg_view_window_reload (ModestMsgViewWindow *self)
        priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (self);
        header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (self));     
 
        priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (self);
        header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (self));     
 

-       if (!message_reader (self, priv, header, priv->row_reference)) {
+       if (!message_reader (self, priv, header, NULL, NULL, priv->row_reference)) {

                g_warning ("Shouldn't happen, trying to reload a message failed");
        }
 
                g_warning ("Shouldn't happen, trying to reload a message failed");
        }
 

diff --git a/src/maemo/modest-msg-view-window.c b/src/maemo/modest-msg-view-window.c
index 5cdcf2c..2114334 100644 (file)
--- a/src/maemo/modest-msg-view-window.c
+++ b/src/maemo/modest-msg-view-window.c
@@ -937,6 +937,86 @@ modest_msg_view_window_construct (ModestMsgViewWindow *self,
 
 }
 
 
 }
 

+ModestWindow *
+modest_msg_view_window_new_from_uid (const gchar *modest_account_name,
+                                    const gchar *mailbox,
+                                    const gchar *msg_uid)
+{
+       ModestMsgViewWindow *window = NULL;
+       ModestMsgViewWindowPrivate *priv = NULL;
+       TnyFolder *folder = NULL;
+       ModestWindowMgr *mgr = NULL;
+       gboolean is_merge;
+       TnyAccount *account = NULL;
+
+       mgr = modest_runtime_get_window_mgr ();
+       window = MODEST_MSG_VIEW_WINDOW (modest_window_mgr_get_msg_view_window (mgr));
+       g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window), NULL);
+
+       modest_msg_view_window_construct (window, modest_account_name, mailbox, msg_uid);
+
+       priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
+
+
+
+       is_merge = g_str_has_prefix (msg_uid, "merge:");
+
+       /* Get the account */
+       if (!is_merge)
+               account = tny_account_store_find_account (TNY_ACCOUNT_STORE (modest_runtime_get_account_store ()),
+                                                         msg_uid);
+
+       
+       if (is_merge || account) {
+               OpenMsgPerformerInfo *info;
+               TnyFolder *folder = NULL;
+
+               /* Try to get the message, if it's already downloaded
+                  we don't need to connect */
+               if (account) {
+                       folder = tny_store_account_find_folder (TNY_STORE_ACCOUNT (account), msg_uid, NULL);
+               } else {
+                       ModestTnyAccountStore *account_store;
+                       ModestTnyLocalFoldersAccount *local_folders_account;
+
+                       account_store = modest_runtime_get_account_store ();
+                       local_folders_account = MODEST_TNY_LOCAL_FOLDERS_ACCOUNT (
+                               modest_tny_account_store_get_local_folders_account (account_store));
+                       folder = modest_tny_local_folders_account_get_merged_outbox (local_folders_account);
+                       g_object_unref (local_folders_account);
+               }
+               if (folder) {
+                       TnyDevice *device;
+                       gboolean device_online;
+
+                       device = modest_runtime_get_device();
+                       device_online = tny_device_is_online (device);
+                       if (device_online) {
+                               message_reader (window, priv, NULL, msg_uid, folder, NULL);
+                       } else {
+                               TnyMsg *msg = tny_folder_find_msg (folder, uri, NULL);
+                               if (msg) {
+                                       tny_msg_view_set_msg (TNY_MSG_VIEW (priv->msg_view), msg);
+                                       g_object_unref (msg);
+                               } else {
+                                       message_reader (window, priv, NULL, msg_uid, folder, NULL);
+                               }
+                       }
+                       g_object_unref (folder);
+               }
+
+       }
+
+       /* Check dimming rules */
+       modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window));
+       modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (window));
+       modest_window_check_dimming_rules_group (MODEST_WINDOW (window), MODEST_DIMMING_RULES_CLIPBOARD);
+
+       return MODEST_WINDOW(window);
+}
+
+
+

 /* FIXME: parameter checks */
 ModestWindow *
 modest_msg_view_window_new_with_header_model (TnyMsg *msg, 
 /* FIXME: parameter checks */
 ModestWindow *
 modest_msg_view_window_new_with_header_model (TnyMsg *msg, 

@@ -1815,6 +1895,8 @@ modest_msg_view_window_first_message_selected (ModestMsgViewWindow *window)
 
 typedef struct {
        TnyHeader *header;
 
 typedef struct {
        TnyHeader *header;

+       gchar *msg_uid;
+       TnyFolder *folder;

        GtkTreeRowReference *row_reference;
 } MsgReaderInfo;
 
        GtkTreeRowReference *row_reference;
 } MsgReaderInfo;
 

@@ -1842,7 +1924,10 @@ message_reader_performer (gboolean canceled,
                                                                 NULL, NULL);
                                
        modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
                                                                 NULL, NULL);
                                
        modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);

-       modest_mail_operation_get_msg (mail_op, info->header, TRUE, view_msg_cb, info->row_reference);
+       if (info->header)
+               modest_mail_operation_get_msg (mail_op, info->header, TRUE, view_msg_cb, info->row_reference);
+       else
+               modest_mail_operation_find_msg (mail_op, info->folder, info->uid, TRUE, view_msg_cb);

        g_object_unref (mail_op);
 
        /* Update dimming rules */
        g_object_unref (mail_op);
 
        /* Update dimming rules */

@@ -1851,6 +1936,7 @@ message_reader_performer (gboolean canceled,
 
  frees:
        /* Frees. The row_reference will be freed by the view_msg_cb callback */
 
  frees:
        /* Frees. The row_reference will be freed by the view_msg_cb callback */

+       g_free (info->uid);

        g_object_unref (info->header);
        g_slice_free (MsgReaderInfo, info);
 }
        g_object_unref (info->header);
        g_slice_free (MsgReaderInfo, info);
 }

@@ -1872,17 +1958,16 @@ static gboolean
 message_reader (ModestMsgViewWindow *window,
                ModestMsgViewWindowPrivate *priv,
                TnyHeader *header,
 message_reader (ModestMsgViewWindow *window,
                ModestMsgViewWindowPrivate *priv,
                TnyHeader *header,

+               const gchar *msg_uid,
+               TnyFolder *folder,

                GtkTreeRowReference *row_reference)
 {
        gboolean already_showing = FALSE;
        ModestWindow *msg_window = NULL;
        ModestWindowMgr *mgr;
        TnyAccount *account;
                GtkTreeRowReference *row_reference)
 {
        gboolean already_showing = FALSE;
        ModestWindow *msg_window = NULL;
        ModestWindowMgr *mgr;
        TnyAccount *account;

-       TnyFolder *folder;

        MsgReaderInfo *info;
 
        MsgReaderInfo *info;
 

-       g_return_val_if_fail (row_reference != NULL, FALSE);
-

        mgr = modest_runtime_get_window_mgr ();
        already_showing = modest_window_mgr_find_registered_header (mgr, header, &msg_window);
        if (already_showing && (msg_window != MODEST_WINDOW (window))) {
        mgr = modest_runtime_get_window_mgr ();
        already_showing = modest_window_mgr_find_registered_header (mgr, header, &msg_window);
        if (already_showing && (msg_window != MODEST_WINDOW (window))) {

@@ -1894,7 +1979,7 @@ message_reader (ModestMsgViewWindow *window,
        }
 
        /* Msg download completed */
        }
 
        /* Msg download completed */

-       if (!(tny_header_get_flags (header) & TNY_HEADER_FLAG_CACHED)) {
+       if (!header || !(tny_header_get_flags (header) & TNY_HEADER_FLAG_CACHED)) {

                /* Ask the user if he wants to download the message if
                   we're not online */
                if (!tny_device_is_online (modest_runtime_get_device())) {
                /* Ask the user if he wants to download the message if
                   we're not online */
                if (!tny_device_is_online (modest_runtime_get_device())) {

@@ -1904,11 +1989,21 @@ message_reader (ModestMsgViewWindow *window,
                                                                            _("mcen_nc_get_msg"));
                        if (response == GTK_RESPONSE_CANCEL)
                                return FALSE;
                                                                            _("mcen_nc_get_msg"));
                        if (response == GTK_RESPONSE_CANCEL)
                                return FALSE;

-               
-                       folder = tny_header_get_folder (header);
+
+                       if (header)
+                               folder = tny_header_get_folder (header);
+                       else
+                               g_object_ref (folder);

                        info = g_slice_new (MsgReaderInfo);
                        info = g_slice_new (MsgReaderInfo);

-                       info->header = g_object_ref (header);
-                       info->row_reference = gtk_tree_row_reference_copy (row_reference);
+                       info->msg_uid = g_strdup (msg_uid);
+                       if (header)
+                               info->header = g_object_ref (header);
+                       else
+                               info->header = NULL;
+                       if (row_reference)
+                               info->row_reference = gtk_tree_row_reference_copy (row_reference);
+                       else
+                               info->row_reference = NULL;

 
                        /* Offer the connection dialog if necessary */
                        modest_platform_connect_if_remote_and_perform ((GtkWindow *) window, 
 
                        /* Offer the connection dialog if necessary */
                        modest_platform_connect_if_remote_and_perform ((GtkWindow *) window, 

@@ -1920,12 +2015,22 @@ message_reader (ModestMsgViewWindow *window,
                        return TRUE;
                }
        }
                        return TRUE;
                }
        }

-       
-       folder = tny_header_get_folder (header);
+
+       if (header)
+               folder = tny_header_get_folder (header);
+       else
+               g_object_ref (folder);

        account = tny_folder_get_account (folder);
        info = g_slice_new (MsgReaderInfo);
        account = tny_folder_get_account (folder);
        info = g_slice_new (MsgReaderInfo);

-       info->header = g_object_ref (header);
-       info->row_reference = gtk_tree_row_reference_copy (row_reference);
+       info->msg_uid = g_strdup (msg_uid);
+       if (header)
+               info->header = g_object_ref (header);
+       else
+               info->header = NULL;
+       if (row_reference)
+               info->row_reference = gtk_tree_row_reference_copy (row_reference);
+       else
+               row_reference = NULL;

        
        message_reader_performer (FALSE, NULL, (GtkWindow *) window, account, info);
        g_object_unref (account);
        
        message_reader_performer (FALSE, NULL, (GtkWindow *) window, account, info);
        g_object_unref (account);

@@ -1979,7 +2084,7 @@ modest_msg_view_window_select_next_message (ModestMsgViewWindow *window)
                            &header, -1);
        
        /* Read the message & show it */
                            &header, -1);
        
        /* Read the message & show it */

-       if (!message_reader (window, priv, header, row_reference)) {
+       if (!message_reader (window, priv, header, NULL, NULL, row_reference)) {

                retval = FALSE;
        }
        gtk_tree_row_reference_free (row_reference);
                retval = FALSE;
        }
        gtk_tree_row_reference_free (row_reference);

@@ -2020,7 +2125,7 @@ modest_msg_view_window_select_previous_message (ModestMsgViewWindow *window)
                                GtkTreeRowReference *row_reference;
                                row_reference = gtk_tree_row_reference_new (priv->header_model, path);
                                /* Read the message & show it */
                                GtkTreeRowReference *row_reference;
                                row_reference = gtk_tree_row_reference_new (priv->header_model, path);
                                /* Read the message & show it */

-                               retval = message_reader (window, priv, header, row_reference);
+                               retval = message_reader (window, priv, header, NULL, NULL, row_reference);

                                gtk_tree_row_reference_free (row_reference);
                        } else {
                                finished = FALSE;
                                gtk_tree_row_reference_free (row_reference);
                        } else {
                                finished = FALSE;

@@ -2050,13 +2155,15 @@ view_msg_cb (ModestMailOperation *mail_op,
 
        row_reference = (GtkTreeRowReference *) user_data;
        if (canceled) {
 
        row_reference = (GtkTreeRowReference *) user_data;
        if (canceled) {

-               gtk_tree_row_reference_free (row_reference);
+               if (row_reference)
+                       gtk_tree_row_reference_free (row_reference);

                return;
        }
        
        /* If there was any error */
        if (!modest_ui_actions_msg_retrieval_check (mail_op, header, msg)) {
                return;
        }
        
        /* If there was any error */
        if (!modest_ui_actions_msg_retrieval_check (mail_op, header, msg)) {

-               gtk_tree_row_reference_free (row_reference);                    
+               if (row_reference)
+                       gtk_tree_row_reference_free (row_reference);                    

                return;
        }
 
                return;
        }
 

@@ -2100,7 +2207,8 @@ view_msg_cb (ModestMailOperation *mail_op,
 
        /* Frees */
        g_object_unref (self);
 
        /* Frees */
        g_object_unref (self);

-       gtk_tree_row_reference_free (row_reference);            
+       if (row_reference)
+               gtk_tree_row_reference_free (row_reference);

 }
 
 TnyFolderType
 }
 
 TnyFolderType

@@ -3330,7 +3438,7 @@ modest_msg_view_window_reload (ModestMsgViewWindow *self)
        priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (self);
        header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (self));     
 
        priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (self);
        header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (self));     
 

-       if (!message_reader (self, priv, header, priv->row_reference)) {
+       if (!message_reader (self, priv, header, NULL, NULL, priv->row_reference)) {

                g_warning ("Shouldn't happen, trying to reload a message failed");
        }
 
                g_warning ("Shouldn't happen, trying to reload a message failed");
        }
 

diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c
index c7399b5..f74f11e 100644 (file)
--- a/src/modest-mail-operation.c
+++ b/src/modest-mail-operation.c
@@ -2495,6 +2495,71 @@ modest_mail_operation_rename_folder (ModestMailOperation *self,
 /* ******************************************************************* */
 
 void 
 /* ******************************************************************* */
 
 void 

+modest_mail_operation_find_msg (ModestMailOperation *self,
+                               TnyFolder *folder,
+                               const gchar *msg_uid,
+                               gboolean progress_feedback,
+                               GetMsgAsyncUserCallback user_callback,
+                               gpointer user_data)
+{
+       GetMsgInfo *helper = NULL;
+       ModestMailOperationPrivate *priv;
+       
+       g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
+       g_return_if_fail (msg_uid != NULL);
+       
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
+       priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
+       priv->total = 1;
+       priv->done = 0;
+
+       /* Check memory low */
+       if (_check_memory_low (self)) {
+               if (user_callback)
+                       user_callback (self, NULL, FALSE, NULL, priv->error, user_data);
+               modest_mail_operation_notify_end (self);
+               return;
+       }
+
+       /* Get account and set it into mail_operation */
+       priv->account = modest_tny_folder_get_account (TNY_FOLDER(folder));
+       
+       /* Check for cached messages */
+       if (progress_feedback) {
+               priv->op_type = MODEST_MAIL_OPERATION_TYPE_RECEIVE;
+       } else {
+               priv->op_type = MODEST_MAIL_OPERATION_TYPE_UNKNOWN;
+       }
+       
+       /* Create the helper */
+       helper = g_slice_new0 (GetMsgInfo);
+       helper->header = NULL;
+       helper->mail_op = g_object_ref (self);
+       helper->user_callback = user_callback;
+       helper->user_data = user_data;
+       helper->destroy_notify = NULL;
+       helper->last_total_bytes = 0;
+       helper->sum_total_bytes = 0;
+       helper->total_bytes = 0;
+       helper->more_msgs = NULL;
+
+       modest_mail_operation_notify_start (self);
+       
+       /* notify about the start of the operation */ 
+       ModestMailOperationState *state;
+       state = modest_mail_operation_clone_state (self);
+       state->done = 0;
+       state->total = 0;
+       g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 
+                               0, state, NULL);
+       g_slice_free (ModestMailOperationState, state);
+       
+       tny_folder_find_msg_async (folder, msg_uid, get_msg_async_cb, get_msg_status_cb, helper);
+
+       g_object_unref (G_OBJECT (folder));
+}
+
+void 

 modest_mail_operation_get_msg (ModestMailOperation *self,
                               TnyHeader *header,
                               gboolean progress_feedback,
 modest_mail_operation_get_msg (ModestMailOperation *self,
                               TnyHeader *header,
                               gboolean progress_feedback,

@@ -2627,6 +2692,8 @@ get_msg_async_cb (TnyFolder *folder,
                priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
        }
 
                priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
        }
 

+       if (info->header == NULL && msg)
+               info->header = tny_msg_get_header (msg);

 
        /* Call the user callback */
        if (info->user_callback)
 
        /* Call the user callback */
        if (info->user_callback)

diff --git a/src/modest-mail-operation.h b/src/modest-mail-operation.h
index 9166b93..b271c92 100644 (file)
--- a/src/modest-mail-operation.h
+++ b/src/modest-mail-operation.h
@@ -610,6 +610,25 @@ void          modest_mail_operation_get_msg     (ModestMailOperation *self,
                                                 GetMsgAsyncUserCallback user_callback,
                                                 gpointer user_data);
 /**
                                                 GetMsgAsyncUserCallback user_callback,
                                                 gpointer user_data);
 /**

+ * modest_mail_operation_find_msg:
+ * @self: a #ModestMailOperation
+ * @msg_uid: a string
+ * @progress_feedback: a #gboolean. If %TRUE, we'll get progress bar feedback.
+ * @user_callback: a #GetMsgAsyncUserCallback function to call after tinymail callback execution.
+ * @user_data: generic user data which will be passed to @user_callback function.
+ * 
+ * Gets a message from a uid using an user defined @callback function
+ * pased as argument. This operation is asynchronous, so the
+ * #ModestMailOperation should be added to #ModestMailOperationQueue
+ **/
+void          modest_mail_operation_find_msg     (ModestMailOperation *self,
+                                                 TnyFolder *folder,
+                                                 const gchar *msg_uid,
+                                                 gboolean progress_feedback,
+                                                 GetMsgAsyncUserCallback user_callback,
+                                                 gpointer user_data);
+
+/**

  * modest_mail_operation_get_msgs_full:
  * @self: a #ModestMailOperation
  * @header_list: a #TnyList of #TnyHeader objects to get and process
  * modest_mail_operation_get_msgs_full:
  * @self: a #ModestMailOperation
  * @header_list: a #TnyList of #TnyHeader objects to get and process

diff --git a/src/widgets/modest-msg-view-window.h b/src/widgets/modest-msg-view-window.h
index 5d6e6e2..bad28f4 100644 (file)
--- a/src/widgets/modest-msg-view-window.h
+++ b/src/widgets/modest-msg-view-window.h
@@ -179,6 +179,14 @@ ModestWindow*   modest_msg_view_window_new_from_header_view (ModestHeaderView *h
 
 
 /**
 
 
 /**

+ * modest_msg_view_window_new_from_uid:
+ */
+ModestWindow *
+modest_msg_view_window_new_from_uid (const gchar *modest_account_name,
+                                    const gchar *mailbox,
+                                    const gchar *msg_uid);
+                                             
+/**

  * modest_msg_view_window_new_for_search_result:
  * @msg: an #TnyMsg instance
  * @modest_account_name: the account name 
  * modest_msg_view_window_new_for_search_result:
  * @msg: an #TnyMsg instance
  * @modest_account_name: the account name