X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-msg-view-window.c;h=59c1651d674c0669e68edabd25bcd316a60f7d96;hb=5619278be034c3032ce89fc8ce0a2d52ef351e7b;hp=9b9e3b9f32bed37d813bb6cc3946ffa2a632e778;hpb=576545772cf7d92f1bd0f5ce0bffbcc261e62bf8;p=modest diff --git a/src/maemo/modest-msg-view-window.c b/src/maemo/modest-msg-view-window.c index 9b9e3b9..59c1651 100644 --- a/src/maemo/modest-msg-view-window.c +++ b/src/maemo/modest-msg-view-window.c @@ -59,6 +59,8 @@ static void modest_msg_view_window_class_init (ModestMsgViewWindowClass *klass); static void modest_msg_view_window_init (ModestMsgViewWindow *obj); +static void modest_header_view_observer_init( + ModestHeaderViewObserverIface *iface_class); static void modest_msg_view_window_finalize (GObject *obj); static void modest_msg_view_window_toggle_find_toolbar (GtkToggleAction *obj, gpointer data); @@ -67,8 +69,9 @@ static void modest_msg_view_window_find_toolbar_close (GtkWidget *widget, static void modest_msg_view_window_find_toolbar_search (GtkWidget *widget, ModestMsgViewWindow *obj); -static void modest_msg_view_window_set_zoom (ModestWindow *window, - gdouble zoom); +static void modest_msg_view_window_disconnect_signals (ModestWindow *self); +static void modest_msg_view_window_set_zoom (ModestWindow *window, + gdouble zoom); static gdouble modest_msg_view_window_get_zoom (ModestWindow *window); static gboolean modest_msg_view_window_zoom_minus (ModestWindow *window); static gboolean modest_msg_view_window_zoom_plus (ModestWindow *window); @@ -88,6 +91,34 @@ static void modest_msg_view_window_show_toolbar (ModestWindow *window, static void modest_msg_view_window_clipboard_owner_change (GtkClipboard *clipboard, GdkEvent *event, ModestMsgViewWindow *window); +void modest_msg_view_window_on_row_changed( + GtkTreeModel *header_model, + GtkTreePath *arg1, + GtkTreeIter *arg2, + ModestMsgViewWindow *window); + +void modest_msg_view_window_on_row_deleted( + GtkTreeModel *header_model, + GtkTreePath *arg1, + ModestMsgViewWindow *window); + +void modest_msg_view_window_on_row_inserted( + GtkTreeModel *header_model, + GtkTreePath *tree_path, + GtkTreeIter *tree_iter, + ModestMsgViewWindow *window); + +void modest_msg_view_window_on_row_reordered( + GtkTreeModel *header_model, + GtkTreePath *arg1, + GtkTreeIter *arg2, + gpointer arg3, + ModestMsgViewWindow *window); + +void modest_msg_view_window_update_model_replaced( + ModestHeaderViewObserver *window, + GtkTreeModel *model, + const gchar *tny_folder_id); static void cancel_progressbar (GtkToolButton *toolbutton, ModestMsgViewWindow *self); @@ -156,13 +187,28 @@ struct _ModestMsgViewWindowPrivate { /* Optimized view enabled */ gboolean optimized_view; + /* Whether this was created via the *_new_for_search_result() function. */ + gboolean is_search_result; + + /* A reference to the @model of the header view + * to allow selecting previous/next messages, + * if the message is currently selected in the header view. + */ + const gchar *header_folder_id; GtkTreeModel *header_model; GtkTreeRowReference *row_reference; GtkTreeRowReference *next_row_reference; - guint clipboard_change_handler; - guint queue_change_handler; - guint account_removed_handler; + gulong clipboard_change_handler; + gulong queue_change_handler; + gulong account_removed_handler; + gulong row_changed_handler; + gulong row_deleted_handler; + gulong row_inserted_handler; + gulong rows_reordered_handler; + + guint purge_timeout; + GtkWidget *remove_attachment_banner; guint progress_bar_timeout; @@ -198,6 +244,17 @@ modest_msg_view_window_get_type (void) my_type = g_type_register_static (MODEST_TYPE_WINDOW, "ModestMsgViewWindow", &my_info, 0); + + static const GInterfaceInfo modest_header_view_observer_info = + { + (GInterfaceInitFunc) modest_header_view_observer_init, + NULL, /* interface_finalize */ + NULL /* interface_data */ + }; + + g_type_add_interface_static (my_type, + MODEST_TYPE_HEADER_VIEW_OBSERVER, + &modest_header_view_observer_info); } return my_type; } @@ -235,6 +292,7 @@ modest_msg_view_window_class_init (ModestMsgViewWindowClass *klass) modest_window_class->zoom_minus_func = modest_msg_view_window_zoom_minus; modest_window_class->zoom_plus_func = modest_msg_view_window_zoom_plus; modest_window_class->show_toolbar_func = modest_msg_view_window_show_toolbar; + modest_window_class->disconnect_signals_func = modest_msg_view_window_disconnect_signals; g_type_class_add_private (gobject_class, sizeof(ModestMsgViewWindowPrivate)); @@ -250,21 +308,36 @@ modest_msg_view_window_class_init (ModestMsgViewWindowClass *klass) G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER); } +static void modest_header_view_observer_init( + ModestHeaderViewObserverIface *iface_class) +{ + iface_class->update_func = modest_msg_view_window_update_model_replaced; +} + static void modest_msg_view_window_init (ModestMsgViewWindow *obj) { ModestMsgViewWindowPrivate *priv; priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE(obj); + priv->is_search_result = FALSE; + priv->msg_view = NULL; priv->header_model = NULL; + priv->header_folder_id = NULL; priv->clipboard_change_handler = 0; priv->queue_change_handler = 0; priv->account_removed_handler = 0; + priv->row_changed_handler = 0; + priv->row_deleted_handler = 0; + priv->row_inserted_handler = 0; + priv->rows_reordered_handler = 0; priv->current_toolbar_mode = TOOLBAR_MODE_NORMAL; priv->optimized_view = FALSE; priv->progress_bar_timeout = 0; + priv->purge_timeout = 0; + priv->remove_attachment_banner = NULL; priv->msg_uid = NULL; } @@ -438,31 +511,84 @@ init_window (ModestMsgViewWindow *obj, TnyMsg *msg) priv->clipboard_change_handler = g_signal_connect (G_OBJECT (gtk_clipboard_get (GDK_SELECTION_PRIMARY)), "owner-change", G_CALLBACK (modest_msg_view_window_clipboard_owner_change), obj); gtk_widget_show_all (GTK_WIDGET(main_vbox)); - -} - +} static void -modest_msg_view_window_finalize (GObject *obj) +modest_msg_view_window_disconnect_signals (ModestWindow *self) { ModestMsgViewWindowPrivate *priv; + ModestHeaderView *header_view = NULL; + ModestMainWindow *main_window = NULL; + ModestWindowMgr *window_mgr = NULL; - priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (obj); - if (priv->clipboard_change_handler > 0) { + priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (self); + + if (g_signal_handler_is_connected (gtk_clipboard_get (GDK_SELECTION_PRIMARY), + priv->clipboard_change_handler)) g_signal_handler_disconnect (gtk_clipboard_get (GDK_SELECTION_PRIMARY), priv->clipboard_change_handler); - priv->clipboard_change_handler = 0; - } - if (priv->queue_change_handler > 0) { + + if (g_signal_handler_is_connected (G_OBJECT (modest_runtime_get_mail_operation_queue ()), + priv->queue_change_handler)) g_signal_handler_disconnect (G_OBJECT (modest_runtime_get_mail_operation_queue ()), priv->queue_change_handler); - priv->queue_change_handler = 0; - } - if (priv->account_removed_handler > 0) { + + if (g_signal_handler_is_connected (G_OBJECT (modest_runtime_get_account_store ()), + priv->account_removed_handler)) g_signal_handler_disconnect (G_OBJECT (modest_runtime_get_account_store ()), priv->account_removed_handler); - priv->account_removed_handler = 0; - } + + if (g_signal_handler_is_connected(G_OBJECT (priv->header_model), + priv->row_changed_handler)) + g_signal_handler_disconnect(G_OBJECT (priv->header_model), + priv->row_changed_handler); + + if (g_signal_handler_is_connected(G_OBJECT (priv->header_model), + priv->row_deleted_handler)) + g_signal_handler_disconnect(G_OBJECT (priv->header_model), + priv->row_deleted_handler); + + if (g_signal_handler_is_connected(G_OBJECT (priv->header_model), + priv->row_inserted_handler)) + g_signal_handler_disconnect(G_OBJECT (priv->header_model), + priv->row_inserted_handler); + + if (g_signal_handler_is_connected(G_OBJECT (priv->header_model), + priv->rows_reordered_handler)) + g_signal_handler_disconnect(G_OBJECT (priv->header_model), + priv->rows_reordered_handler); + + window_mgr = modest_runtime_get_window_mgr(); + g_assert(window_mgr != NULL); + + main_window = MODEST_MAIN_WINDOW( + modest_window_mgr_get_main_window(window_mgr)); + + if(main_window == NULL) + return; + + header_view = MODEST_HEADER_VIEW( + modest_main_window_get_child_widget( + main_window, MODEST_WIDGET_TYPE_HEADER_VIEW)); + + if (header_view == NULL) + return; + + modest_header_view_remove_observer(header_view, + MODEST_HEADER_VIEW_OBSERVER(self)); +} + +static void +modest_msg_view_window_finalize (GObject *obj) +{ + ModestMsgViewWindowPrivate *priv; + + priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (obj); + + /* Sanity check: shouldn't be needed, the window mgr should + call this function before */ + modest_msg_view_window_disconnect_signals (MODEST_WINDOW (obj)); + if (priv->header_model != NULL) { g_object_unref (priv->header_model); priv->header_model = NULL; @@ -473,6 +599,17 @@ modest_msg_view_window_finalize (GObject *obj) priv->progress_bar_timeout = 0; } + if (priv->remove_attachment_banner) { + gtk_widget_destroy (priv->remove_attachment_banner); + g_object_unref (priv->remove_attachment_banner); + priv->remove_attachment_banner = NULL; + } + + if (priv->purge_timeout > 0) { + g_source_remove (priv->purge_timeout); + priv->purge_timeout = 0; + } + if (priv->row_reference) { gtk_tree_row_reference_free (priv->row_reference); priv->row_reference = NULL; @@ -527,42 +664,12 @@ select_next_valid_row (GtkTreeModel *model, return retval; } -ModestWindow * -modest_msg_view_window_new_with_header_model (TnyMsg *msg, - const gchar *modest_account_name, - const gchar *msg_uid, - GtkTreeModel *model, - GtkTreeRowReference *row_reference) -{ - ModestMsgViewWindow *window = NULL; - ModestMsgViewWindowPrivate *priv = NULL; - - window = MODEST_MSG_VIEW_WINDOW(modest_msg_view_window_new (msg, modest_account_name, msg_uid)); - g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window), NULL); - - priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window); - - g_object_ref (model); - priv->header_model = model; - priv->row_reference = gtk_tree_row_reference_copy (row_reference); - priv->next_row_reference = gtk_tree_row_reference_copy (row_reference); - select_next_valid_row (model, &(priv->next_row_reference), TRUE); - - modest_msg_view_window_update_priority (window); - - /* Check toolbar dimming rules */ - modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window)); - - return MODEST_WINDOW(window); -} - - -ModestWindow * -modest_msg_view_window_new (TnyMsg *msg, +/* TODO: This should be in _init(), with the parameters as properties. */ +static void +modest_msg_view_window_construct (ModestMsgViewWindow *self, TnyMsg *msg, const gchar *modest_account_name, const gchar *msg_uid) { - ModestMsgViewWindow *self = NULL; GObject *obj = NULL; ModestMsgViewWindowPrivate *priv = NULL; ModestWindowPrivate *parent_priv = NULL; @@ -572,12 +679,11 @@ modest_msg_view_window_new (TnyMsg *msg, GError *error = NULL; GdkPixbuf *window_icon; - g_return_val_if_fail (msg, NULL); + g_return_if_fail (msg); - obj = g_object_new(MODEST_TYPE_MSG_VIEW_WINDOW, NULL); + obj = G_OBJECT (self); priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE(obj); parent_priv = MODEST_WINDOW_GET_PRIVATE(obj); - self = MODEST_MSG_VIEW_WINDOW (obj); priv->msg_uid = g_strdup (msg_uid); @@ -698,10 +804,297 @@ modest_msg_view_window_new (TnyMsg *msg, /* Check toolbar dimming rules */ modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (obj)); + +} + +ModestWindow * +modest_msg_view_window_new_with_header_model (TnyMsg *msg, + const gchar *modest_account_name, + const gchar *msg_uid, + GtkTreeModel *model, + GtkTreeRowReference *row_reference) +{ + ModestMsgViewWindow *window = NULL; + ModestMsgViewWindowPrivate *priv = NULL; + TnyFolder *header_folder = NULL; + ModestHeaderView *header_view = NULL; + ModestMainWindow *main_window = NULL; + ModestWindowMgr *window_mgr = NULL; + + window = g_object_new(MODEST_TYPE_MSG_VIEW_WINDOW, NULL); + g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window), NULL); + modest_msg_view_window_construct (window, msg, modest_account_name, msg_uid); + + priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window); + + /* Remember the message list's TreeModel so we can detect changes + * and change the list selection when necessary: */ + window_mgr = modest_runtime_get_window_mgr(); + g_assert(window_mgr != NULL); + main_window = MODEST_MAIN_WINDOW( + modest_window_mgr_get_main_window(window_mgr)); + g_assert(main_window != NULL); + header_view = MODEST_HEADER_VIEW(modest_main_window_get_child_widget( + main_window, MODEST_WIDGET_TYPE_HEADER_VIEW)); + if (header_view != NULL){ + header_folder = modest_header_view_get_folder(header_view); + g_assert(header_folder != NULL); + priv->header_folder_id = tny_folder_get_id(header_folder); + g_assert(priv->header_folder_id != NULL); + g_object_unref(header_folder); + } + + priv->header_model = g_object_ref(model); + priv->row_reference = gtk_tree_row_reference_copy (row_reference); + priv->next_row_reference = gtk_tree_row_reference_copy (row_reference); + select_next_valid_row (model, &(priv->next_row_reference), TRUE); + + priv->row_changed_handler = g_signal_connect( + GTK_TREE_MODEL(model), "row-changed", + G_CALLBACK(modest_msg_view_window_on_row_changed), + window); + priv->row_deleted_handler = g_signal_connect( + GTK_TREE_MODEL(model), "row-deleted", + G_CALLBACK(modest_msg_view_window_on_row_deleted), + window); + priv->row_inserted_handler = g_signal_connect ( + GTK_TREE_MODEL(model), "row-inserted", + G_CALLBACK(modest_msg_view_window_on_row_inserted), + window); + priv->rows_reordered_handler = g_signal_connect( + GTK_TREE_MODEL(model), "rows-reordered", + G_CALLBACK(modest_msg_view_window_on_row_reordered), + window); + + if (header_view != NULL){ + modest_header_view_add_observer(header_view, + MODEST_HEADER_VIEW_OBSERVER(window)); + } + + modest_msg_view_window_update_priority (window); + + /* Check toolbar dimming rules */ + modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window)); + + return MODEST_WINDOW(window); +} + +ModestWindow * +modest_msg_view_window_new_for_search_result (TnyMsg *msg, + const gchar *modest_account_name, + const gchar *msg_uid) +{ + ModestMsgViewWindow *window = NULL; + ModestMsgViewWindowPrivate *priv = NULL; + + window = g_object_new(MODEST_TYPE_MSG_VIEW_WINDOW, NULL); + g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window), NULL); + modest_msg_view_window_construct (window, msg, modest_account_name, msg_uid); + + priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window); + + /* Remember that this is a search result, + * so we can disable some UI appropriately: */ + priv->is_search_result = TRUE; + + return MODEST_WINDOW(window); +} + +ModestWindow * +modest_msg_view_window_new_for_attachment (TnyMsg *msg, + const gchar *modest_account_name, + const gchar *msg_uid) +{ + GObject *obj = NULL; + g_return_val_if_fail (msg, NULL); + + obj = g_object_new(MODEST_TYPE_MSG_VIEW_WINDOW, NULL); + modest_msg_view_window_construct (MODEST_MSG_VIEW_WINDOW (obj), + msg, modest_account_name, msg_uid); return MODEST_WINDOW(obj); } +void modest_msg_view_window_on_row_changed( + GtkTreeModel *header_model, + GtkTreePath *arg1, + GtkTreeIter *arg2, + ModestMsgViewWindow *window){ + modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window)); +} + +void modest_msg_view_window_on_row_deleted( + GtkTreeModel *header_model, + GtkTreePath *arg1, + ModestMsgViewWindow *window){ + modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window)); +} + +/* On insertions we check if the folder still has the message we are + * showing or do not. If do not, we do nothing. Which means we are still + * not attached to any header folder and thus next/prev buttons are + * still dimmed. Once the message that is shown by msg-view is found, the + * new model of header-view will be attached and the references will be set. + * On each further insertions dimming rules will be checked. However + * this requires extra CPU time at least works. + * (An message might be deleted from TnyFolder and thus will not be + * inserted into the model again for example if it is removed by the + * imap server and the header view is refreshed.) + */ +void modest_msg_view_window_on_row_inserted( + GtkTreeModel *new_model, + GtkTreePath *tree_path, + GtkTreeIter *tree_iter, + ModestMsgViewWindow *window){ + ModestMsgViewWindowPrivate *priv = NULL; + TnyHeader *header = NULL; + gchar *uid = NULL; + + g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window)); + + priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window); + + /* If we already has a model attached then the message shown by + * msg-view is in it, and thus we do not need any actions but + * to check the dimming rules.*/ + if(priv->header_model != NULL){ + gtk_tree_row_reference_free(priv->next_row_reference); + priv->next_row_reference = gtk_tree_row_reference_copy( + priv->row_reference); + select_next_valid_row (priv->header_model, + &(priv->next_row_reference), FALSE); + modest_ui_actions_check_toolbar_dimming_rules ( + MODEST_WINDOW (window)); + return; + } + + /* Check if the newly inserted message is the same we are actually + * showing. IF not, we should remain detached from the header model + * and thus prev and next toolbarbuttons should remain dimmed. */ + gtk_tree_model_get (new_model, tree_iter, + TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, &header, -1); + uid = modest_tny_folder_get_header_unique_id(header); + if(!g_str_equal(priv->msg_uid, uid)){ + g_free(uid); + return; + } + g_free(uid); + + /* Setup row_reference for the actual msg. */ + priv->row_reference = gtk_tree_row_reference_new( + new_model, tree_path); + if(priv->row_reference == NULL){ + g_warning("No reference for msg header item."); + return; + } + + /* Attach new_model and connect some callback to it to become able + * to detect changes in header-view. */ + priv->header_model = g_object_ref(new_model); + g_signal_connect (new_model, "row-changed", + G_CALLBACK (modest_msg_view_window_on_row_changed), + window); + g_signal_connect (new_model, "row-deleted", + G_CALLBACK (modest_msg_view_window_on_row_deleted), + window); + g_signal_connect (new_model, "rows-reordered", + G_CALLBACK (modest_msg_view_window_on_row_reordered), + window); + + /* Now set up next_row_reference. */ + priv->next_row_reference = gtk_tree_row_reference_copy( + priv->row_reference); + select_next_valid_row (priv->header_model, + &(priv->next_row_reference), FALSE); + + modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window)); +} + +void modest_msg_view_window_on_row_reordered( + GtkTreeModel *header_model, + GtkTreePath *arg1, + GtkTreeIter *arg2, + gpointer arg3, + ModestMsgViewWindow *window){ + modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window)); +} + +/* The modest_msg_view_window_update_model_replaced implements update + * function for ModestHeaderViewObserver. Checks whether the TnyFolder + * actually belongs to the header-view is the same as the TnyFolder of + * the message of msg-view or not. If they are different, there is + * nothing to do. If they are the same, then the model has replaced and + * the reference in msg-view shall be replaced from the old model to + * the new model. In this case the view will be detached from it's + * header folder. From this point the next/prev buttons are dimmed. + */ +void modest_msg_view_window_update_model_replaced( + ModestHeaderViewObserver *observer, + GtkTreeModel *model, + const gchar *tny_folder_id){ + ModestMsgViewWindowPrivate *priv = NULL; + ModestMsgViewWindow *window = NULL; + + g_assert(MODEST_IS_HEADER_VIEW_OBSERVER(observer)); + g_assert(MODEST_IS_MSG_VIEW_WINDOW(observer)); + + window = MODEST_MSG_VIEW_WINDOW(observer); + priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE(window); + + /* If there is an other folder in the header-view then we do + * not care about it's model (msg list). Else if the + * header-view shows the folder the msg shown by us is in, we + * shall replace our model reference and make some check. */ + if(tny_folder_id == NULL || + !g_str_equal(tny_folder_id, priv->header_folder_id)) + return; + + /* Model is changed(replaced), so we should forget the old + * one. Because there might be other references and there + * might be some change on the model even if we unreferenced + * it, we need to disconnect our signals here. */ + if (g_signal_handler_is_connected(G_OBJECT (priv->header_model), + priv->row_changed_handler)) + g_signal_handler_disconnect(G_OBJECT (priv->header_model), + priv->row_changed_handler); + priv->row_changed_handler = 0; + if (g_signal_handler_is_connected(G_OBJECT (priv->header_model), + priv->row_deleted_handler)) + g_signal_handler_disconnect(G_OBJECT (priv->header_model), + priv->row_deleted_handler); + priv->row_deleted_handler = 0; + if (g_signal_handler_is_connected(G_OBJECT (priv->header_model), + priv->row_inserted_handler)) + g_signal_handler_disconnect(G_OBJECT (priv->header_model), + priv->row_inserted_handler); + priv->row_inserted_handler = 0; + if (g_signal_handler_is_connected(G_OBJECT (priv->header_model), + priv->rows_reordered_handler)) + g_signal_handler_disconnect(G_OBJECT (priv->header_model), + priv->rows_reordered_handler); + priv->rows_reordered_handler = 0; + g_object_unref(priv->header_model); + priv->header_model = NULL; + g_object_unref(priv->row_reference); + priv->row_reference = NULL; + g_object_unref(priv->next_row_reference); + priv->next_row_reference = NULL; + + modest_ui_actions_check_toolbar_dimming_rules(MODEST_WINDOW(window)); + + if(tny_folder_id == NULL) + return; + + g_assert(model != NULL); + + /* Also we must connect to the new model for row insertions. + * Only for insertions now. We will need other ones only after + * the msg is show by msg-view is added to the new model. */ + priv->row_inserted_handler = g_signal_connect ( + model, "row-inserted", + G_CALLBACK(modest_msg_view_window_on_row_inserted), + window); +} gboolean modest_msg_view_window_toolbar_on_transfer_mode (ModestMsgViewWindow *self) @@ -726,7 +1119,9 @@ modest_msg_view_window_get_header (ModestMsgViewWindow *self) g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (self), NULL); priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (self); - /* Message is not obtained from a treemodel (Attachment ?) */ + /* If the message was not obtained from a treemodel, + * for instance if it was opened directly by the search UI: + */ if (priv->header_model == NULL) { msg = modest_msg_view_window_get_message (self); header = tny_msg_get_header (msg); @@ -734,7 +1129,11 @@ modest_msg_view_window_get_header (ModestMsgViewWindow *self) return header; } - /* Get current message iter */ + /* Get iter of the currently selected message in the header view: */ + /* TODO: Why not just give this window a ref of the TnyHeader or TnyMessage, + * instead of sometimes retrieving it from the header view? + * Then we wouldn't be dependent on the message actually still being selected + * in the header view. murrayc. */ path = gtk_tree_row_reference_get_path (priv->row_reference); g_return_val_if_fail (path != NULL, NULL); gtk_tree_model_get_iter (priv->header_model, @@ -987,32 +1386,33 @@ modest_msg_view_window_last_message_selected (ModestMsgViewWindow *window) GtkTreePath *path; ModestMsgViewWindowPrivate *priv; GtkTreeIter tmp_iter; - gboolean has_next = FALSE; + gboolean is_last_selected; g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window), TRUE); priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window); - if (priv->header_model) { - path = gtk_tree_row_reference_get_path (priv->row_reference); - if (path == NULL) return FALSE; - while (!has_next) { - TnyHeader *header; - gtk_tree_path_next (path); - if (!gtk_tree_model_get_iter (priv->header_model, &tmp_iter, path)) - break; - gtk_tree_model_get (priv->header_model, &tmp_iter, TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, - &header, -1); - if (!(tny_header_get_flags(header)&TNY_HEADER_FLAG_DELETED)) { - has_next = TRUE; - break; - } - } - gtk_tree_path_free (path); - return !has_next; - } else { + /*if no model (so no rows at all), then virtually we are the last*/ + if (!priv->header_model) + return TRUE; + + path = gtk_tree_row_reference_get_path (priv->row_reference); + if (path == NULL) return TRUE; + + is_last_selected = TRUE; + while (is_last_selected) { + TnyHeader *header; + gtk_tree_path_next (path); + if (!gtk_tree_model_get_iter (priv->header_model, &tmp_iter, path)) + break; + gtk_tree_model_get (priv->header_model, &tmp_iter, + TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, + &header, -1); + if (!(tny_header_get_flags(header) & TNY_HEADER_FLAG_DELETED)) + is_last_selected = FALSE; } - + gtk_tree_path_free (path); + return is_last_selected; } gboolean @@ -1027,57 +1427,61 @@ modest_msg_view_window_has_headers_model (ModestMsgViewWindow *window) } gboolean +modest_msg_view_window_is_search_result (ModestMsgViewWindow *window) +{ + ModestMsgViewWindowPrivate *priv; + + g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window), TRUE); + priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window); + + return priv->is_search_result; +} + +gboolean modest_msg_view_window_first_message_selected (ModestMsgViewWindow *window) { GtkTreePath *path; ModestMsgViewWindowPrivate *priv; - gboolean result; + gboolean is_first_selected; GtkTreeIter tmp_iter; +/* gchar * path_string;*/ g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window), TRUE); priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window); - if (priv->header_model) { - gchar * path_string; - path = gtk_tree_row_reference_get_path (priv->row_reference); - if (!path) - return TRUE; + /*if no model (so no rows at all), then virtually we are the first*/ + if (!priv->header_model) + return TRUE; - path_string = gtk_tree_path_to_string (path); - result = (strcmp (path_string, "0")==0); - if (result) { - g_free (path_string); - gtk_tree_path_free (path); - return result; - } + path = gtk_tree_row_reference_get_path (priv->row_reference); + if (!path) + return TRUE; - while (result) { - TnyHeader *header; +/* path_string = gtk_tree_path_to_string (path); + is_first_selected = strcmp (path_string, "0"); - gtk_tree_path_prev (path); - - if (!gtk_tree_model_get_iter (priv->header_model, &tmp_iter, path)) - break; - gtk_tree_model_get (priv->header_model, &tmp_iter, TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, - &header, -1); - if (!(tny_header_get_flags(header)&TNY_HEADER_FLAG_DELETED)) { - result = FALSE; - break; - } + g_free (path_string); + gtk_tree_path_free (path); - path_string = gtk_tree_path_to_string (path); - if (strcmp(path_string, "0")==0) { - g_free (path_string); - break; - } - g_free (path_string); - } - gtk_tree_path_free (path); - return result; - } else { - return TRUE; + return is_first_selected;*/ + + is_first_selected = TRUE; + while (is_first_selected) { + TnyHeader *header; + if(!gtk_tree_path_prev (path)) + break; + /* Here the 'if' is needless for logic, but let make sure + * iter is valid for gtk_tree_model_get. */ + if (!gtk_tree_model_get_iter (priv->header_model, &tmp_iter, path)) + break; + gtk_tree_model_get (priv->header_model, &tmp_iter, + TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, + &header, -1); + if (!(tny_header_get_flags(header) & TNY_HEADER_FLAG_DELETED)) + is_first_selected = FALSE; } - + gtk_tree_path_free (path); + return is_first_selected; } /** @@ -1100,9 +1504,22 @@ message_reader (ModestMsgViewWindow *window, { ModestMailOperation *mail_op = NULL; ModestMailOperationTypeOperation op_type; + gboolean already_showing = FALSE; + ModestWindow *msg_window = NULL; + ModestWindowMgr *mgr; g_return_val_if_fail (path != 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))) { + gboolean retval; + if (msg_window) + gtk_window_present (GTK_WINDOW (msg_window)); + g_signal_emit_by_name (G_OBJECT (window), "delete-event", NULL, &retval); + return TRUE; + } + /* Msg download completed */ if (tny_header_get_flags (header) & TNY_HEADER_FLAG_CACHED) { op_type = MODEST_MAIL_OPERATION_TYPE_OPEN; @@ -1732,7 +2149,6 @@ modest_msg_view_window_view_attachment (ModestMsgViewWindow *window, TnyMimePart if (tny_mime_part_is_purged (mime_part)) { g_object_unref (mime_part); - hildon_banner_show_information (NULL, NULL, _("mail_ib_attach_not_local")); return; } @@ -1784,7 +2200,9 @@ modest_msg_view_window_view_attachment (ModestMsgViewWindow *window, TnyMimePart gchar *account = g_strdup (modest_window_get_active_account (MODEST_WINDOW (window))); if (!account) account = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr ()); - msg_win = modest_msg_view_window_new (TNY_MSG (mime_part), account, NULL); + msg_win = modest_msg_view_window_new_for_attachment (TNY_MSG (mime_part), account, NULL); + modest_window_set_zoom (MODEST_WINDOW (msg_win), + modest_window_get_zoom (MODEST_WINDOW (window))); modest_window_mgr_register_window (mgr, msg_win); gtk_window_set_transient_for (GTK_WINDOW (msg_win), GTK_WINDOW (window)); gtk_widget_show_all (GTK_WIDGET (msg_win)); @@ -1835,21 +2253,27 @@ static gboolean idle_save_mime_part_show_result (SaveMimePartInfo *info) { if (info->pairs != NULL) { - gdk_threads_enter (); + /* This is a GDK lock because we are an idle callback and + * save_mime_parts_to_file_with_checks can contain Gtk+ code */ + + gdk_threads_enter (); /* CHECKED */ save_mime_parts_to_file_with_checks (info); - gdk_threads_leave (); + gdk_threads_leave (); /* CHECKED */ } else { gboolean result; result = info->result; - gdk_threads_enter (); + /* This is a GDK lock because we are an idle callback and + * hildon_banner_show_information is or does Gtk+ code */ + + gdk_threads_enter (); /* CHECKED */ save_mime_part_info_free (info, TRUE); if (result) { hildon_banner_show_information (NULL, NULL, _CS("sfil_ib_saved")); } else { hildon_banner_show_information (NULL, NULL, _("mail_ib_file_operation_failed")); } - gdk_threads_leave (); + gdk_threads_leave (); /* CHECKED */ } return FALSE; @@ -1940,7 +2364,7 @@ modest_msg_view_window_save_attachments (ModestMsgViewWindow *window, GList *mim canceled = TRUE; } } else { - save_multiple_str = g_strdup_printf (_("FIXME: %d attachments"), + save_multiple_str = g_strdup_printf (_FM("sfil_va_number_of_objects_attachments"), g_list_length (mime_parts)); } @@ -2017,6 +2441,23 @@ modest_msg_view_window_save_attachments (ModestMsgViewWindow *window, GList *mim } } +static gboolean +show_remove_attachment_information (gpointer userdata) +{ + ModestMsgViewWindow *window = (ModestMsgViewWindow *) userdata; + ModestMsgViewWindowPrivate *priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window); + + if (priv->remove_attachment_banner != NULL) { + gtk_widget_destroy (priv->remove_attachment_banner); + g_object_unref (priv->remove_attachment_banner); + } + + priv->remove_attachment_banner = g_object_ref ( + hildon_banner_show_animation (NULL, NULL, _("mcen_ib_removing_attachment"))); + + return FALSE; +} + void modest_msg_view_window_remove_attachments (ModestMsgViewWindow *window, gboolean get_all) { @@ -2080,13 +2521,12 @@ modest_msg_view_window_remove_attachments (ModestMsgViewWindow *window, gboolean if (response != GTK_RESPONSE_OK) return; + priv->purge_timeout = g_timeout_add (2000, show_remove_attachment_information, window); /* folder = tny_msg_get_folder (msg); */ /* tny_msg_uncache_attachments (msg); */ /* tny_folder_refresh (folder, NULL); */ /* g_object_unref (folder); */ - modest_platform_information_banner (NULL, NULL, _("mcen_ib_removing_attachment")); - for (node = mime_parts; node != NULL; node = g_list_next (node)) { tny_mime_part_set_purged (TNY_MIME_PART (node->data)); /* modest_msg_view_remove_attachment (MODEST_MSG_VIEW (priv->msg_view), node->data); */ @@ -2100,6 +2540,17 @@ modest_msg_view_window_remove_attachments (ModestMsgViewWindow *window, gboolean g_list_foreach (mime_parts, (GFunc) g_object_unref, NULL); g_list_free (mime_parts); + if (priv->purge_timeout > 0) { + g_source_remove (priv->purge_timeout); + priv->purge_timeout = 0; + } + + if (priv->remove_attachment_banner) { + gtk_widget_destroy (priv->remove_attachment_banner); + g_object_unref (priv->remove_attachment_banner); + priv->remove_attachment_banner = NULL; + } + }