* Change save_settings call of main and viewer windows to
[modest] / src / maemo / modest-msg-view-window.c
index eef77c7..ded5e35 100644 (file)
@@ -102,7 +102,6 @@ static void set_toolbar_mode (ModestMsgViewWindow *self,
 
 static gboolean set_toolbar_transfer_mode     (ModestMsgViewWindow *self); 
 
-
 static void update_window_title (ModestMsgViewWindow *window);
 
 
@@ -462,12 +461,12 @@ modest_msg_view_window_finalize (GObject *obj)
 
 
 
-static gboolean
-on_delete_event (GtkWidget *widget, GdkEvent *event, ModestMsgViewWindow *self)
-{
-       modest_window_save_state (MODEST_WINDOW (self));
-       return FALSE;
-}
+/* static gboolean */
+/* on_delete_event (GtkWidget *widget, GdkEvent *event, ModestMsgViewWindow *self) */
+/* { */
+/*     modest_window_save_state (MODEST_WINDOW (self)); */
+/*     return FALSE; */
+/* } */
 
 ModestWindow *
 modest_msg_view_window_new_with_header_model (TnyMsg *msg, 
@@ -586,7 +585,7 @@ modest_msg_view_window_new (TnyMsg *msg,
        init_window (MODEST_MSG_VIEW_WINDOW(obj), msg);
        restore_settings (MODEST_MSG_VIEW_WINDOW(obj));
        
-       g_signal_connect (G_OBJECT(obj), "delete-event", G_CALLBACK(on_delete_event), obj);
+/*     g_signal_connect (G_OBJECT(obj), "delete-event", G_CALLBACK(on_delete_event), obj); */
 
        g_signal_connect (G_OBJECT(priv->msg_view), "link_clicked",
                          G_CALLBACK (modest_ui_actions_on_msg_link_clicked), obj);
@@ -672,6 +671,7 @@ modest_msg_view_window_get_header (ModestMsgViewWindow *self)
                            TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, 
                            &header, -1);
 
+       gtk_tree_path_free (path);
        return header;
 }
 
@@ -905,18 +905,20 @@ static void
 modest_msg_view_window_scroll_up (ModestWindow *window)
 {
        ModestMsgViewWindowPrivate *priv;
+       gboolean return_value;
 
        priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
-       g_signal_emit_by_name (G_OBJECT (priv->main_scroll), "scroll-child", GTK_SCROLL_STEP_UP, FALSE);
+       g_signal_emit_by_name (G_OBJECT (priv->main_scroll), "scroll-child", GTK_SCROLL_STEP_UP, FALSE, &return_value);
 }
 
 static void
 modest_msg_view_window_scroll_down (ModestWindow *window)
 {
        ModestMsgViewWindowPrivate *priv;
+       gboolean return_value;
 
        priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
-       g_signal_emit_by_name (G_OBJECT (priv->main_scroll), "scroll-child", GTK_SCROLL_STEP_DOWN, FALSE);
+       g_signal_emit_by_name (G_OBJECT (priv->main_scroll), "scroll-child", GTK_SCROLL_STEP_DOWN, FALSE, &return_value);
 }
 
 gboolean
@@ -1010,6 +1012,7 @@ modest_msg_view_window_first_message_selected (ModestMsgViewWindow *window)
                        }
                        g_free (path_string);
                }
+               gtk_tree_path_free (path);
                return result;
        } else {
                return TRUE;
@@ -1017,11 +1020,79 @@ modest_msg_view_window_first_message_selected (ModestMsgViewWindow *window)
        
 }
 
+/**
+ * Reads the message whose summary item is @header. It takes care of
+ * several things, among others:
+ *
+ * If the message was not previously downloaded then ask the user
+ * before downloading. If there is no connection launch the connection
+ * dialog. Update toolbar dimming rules.
+ *
+ * Returns: TRUE if the mail operation was started, otherwise if the
+ * user do not want to download the message, or if the user do not
+ * want to connect, then the operation is not issued
+ **/
+static gboolean
+message_reader (ModestMsgViewWindow *window,
+               ModestMsgViewWindowPrivate *priv,
+               TnyHeader *header,
+               GtkTreeIter iter)
+{
+       ModestMailOperation *mail_op = NULL;
+       GtkTreePath *path = NULL;
+       ModestMailOperationTypeOperation op_type;
+
+       /* Msg download completed */
+       if (tny_header_get_flags (header) & TNY_HEADER_FLAG_CACHED) {
+               op_type = MODEST_MAIL_OPERATION_TYPE_OPEN;
+       } else {
+               TnyFolder *folder;
+               GtkResponseType response;
+
+               op_type = MODEST_MAIL_OPERATION_TYPE_RECEIVE;
+
+               /* Ask the user if he wants to download the message */
+               response = modest_platform_run_confirmation_dialog (GTK_WINDOW (window),
+                                                                   _("mcen_nc_get_msg"));
+               if (response == GTK_RESPONSE_CANCEL)
+                       return FALSE;
+               
+               /* Offer the connection dialog if necessary */
+               /* FIXME: should this stuff go directly to the mail
+                  operation instead of spread it all over the
+                  code? */
+               folder = tny_header_get_folder (header);
+               if (folder) {
+                       if (!modest_platform_connect_and_wait_if_network_folderstore (NULL, TNY_FOLDER_STORE (folder))) {
+                               g_object_unref (folder);
+                               return FALSE;
+                       }
+                       g_object_unref (folder);
+               }
+       }
+
+       /* Get the path, will be freed by the callback */
+       path = gtk_tree_model_get_path (priv->header_model, &iter);
+
+       /* New mail operation */
+       mail_op = modest_mail_operation_new_with_error_handling (op_type, 
+                                                                G_OBJECT(window),
+                                                                modest_ui_actions_get_msgs_full_error_handler, 
+                                                                NULL);
+                               
+       modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
+       modest_mail_operation_get_msg (mail_op, header, view_msg_cb, path);
+       g_object_unref (mail_op);
+
+       /* Update toolbar dimming rules */
+       modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window));
+
+       return TRUE;
+}
+
 gboolean        
 modest_msg_view_window_select_next_message (ModestMsgViewWindow *window)
 {
-       TnyHeaderFlags flags;
-       ModestMailOperation *mail_op = NULL;
        ModestMsgViewWindowPrivate *priv;
        GtkTreePath *path= NULL;
        GtkTreeIter tmp_iter;
@@ -1038,42 +1109,30 @@ modest_msg_view_window_select_next_message (ModestMsgViewWindow *window)
                                         path);
                while (gtk_tree_model_iter_next (priv->header_model, &tmp_iter)) {
                        TnyHeader *header;
-                       GtkTreePath *path;
 
-                       gtk_tree_model_get (priv->header_model, &tmp_iter, TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN,
+                       gtk_tree_model_get (priv->header_model, &tmp_iter, 
+                                           TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN,
                                            &header, -1);
                        if (!header)
                                break;
-                       if (tny_header_get_flags (header) & TNY_HEADER_FLAG_DELETED)
-                               continue;
-
-                       /* Update the row reference */
-                       gtk_tree_row_reference_free (priv->row_reference);
-                       path = gtk_tree_model_get_path (priv->header_model, &tmp_iter);
-                       priv->row_reference = gtk_tree_row_reference_new (priv->header_model, path);
-                       gtk_tree_path_free (path);
 
-                       /* Mark as read */
-                       flags = tny_header_get_flags (header);
-                       if (!(flags & TNY_HEADER_FLAG_SEEN))
-                               tny_header_set_flags (header, TNY_HEADER_FLAG_SEEN);
+                       if (tny_header_get_flags (header) & TNY_HEADER_FLAG_DELETED) {
+                               g_object_unref (header);
+                               continue;
+                       }
 
-                       /* Msg download completed */
-                       if (flags & TNY_HEADER_FLAG_CACHED)
-                               mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_OPEN, G_OBJECT(window));
-                       else
-                               mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE, G_OBJECT(window));
-                               
-                       /* New mail operation */
-                       modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
-                       modest_mail_operation_get_msg (mail_op, header, view_msg_cb, NULL);
-                       g_object_unref (mail_op);
+                       /* Read the message & show it */
+                       if (!message_reader (window, priv, header, tmp_iter)) {
+                               g_object_unref (header);
+                               break;
+                       }
 
-                       /* Update toolbar dimming rules */
-                       modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window));
+                       /* Free */
+                       g_object_unref (header);
 
                        return TRUE;
                }
+               gtk_tree_path_free (path);
        }
        return FALSE;           
 }
@@ -1082,10 +1141,7 @@ gboolean
 modest_msg_view_window_select_first_message (ModestMsgViewWindow *self)
 {
        ModestMsgViewWindowPrivate *priv = NULL;
-       ModestMailOperation *mail_op = NULL;
        TnyHeader *header = NULL;
-       TnyHeaderFlags flags;
-       GtkTreePath *path = NULL;
        GtkTreeIter iter;
 
        g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (self), FALSE);
@@ -1107,30 +1163,8 @@ modest_msg_view_window_select_first_message (ModestMsgViewWindow *self)
                return modest_msg_view_window_select_next_message (self);
        }
        
-       /* Update the row reference */
-       gtk_tree_row_reference_free (priv->row_reference);
-       path = gtk_tree_path_new_first ();
-       priv->row_reference = gtk_tree_row_reference_new (priv->header_model, path);
-       gtk_tree_path_free (path);
-
-       /* Mark as read */
-       flags = tny_header_get_flags (header);
-       if (!(flags & TNY_HEADER_FLAG_SEEN))
-               tny_header_set_flags (header, TNY_HEADER_FLAG_SEEN);
-       
-       /* Msg download completed */
-       if (flags & TNY_HEADER_FLAG_CACHED)
-               mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_OPEN, G_OBJECT(self));
-       else 
-               mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE, G_OBJECT(self));
-       
-       /* New mail operation */
-       modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
-       modest_mail_operation_get_msg (mail_op, header, view_msg_cb, NULL);
-       g_object_unref (mail_op);
-
-       /* Update toolbar dimming rules */
-       modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (self));
+       /* Read the message & show it */
+       message_reader (self, priv, header, iter);
        
        /* Free */
        g_object_unref (header);
@@ -1141,10 +1175,8 @@ modest_msg_view_window_select_first_message (ModestMsgViewWindow *self)
 gboolean        
 modest_msg_view_window_select_previous_message (ModestMsgViewWindow *window)
 {
-       TnyHeaderFlags flags;
        ModestMsgViewWindowPrivate *priv = NULL;
        GtkTreePath *path;
-       ModestMailOperation *mail_op = NULL;
 
        g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window), FALSE);
        priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
@@ -1169,33 +1201,18 @@ modest_msg_view_window_select_previous_message (ModestMsgViewWindow *window)
                        continue;
                }
 
-               /* Update the row reference */
-               gtk_tree_row_reference_free (priv->row_reference);
-               priv->row_reference = gtk_tree_row_reference_new (priv->header_model, path);
-                       
-               /* Mark as read */
-               flags = tny_header_get_flags (header);
-               if (!(flags & TNY_HEADER_FLAG_SEEN))
-                       tny_header_set_flags (header, TNY_HEADER_FLAG_SEEN);
-               
-               /* Msg download completed */
-               if (flags & TNY_HEADER_FLAG_CACHED)
-                       mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_OPEN, G_OBJECT(window));
-               else
-                       mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE, G_OBJECT(window));
-               
-               /* New mail operation */
-               modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
-               modest_mail_operation_get_msg (mail_op, header, view_msg_cb, NULL);             
-
-               /* Update toolbar dimming rules */
-               modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window));
+               /* Read the message & show it */
+               if (!message_reader (window, priv, header, iter)) {
+                       g_object_unref (header);
+                       break;
+               }
 
                g_object_unref (header);
 
                return TRUE;
        }
 
+       gtk_tree_path_free (path);
        return FALSE;
 }
 
@@ -1207,15 +1224,29 @@ view_msg_cb (ModestMailOperation *mail_op,
 {
        ModestMsgViewWindow *self = NULL;
        ModestMsgViewWindowPrivate *priv = NULL;
+       GtkTreePath *path;
 
-       g_return_if_fail (TNY_IS_MSG (msg));
+       /* If there was any error */
+       path = (GtkTreePath *) user_data;
+       if (!modest_ui_actions_msg_retrieval_check (mail_op, header, msg)) {
+               gtk_tree_path_free (path);                      
+               return;
+       }
 
        /* Get the window */ 
        self = (ModestMsgViewWindow *) modest_mail_operation_get_source (mail_op);
        g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (self));
-
        priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (self);
 
+       /* Update the row reference */
+       gtk_tree_row_reference_free (priv->row_reference);
+       priv->row_reference = gtk_tree_row_reference_new (priv->header_model, path);
+       gtk_tree_path_free (path);
+
+       /* Mark header as read */
+       if (!(tny_header_get_flags (header) & TNY_HEADER_FLAG_SEEN))
+               tny_header_set_flags (header, TNY_HEADER_FLAG_SEEN);
+
        /* Set new message */
        modest_msg_view_set_message (MODEST_MSG_VIEW (priv->msg_view), msg);
        modest_msg_view_window_update_priority (self);
@@ -1282,6 +1313,7 @@ modest_msg_view_window_update_priority (ModestMsgViewWindow *window)
                gtk_tree_model_get (priv->header_model, &iter, TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN,
                                    &header, -1);
                flags = tny_header_get_flags (header);
+               gtk_tree_path_free (path);
        }
 
        modest_msg_view_set_priority (MODEST_MSG_VIEW(priv->msg_view), flags);
@@ -1426,7 +1458,7 @@ modest_msg_view_window_clipboard_owner_change (GtkClipboard *clipboard,
        parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
        selection = gtk_clipboard_wait_for_text (clipboard);
 
-       is_address = ((selection != NULL) && (modest_text_utils_validate_recipient (selection)));
+       is_address = ((selection != NULL) && (modest_text_utils_validate_recipient (selection, NULL)));
        
 /*     action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ToolsMenu/ToolsAddToContactsMenu"); */
 /*     gtk_action_set_sensitive (action, is_address); */
@@ -1906,5 +1938,3 @@ update_window_title (ModestMsgViewWindow *window)
 
        gtk_window_set_title (GTK_WINDOW (window), subject);
 }
-
-