X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-msg-view-window.c;h=a2144a39de989c2d1ddcf7c29030b8e07dedf3ec;hp=96cb18053ed1236f09d8c40af239984895fbed35;hb=f05f3bee660640d588296a7c388c1ca71c864324;hpb=a018028fe65794265523c1c93b15a43c104e0e2c diff --git a/src/maemo/modest-msg-view-window.c b/src/maemo/modest-msg-view-window.c index 96cb180..a2144a3 100644 --- a/src/maemo/modest-msg-view-window.c +++ b/src/maemo/modest-msg-view-window.c @@ -39,7 +39,6 @@ #include #include #include -#include #include #include "modest-msg-view-window-ui-dimming.h" #include @@ -48,7 +47,7 @@ #include #include #include -#include "modest-progress-bar-widget.h" +#include "modest-progress-bar.h" #include "modest-defs.h" #include "modest-hildon-includes.h" #include "modest-ui-dimming-manager.h" @@ -56,9 +55,11 @@ #include #include #include +#include #include #include #include +#include #define DEFAULT_FOLDER "MyDocs/.documents" @@ -94,34 +95,30 @@ 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 modest_msg_view_window_on_row_changed (GtkTreeModel *header_model, + GtkTreePath *arg1, + GtkTreeIter *arg2, + ModestMsgViewWindow *window); + +static void modest_msg_view_window_on_row_deleted (GtkTreeModel *header_model, + GtkTreePath *arg1, + ModestMsgViewWindow *window); + +static void modest_msg_view_window_on_row_inserted (GtkTreeModel *header_model, + GtkTreePath *tree_path, + GtkTreeIter *tree_iter, + ModestMsgViewWindow *window); + +static void modest_msg_view_window_on_row_reordered (GtkTreeModel *header_model, + GtkTreePath *arg1, + GtkTreeIter *arg2, + gpointer arg3, + ModestMsgViewWindow *window); + +static 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,6 +153,7 @@ static void init_window (ModestMsgViewWindow *obj); static gboolean msg_is_visible (TnyHeader *header, gboolean check_outbox); +static void check_dimming_rules_after_change (ModestMsgViewWindow *window); /* list my signals */ enum { @@ -473,8 +471,8 @@ set_toolbar_mode (ModestMsgViewWindow *self, /* Sets current toolbar mode */ priv->current_toolbar_mode = mode; - /* Update window dimming state */ - modest_ui_actions_check_window_dimming_rules (MODEST_WINDOW (self)); + /* Update toolbar dimming state */ + modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (self)); switch (mode) { case TOOLBAR_MODE_NORMAL: @@ -539,10 +537,8 @@ init_window (ModestMsgViewWindow *obj) { GtkWidget *main_vbox; ModestMsgViewWindowPrivate *priv; - ModestWindowPrivate *parent_priv; priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE(obj); - parent_priv = MODEST_WINDOW_GET_PRIVATE(obj); priv->msg_view = GTK_WIDGET (tny_platform_factory_new_msg_view (modest_tny_platform_factory_get_instance ())); modest_msg_view_set_shadow_type (MODEST_MSG_VIEW (priv->msg_view), GTK_SHADOW_NONE); @@ -691,7 +687,8 @@ select_next_valid_row (GtkTreeModel *model, gboolean cycle) { GtkTreeIter tmp_iter; - GtkTreePath *path, *next; + GtkTreePath *path; + GtkTreePath *next = NULL; gboolean retval = FALSE; g_return_val_if_fail (gtk_tree_row_reference_valid (*row_reference), FALSE); @@ -717,6 +714,8 @@ select_next_valid_row (GtkTreeModel *model, /* Free */ gtk_tree_path_free (path); + if (next) + gtk_tree_path_free (next); return retval; } @@ -724,13 +723,14 @@ select_next_valid_row (GtkTreeModel *model, /* TODO: This should be in _init(), with the parameters as properties. */ static void modest_msg_view_window_construct (ModestMsgViewWindow *self, - const gchar *modest_account_name, - const gchar *msg_uid) + const gchar *modest_account_name, + const gchar *msg_uid) { GObject *obj = NULL; ModestMsgViewWindowPrivate *priv = NULL; ModestWindowPrivate *parent_priv = NULL; - ModestDimmingRulesGroup *window_rules_group = NULL; + ModestDimmingRulesGroup *menu_rules_group = NULL; + ModestDimmingRulesGroup *toolbar_rules_group = NULL; ModestDimmingRulesGroup *clipboard_rules_group = NULL; obj = G_OBJECT (self); @@ -745,27 +745,30 @@ modest_msg_view_window_construct (ModestMsgViewWindow *self, gtk_widget_show (parent_priv->menubar); parent_priv->ui_dimming_manager = modest_ui_dimming_manager_new(); - window_rules_group = modest_dimming_rules_group_new ("ModestWindowDimmingRules", TRUE); - clipboard_rules_group = modest_dimming_rules_group_new ("ModestClipboardDimmingRules", FALSE); + menu_rules_group = modest_dimming_rules_group_new (MODEST_DIMMING_RULES_MENU, FALSE); + toolbar_rules_group = modest_dimming_rules_group_new (MODEST_DIMMING_RULES_TOOLBAR, TRUE); + clipboard_rules_group = modest_dimming_rules_group_new (MODEST_DIMMING_RULES_CLIPBOARD, FALSE); /* Add common dimming rules */ - modest_dimming_rules_group_add_rules (window_rules_group, - modest_msg_view_toolbar_dimming_entries, - G_N_ELEMENTS (modest_msg_view_toolbar_dimming_entries), - MODEST_WINDOW (self)); - modest_dimming_rules_group_add_rules (window_rules_group, + modest_dimming_rules_group_add_rules (menu_rules_group, modest_msg_view_menu_dimming_entries, G_N_ELEMENTS (modest_msg_view_menu_dimming_entries), MODEST_WINDOW (self)); + modest_dimming_rules_group_add_rules (toolbar_rules_group, + modest_msg_view_toolbar_dimming_entries, + G_N_ELEMENTS (modest_msg_view_toolbar_dimming_entries), + MODEST_WINDOW (self)); modest_dimming_rules_group_add_rules (clipboard_rules_group, modest_msg_view_clipboard_dimming_entries, G_N_ELEMENTS (modest_msg_view_clipboard_dimming_entries), MODEST_WINDOW (self)); /* Insert dimming rules group for this window */ - modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, window_rules_group); + modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, menu_rules_group); + modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, toolbar_rules_group); modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, clipboard_rules_group); - g_object_unref (window_rules_group); + g_object_unref (menu_rules_group); + g_object_unref (toolbar_rules_group); g_object_unref (clipboard_rules_group); restore_settings (MODEST_MSG_VIEW_WINDOW(obj)); @@ -820,7 +823,6 @@ modest_msg_view_window_construct (ModestMsgViewWindow *self, /* Init the clipboard actions dim status */ modest_msg_view_grab_focus(MODEST_MSG_VIEW (priv->msg_view)); - gtk_widget_show_all (GTK_WIDGET (obj)); update_window_title (MODEST_MSG_VIEW_WINDOW (obj)); @@ -841,6 +843,10 @@ modest_msg_view_window_new_with_header_model (TnyMsg *msg, ModestWindow *main_window = NULL; ModestWindowMgr *mgr = NULL; + MODEST_DEBUG_BLOCK ( + modest_tny_mime_part_to_string (TNY_MIME_PART (msg), 0); + ); + 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); @@ -861,14 +867,21 @@ modest_msg_view_window_new_with_header_model (TnyMsg *msg, if (header_view != NULL){ header_folder = modest_header_view_get_folder(header_view); - priv->is_outbox = (modest_tny_folder_guess_folder_type (header_folder) == TNY_FOLDER_TYPE_OUTBOX); - 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); + /* This could happen if the header folder was + unseleted before opening this msg window (for + example if the user selects an account in the + folder view of the main window */ + if (header_folder) { + priv->is_outbox = (modest_tny_folder_guess_folder_type (header_folder) == TNY_FOLDER_TYPE_OUTBOX); + 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); + /* Setup row references and connect signals */ + priv->header_model = g_object_ref (model); + if (row_reference) { priv->row_reference = gtk_tree_row_reference_copy (row_reference); priv->next_row_reference = gtk_tree_row_reference_copy (row_reference); @@ -878,22 +891,23 @@ modest_msg_view_window_new_with_header_model (TnyMsg *msg, priv->next_row_reference = NULL; } - 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); + /* Connect signals */ + 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, @@ -905,9 +919,10 @@ modest_msg_view_window_new_with_header_model (TnyMsg *msg, gtk_widget_show_all (GTK_WIDGET (window)); modest_msg_view_window_update_priority (window); - /* Check window dimming rules */ - modest_ui_actions_check_window_dimming_rules (MODEST_WINDOW (window)); - modest_window_check_dimming_rules_group (MODEST_WINDOW (window), "ModestClipboardDimmingRules"); + /* 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); } @@ -935,8 +950,13 @@ modest_msg_view_window_new_for_search_result (TnyMsg *msg, tny_msg_view_set_msg (TNY_MSG_VIEW (priv->msg_view), msg); update_window_title (window); + gtk_widget_show_all (GTK_WIDGET (window)); modest_msg_view_window_update_priority (window); + /* 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); } @@ -960,28 +980,63 @@ modest_msg_view_window_new_for_attachment (TnyMsg *msg, tny_msg_view_set_msg (TNY_MSG_VIEW (priv->msg_view), msg); update_window_title (MODEST_MSG_VIEW_WINDOW (obj)); - /* Check window dimming rules */ - modest_ui_actions_check_window_dimming_rules (MODEST_WINDOW (obj)); - modest_window_check_dimming_rules_group (MODEST_WINDOW (obj), "ModestClipboardDimmingRules"); + gtk_widget_show_all (GTK_WIDGET (obj)); + + /* Check dimming rules */ + modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (obj)); + modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (obj)); + modest_window_check_dimming_rules_group (MODEST_WINDOW (obj), MODEST_DIMMING_RULES_CLIPBOARD); 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_window_dimming_rules (MODEST_WINDOW (window)); +static void +modest_msg_view_window_on_row_changed (GtkTreeModel *header_model, + GtkTreePath *arg1, + GtkTreeIter *arg2, + ModestMsgViewWindow *window) +{ + check_dimming_rules_after_change (window); } -void modest_msg_view_window_on_row_deleted( - GtkTreeModel *header_model, - GtkTreePath *arg1, - ModestMsgViewWindow *window){ - modest_ui_actions_check_window_dimming_rules (MODEST_WINDOW (window)); +static void +modest_msg_view_window_on_row_deleted(GtkTreeModel *header_model, + GtkTreePath *arg1, + ModestMsgViewWindow *window) +{ + check_dimming_rules_after_change (window); } +static gboolean +check_dimming_rules_after_change_in_idle (gpointer data) +{ + /* The window could have dissapeared */ + if (MODEST_IS_WINDOW (data)) { + ModestWindow *win = MODEST_WINDOW (data); + gdk_threads_enter (); + modest_ui_actions_check_menu_dimming_rules (win); + modest_ui_actions_check_toolbar_dimming_rules (win); + gdk_threads_leave (); + } + + return FALSE; +} + +static void +check_dimming_rules_after_change (ModestMsgViewWindow *window) +{ + static guint dimming_delayer = 0; + + if (dimming_delayer > 0) + g_source_remove (dimming_delayer); + + /* We're expecting a lot of changes at the same time so don't + need to check dimming rules for every change that + happens */ + dimming_delayer = g_timeout_add (100, check_dimming_rules_after_change_in_idle, 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 @@ -993,90 +1048,122 @@ void modest_msg_view_window_on_row_deleted( * 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){ +static void +modest_msg_view_window_on_row_inserted (GtkTreeModel *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){ - if (priv->row_reference) { - 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_window_dimming_rules ( - MODEST_WINDOW (window)); - return; - } + g_assert (model == priv->header_model); + /* 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)){ + * and thus prev and next toolbar buttons should remain dimmed. */ + gtk_tree_model_get (model, tree_iter, + TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, + &header, -1); + + if (TNY_IS_HEADER (header)) { + gchar *uid = NULL; + + uid = modest_tny_folder_get_header_unique_id (header); + if (!g_str_equal(priv->msg_uid, uid)) { + check_dimming_rules_after_change (window); + g_free(uid); + g_object_unref (G_OBJECT(header)); + return; + } g_free(uid); g_object_unref(G_OBJECT(header)); - header = NULL; - return; } - if (!(tny_header_get_flags (header) & TNY_HEADER_FLAG_SEEN)) - tny_header_set_flag (header, TNY_HEADER_FLAG_SEEN); - g_object_unref(G_OBJECT(header)); - header = NULL; - g_free(uid); + + if (priv->row_reference) { + gtk_tree_row_reference_free (priv->row_reference); + } /* Setup row_reference for the actual msg. */ - priv->row_reference = gtk_tree_row_reference_new( - new_model, tree_path); - if(priv->row_reference == NULL){ + priv->row_reference = gtk_tree_row_reference_new (priv->header_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); + if (priv->next_row_reference) { + gtk_tree_row_reference_free (priv->next_row_reference); + } - modest_ui_actions_check_window_dimming_rules (MODEST_WINDOW (window)); + priv->next_row_reference = gtk_tree_row_reference_copy (priv->row_reference); + select_next_valid_row (priv->header_model, + &(priv->next_row_reference), FALSE); + + /* Connect the remaining callbacks to become able to detect + * changes in header-view. */ + priv->row_changed_handler = + g_signal_connect (priv->header_model, "row-changed", + G_CALLBACK (modest_msg_view_window_on_row_changed), + window); + priv->row_deleted_handler = + g_signal_connect (priv->header_model, "row-deleted", + G_CALLBACK (modest_msg_view_window_on_row_deleted), + window); + priv->rows_reordered_handler = + g_signal_connect (priv->header_model, "rows-reordered", + G_CALLBACK (modest_msg_view_window_on_row_reordered), + window); + + check_dimming_rules_after_change (window); } -void modest_msg_view_window_on_row_reordered( - GtkTreeModel *header_model, - GtkTreePath *arg1, - GtkTreeIter *arg2, - gpointer arg3, - ModestMsgViewWindow *window){ - modest_ui_actions_check_window_dimming_rules (MODEST_WINDOW (window)); +static void +modest_msg_view_window_on_row_reordered (GtkTreeModel *header_model, + GtkTreePath *arg1, + GtkTreeIter *arg2, + gpointer arg3, + ModestMsgViewWindow *window) +{ + ModestMsgViewWindowPrivate *priv = NULL; + gboolean already_changed = FALSE; + + priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE(window); + + /* If the current row was reordered select the proper next + valid row. The same if the next row reference changes */ + if (priv->row_reference && + gtk_tree_row_reference_valid (priv->row_reference)) { + GtkTreePath *path; + path = gtk_tree_row_reference_get_path (priv->row_reference); + if (gtk_tree_path_compare (path, arg1) == 0) { + if (priv->next_row_reference) { + 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 (header_model, &(priv->next_row_reference), FALSE); + already_changed = TRUE; + } + gtk_tree_path_free (path); + } + if (!already_changed && + priv->next_row_reference && + gtk_tree_row_reference_valid (priv->next_row_reference)) { + GtkTreePath *path; + path = gtk_tree_row_reference_get_path (priv->next_row_reference); + if (gtk_tree_path_compare (path, arg1) == 0) { + if (priv->next_row_reference) { + 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 (header_model, &(priv->next_row_reference), FALSE); + } + gtk_tree_path_free (path); + } + check_dimming_rules_after_change (window); } /* The modest_msg_view_window_update_model_replaced implements update @@ -1088,10 +1175,11 @@ void modest_msg_view_window_on_row_reordered( * 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){ +static void +modest_msg_view_window_update_model_replaced (ModestHeaderViewObserver *observer, + GtkTreeModel *model, + const gchar *tny_folder_id) +{ ModestMsgViewWindowPrivate *priv = NULL; ModestMsgViewWindow *window = NULL; @@ -1105,53 +1193,61 @@ void modest_msg_view_window_update_model_replaced( * 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)) + if(model == NULL || tny_folder_id == NULL || + (priv->header_folder_id && !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; - if (priv->row_reference) - g_object_unref(priv->row_reference); - priv->row_reference = NULL; - if (priv->next_row_reference) - g_object_unref(priv->next_row_reference); - priv->next_row_reference = NULL; + if (priv->header_model) { + 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); - modest_ui_actions_check_window_dimming_rules(MODEST_WINDOW(window)); + /* Frees */ + if (priv->row_reference) + gtk_tree_row_reference_free (priv->row_reference); + if (priv->next_row_reference) + gtk_tree_row_reference_free (priv->next_row_reference); + g_object_unref(priv->header_model); + + /* Initialize */ + priv->row_changed_handler = 0; + priv->row_deleted_handler = 0; + priv->row_inserted_handler = 0; + priv->rows_reordered_handler = 0; + priv->next_row_reference = NULL; + priv->row_reference = NULL; + priv->header_model = NULL; + } - g_assert(model != NULL); + priv->header_model = g_object_ref (model); /* 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); + priv->row_inserted_handler = + g_signal_connect (priv->header_model, "row-inserted", + G_CALLBACK(modest_msg_view_window_on_row_inserted), + window); + + modest_ui_actions_check_menu_dimming_rules(MODEST_WINDOW(window)); + modest_ui_actions_check_toolbar_dimming_rules(MODEST_WINDOW(window)); } gboolean @@ -1180,7 +1276,9 @@ modest_msg_view_window_get_header (ModestMsgViewWindow *self) /* 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 || priv->row_reference == NULL) { + if (priv->header_model == NULL || + priv->row_reference == NULL || + !gtk_tree_row_reference_valid (priv->row_reference)) { msg = modest_msg_view_window_get_message (self); if (msg) { header = tny_msg_get_header (msg); @@ -1190,12 +1288,6 @@ modest_msg_view_window_get_header (ModestMsgViewWindow *self) } /* 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. */ - if (!gtk_tree_row_reference_valid (priv->row_reference)) - return NULL; 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, @@ -1268,10 +1360,14 @@ modest_msg_view_window_find_toolbar_close (GtkWidget *widget, { GtkToggleAction *toggle; ModestWindowPrivate *parent_priv; + ModestMsgViewWindowPrivate *priv; + + priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (obj); parent_priv = MODEST_WINDOW_GET_PRIVATE (obj); toggle = GTK_TOGGLE_ACTION (gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/FindInMessage")); gtk_toggle_action_set_active (toggle, FALSE); + modest_msg_view_grab_focus (MODEST_MSG_VIEW (priv->msg_view)); } static void @@ -1306,6 +1402,7 @@ modest_msg_view_window_find_toolbar_search (GtkWidget *widget, priv->last_search = NULL; } else { modest_msg_view_grab_focus (MODEST_MSG_VIEW (priv->msg_view)); + hildon_find_toolbar_highlight_entry (HILDON_FIND_TOOLBAR (priv->find_toolbar), TRUE); } } else { if (!modest_isearch_view_search_next (MODEST_ISEARCH_VIEW (priv->msg_view))) { @@ -1314,6 +1411,7 @@ modest_msg_view_window_find_toolbar_search (GtkWidget *widget, priv->last_search = NULL; } else { modest_msg_view_grab_focus (MODEST_MSG_VIEW (priv->msg_view)); + hildon_find_toolbar_highlight_entry (HILDON_FIND_TOOLBAR (priv->find_toolbar), TRUE); } } @@ -1591,13 +1689,56 @@ modest_msg_view_window_first_message_selected (ModestMsgViewWindow *window) return is_first_selected; } +typedef struct { + TnyHeader *header; + GtkTreeRowReference *row_reference; +} MsgReaderInfo; + +static void +message_reader_performer (gboolean canceled, + GError *err, + GtkWindow *parent_window, + TnyAccount *account, + gpointer user_data) +{ + ModestMailOperation *mail_op = NULL; + MsgReaderInfo *info; + + info = (MsgReaderInfo *) user_data; + if (canceled || err) { + goto frees; + } + + /* Register the header - it'll be unregistered in the callback */ + modest_window_mgr_register_header (modest_runtime_get_window_mgr (), info->header, NULL); + + /* New mail operation */ + mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT(parent_window), + modest_ui_actions_disk_operations_error_handler, + 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); + g_object_unref (mail_op); + + /* Update dimming rules */ + modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (parent_window)); + modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (parent_window)); + + frees: + /* Frees. The row_reference will be freed by the view_msg_cb callback */ + g_object_unref (info->header); + g_slice_free (MsgReaderInfo, info); +} + + /** * 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 window dimming rules. + * 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 @@ -1609,10 +1750,12 @@ message_reader (ModestMsgViewWindow *window, TnyHeader *header, GtkTreeRowReference *row_reference) { - ModestMailOperation *mail_op = NULL; gboolean already_showing = FALSE; ModestWindow *msg_window = NULL; ModestWindowMgr *mgr; + TnyAccount *account; + TnyFolder *folder; + MsgReaderInfo *info; g_return_val_if_fail (row_reference != NULL, FALSE); @@ -1631,7 +1774,6 @@ message_reader (ModestMsgViewWindow *window, /* Ask the user if he wants to download the message if we're not online */ if (!tny_device_is_online (modest_runtime_get_device())) { - TnyFolder *folder = NULL; GtkResponseType response; response = modest_platform_run_confirmation_dialog (GTK_WINDOW (window), @@ -1639,30 +1781,31 @@ message_reader (ModestMsgViewWindow *window, if (response == GTK_RESPONSE_CANCEL) return FALSE; - /* Offer the connection dialog if necessary */ 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); - } + info = g_slice_new (MsgReaderInfo); + info->header = g_object_ref (header); + info->row_reference = gtk_tree_row_reference_copy (row_reference); + + /* Offer the connection dialog if necessary */ + modest_platform_connect_if_remote_and_perform ((GtkWindow *) window, + TRUE, + TNY_FOLDER_STORE (folder), + message_reader_performer, + info); + g_object_unref (folder); + return TRUE; } } - - /* New mail operation */ - mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT(window), - modest_ui_actions_get_msgs_full_error_handler, - NULL, 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, row_reference); - g_object_unref (mail_op); - - /* Update window dimming rules */ - modest_ui_actions_check_window_dimming_rules (MODEST_WINDOW (window)); + + folder = tny_header_get_folder (header); + 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); + + message_reader_performer (FALSE, NULL, (GtkWindow *) window, account, info); + g_object_unref (account); + g_object_unref (folder); return TRUE; } @@ -1714,61 +1857,22 @@ modest_msg_view_window_select_next_message (ModestMsgViewWindow *window) /* Read the message & show it */ if (!message_reader (window, priv, header, row_reference)) { retval = FALSE; - gtk_tree_row_reference_free (row_reference); } + gtk_tree_row_reference_free (row_reference); /* Free */ g_object_unref (header); - return retval; + return retval; } -gboolean -modest_msg_view_window_select_first_message (ModestMsgViewWindow *self) -{ - ModestMsgViewWindowPrivate *priv = NULL; - TnyHeader *header = NULL; - GtkTreeIter iter; - GtkTreePath *path = NULL; - GtkTreeRowReference *row_reference = NULL; - - g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (self), FALSE); - priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (self); - - /* Check that the model is not empty */ - if (!gtk_tree_model_get_iter_first (priv->header_model, &iter)) - return FALSE; - - /* Get the header */ - gtk_tree_model_get (priv->header_model, - &iter, - TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, - &header, -1); - g_return_val_if_fail (TNY_IS_HEADER (header), FALSE); - if (!msg_is_visible (header, priv->is_outbox)) { - g_object_unref (header); - return modest_msg_view_window_select_next_message (self); - } - - path = gtk_tree_model_get_path (priv->header_model, &iter); - row_reference = gtk_tree_row_reference_new (priv->header_model, path); - gtk_tree_path_free (path); - - /* Read the message & show it */ - message_reader (self, priv, header, row_reference); - - /* Free */ - g_object_unref (header); - - return TRUE; -} - gboolean modest_msg_view_window_select_previous_message (ModestMsgViewWindow *window) { ModestMsgViewWindowPrivate *priv = NULL; GtkTreePath *path; - GtkTreeRowReference *row_reference = NULL; + gboolean finished = FALSE; + gboolean retval = FALSE; g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window), FALSE); priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window); @@ -1778,7 +1882,7 @@ modest_msg_view_window_select_previous_message (ModestMsgViewWindow *window) return FALSE; path = gtk_tree_row_reference_get_path (priv->row_reference); - while (gtk_tree_path_prev (path)) { + while (!finished && gtk_tree_path_prev (path)) { TnyHeader *header; GtkTreeIter iter; @@ -1786,29 +1890,23 @@ modest_msg_view_window_select_previous_message (ModestMsgViewWindow *window) gtk_tree_model_get (priv->header_model, &iter, TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, &header, -1); - if (!header) - break; - if (!msg_is_visible (header, priv->is_outbox)) { - g_object_unref (header); - continue; - } - - row_reference = gtk_tree_row_reference_new (priv->header_model, path); - /* Read the message & show it */ - if (!message_reader (window, priv, header, row_reference)) { - gtk_tree_row_reference_free (row_reference); + finished = TRUE; + if (header) { + if (msg_is_visible (header, priv->is_outbox)) { + 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); + gtk_tree_row_reference_free (row_reference); + } else { + finished = FALSE; + } g_object_unref (header); - break; } - - gtk_tree_path_free (path); - g_object_unref (header); - - return TRUE; } gtk_tree_path_free (path); - return FALSE; + return retval; } static void @@ -1823,13 +1921,16 @@ view_msg_cb (ModestMailOperation *mail_op, ModestMsgViewWindowPrivate *priv = NULL; GtkTreeRowReference *row_reference = NULL; + /* Unregister the header (it was registered before creating the mail operation) */ + modest_window_mgr_unregister_header (modest_runtime_get_window_mgr (), header); + + row_reference = (GtkTreeRowReference *) user_data; if (canceled) { - g_object_unref (self); + gtk_tree_row_reference_free (row_reference); return; } /* If there was any error */ - row_reference = (GtkTreeRowReference *) user_data; if (!modest_ui_actions_msg_retrieval_check (mail_op, header, msg)) { gtk_tree_row_reference_free (row_reference); return; @@ -1844,9 +1945,11 @@ view_msg_cb (ModestMailOperation *mail_op, if (priv->row_reference != NULL) { gtk_tree_row_reference_free (priv->row_reference); priv->row_reference = gtk_tree_row_reference_copy (row_reference); + if (priv->next_row_reference != 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), TRUE); - gtk_tree_row_reference_free (row_reference); } /* Mark header as read */ @@ -1871,8 +1974,9 @@ view_msg_cb (ModestMailOperation *mail_op, g_signal_emit (G_OBJECT (self), signals[MSG_CHANGED_SIGNAL], 0, priv->header_model, priv->row_reference); - /* Free new references */ + /* Frees */ g_object_unref (self); + gtk_tree_row_reference_free (row_reference); } TnyFolderType @@ -1892,7 +1996,7 @@ modest_msg_view_window_get_folder_type (ModestMsgViewWindow *window) folder = tny_msg_get_folder (msg); if (folder) { - folder_type = tny_folder_get_folder_type (folder); + folder_type = modest_tny_folder_guess_folder_type (folder); g_object_unref (folder); } g_object_unref (msg); @@ -2046,7 +2150,7 @@ modest_msg_view_window_show_toolbar (ModestWindow *self, toolbar_resize (MODEST_MSG_VIEW_WINDOW (self)); /* Add ProgressBar (Transfer toolbar) */ - priv->progress_bar = modest_progress_bar_widget_new (); + priv->progress_bar = modest_progress_bar_new (); gtk_widget_set_no_show_all (priv->progress_bar, TRUE); placeholder = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ProgressbarView"); insert_index = gtk_toolbar_get_item_index(GTK_TOOLBAR (parent_priv->toolbar), GTK_TOOL_ITEM(placeholder)); @@ -2112,7 +2216,7 @@ modest_msg_view_window_clipboard_owner_change (GtkClipboard *clipboard, if (!GTK_WIDGET_VISIBLE (window)) return; - modest_window_check_dimming_rules_group (MODEST_WINDOW (window), "ModestClipboardDimmingRules"); + modest_window_check_dimming_rules_group (MODEST_WINDOW (window), MODEST_DIMMING_RULES_CLIPBOARD); } gboolean @@ -2229,9 +2333,8 @@ on_mail_operation_finished (ModestMailOperation *mail_op, if (op_type == MODEST_MAIL_OPERATION_TYPE_RECEIVE || op_type == MODEST_MAIL_OPERATION_TYPE_OPEN ) { while (tmp) { - modest_progress_object_remove_operation ( - MODEST_PROGRESS_OBJECT (tmp->data), - mail_op); + modest_progress_object_remove_operation (MODEST_PROGRESS_OBJECT (tmp->data), + mail_op); tmp = g_slist_next (tmp); } @@ -2239,6 +2342,14 @@ on_mail_operation_finished (ModestMailOperation *mail_op, if (observers_empty (self)) { set_toolbar_mode (self, TOOLBAR_MODE_NORMAL); } + + /* Update dimming rules. We have to do this right here + and not in view_msg_cb because at that point the + transfer mode is still enabled so the dimming rule + won't let the user delete the message that has been + readed for example */ + modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (self)); + modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (self)); } } @@ -2340,7 +2451,7 @@ modest_msg_view_window_view_attachment (ModestMsgViewWindow *window, TnyMimePart return; } - if (!TNY_IS_MSG (mime_part)) { + if (!modest_tny_mime_part_is_msg (mime_part)) { gchar *filepath = NULL; const gchar *att_filename = tny_mime_part_get_filename (mime_part); const gchar *content_type; @@ -2429,7 +2540,7 @@ typedef struct { GList *pairs; GtkWidget *banner; - gboolean result; + GnomeVFSResult result; } SaveMimePartInfo; static void save_mime_part_info_free (SaveMimePartInfo *info, gboolean with_struct); @@ -2452,7 +2563,6 @@ save_mime_part_info_free (SaveMimePartInfo *info, gboolean with_struct) info->pairs = NULL; if (with_struct) { gtk_widget_destroy (info->banner); - g_object_unref (info->banner); g_slice_free (SaveMimePartInfo, info); } } @@ -2463,16 +2573,16 @@ idle_save_mime_part_show_result (SaveMimePartInfo *info) if (info->pairs != NULL) { save_mime_part_to_file (info); } else { - gboolean result; - result = info->result; - /* 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) { + if (info->result == GNOME_VFS_OK) { hildon_banner_show_information (NULL, NULL, _CS("sfil_ib_saved")); + } else if (info->result == GNOME_VFS_ERROR_NO_SPACE) { + hildon_banner_show_information (NULL, NULL, dgettext("ke-recv", + "cerm_device_memory_full")); } else { hildon_banner_show_information (NULL, NULL, _("mail_ib_file_operation_failed")); } @@ -2485,26 +2595,22 @@ idle_save_mime_part_show_result (SaveMimePartInfo *info) static gpointer save_mime_part_to_file (SaveMimePartInfo *info) { - GnomeVFSResult result; GnomeVFSHandle *handle; TnyStream *stream; SaveMimePartPair *pair = (SaveMimePartPair *) info->pairs->data; - gboolean decode_result = TRUE; - result = gnome_vfs_create (&handle, pair->filename, GNOME_VFS_OPEN_WRITE, FALSE, 0644); - if (result == GNOME_VFS_OK) { + info->result = gnome_vfs_create (&handle, pair->filename, GNOME_VFS_OPEN_WRITE, FALSE, 0644); + if (info->result == GNOME_VFS_OK) { stream = tny_vfs_stream_new (handle); if (tny_mime_part_decode_to_stream (pair->part, stream, NULL) < 0) { - decode_result = FALSE; + info->result = GNOME_VFS_ERROR_IO; } g_object_unref (G_OBJECT (stream)); g_object_unref (pair->part); g_slice_free (SaveMimePartPair, pair); info->pairs = g_list_delete_link (info->pairs, info->pairs); - info->result = decode_result; } else { save_mime_part_info_free (info, FALSE); - info->result = FALSE; } g_idle_add ((GSourceFunc) idle_save_mime_part_show_result, info); @@ -2541,9 +2647,8 @@ save_mime_parts_to_file_with_checks (SaveMimePartInfo *info) } else { GtkWidget *banner = hildon_banner_show_animation (NULL, NULL, _CS("sfil_ib_saving")); - info->banner = g_object_ref (banner); + info->banner = banner; g_thread_create ((GThreadFunc)save_mime_part_to_file, info, FALSE, NULL); - g_object_unref (banner); } } @@ -2556,7 +2661,6 @@ modest_msg_view_window_save_attachments (ModestMsgViewWindow *window, TnyList *m GList *files_to_save = NULL; GtkWidget *save_dialog = NULL; gchar *folder = NULL; - gboolean canceled = FALSE; const gchar *filename = NULL; gchar *save_multiple_str = NULL; @@ -2578,11 +2682,15 @@ modest_msg_view_window_save_attachments (ModestMsgViewWindow *window, TnyList *m iter = tny_list_create_iterator (mime_parts); TnyMimePart *mime_part = (TnyMimePart *) tny_iterator_get_current (iter); g_object_unref (iter); - if (!TNY_IS_MSG (mime_part) && tny_mime_part_is_attachment (mime_part)) { + if (!modest_tny_mime_part_is_msg (mime_part) && + modest_tny_mime_part_is_attachment_for_modest (mime_part) && + !tny_mime_part_is_purged (mime_part)) { filename = tny_mime_part_get_filename (mime_part); } else { + /* TODO: show any error? */ g_warning ("Tried to save a non-file attachment"); - canceled = TRUE; + g_object_unref (mime_parts); + return; } g_object_unref (mime_part); } else { @@ -2606,6 +2714,7 @@ modest_msg_view_window_save_attachments (ModestMsgViewWindow *window, TnyList *m /* if multiple, set multiple string */ if (save_multiple_str) { g_object_set (G_OBJECT (save_dialog), "save-multiple", save_multiple_str, NULL); + gtk_window_set_title (GTK_WINDOW (save_dialog), _FM("sfil_ti_save_objects_files")); } /* show dialog */ @@ -2622,27 +2731,24 @@ modest_msg_view_window_save_attachments (ModestMsgViewWindow *window, TnyList *m while (!tny_iterator_is_done (iter)) { TnyMimePart *mime_part = (TnyMimePart *) tny_iterator_get_current (iter); - tny_iterator_next (iter); - if (tny_mime_part_is_attachment (mime_part)) { + if ((modest_tny_mime_part_is_attachment_for_modest (mime_part)) && + !tny_mime_part_is_purged (mime_part) && + (tny_mime_part_get_filename (mime_part) != NULL)) { SaveMimePartPair *pair; - - if ((!tny_iterator_is_done (iter)) && - (tny_mime_part_get_filename (mime_part) == NULL)) { - g_object_unref (mime_part); - continue; - } pair = g_slice_new0 (SaveMimePartPair); - if (tny_iterator_is_done (iter)) { - pair->filename = g_strdup (chooser_uri); + if (save_multiple_str) { + gchar *escaped = gnome_vfs_escape_slashes ( + tny_mime_part_get_filename (mime_part)); + pair->filename = g_build_filename (chooser_uri, escaped, NULL); + g_free (escaped); } else { - pair->filename = - g_build_filename (chooser_uri, - tny_mime_part_get_filename (mime_part), NULL); + pair->filename = g_strdup (chooser_uri); } pair->part = mime_part; files_to_save = g_list_prepend (files_to_save, pair); } + tny_iterator_next (iter); } g_object_unref (iter); } @@ -2722,23 +2828,24 @@ modest_msg_view_window_remove_attachments (ModestMsgViewWindow *window, gboolean n_attachments = tny_list_get_length (mime_parts); if (n_attachments == 1) { - const gchar *filename; + gchar *filename; TnyMimePart *part; iter = tny_list_create_iterator (mime_parts); part = (TnyMimePart *) tny_iterator_get_current (iter); g_object_unref (iter); - if (TNY_IS_MSG (part)) { + if (modest_tny_mime_part_is_msg (part)) { TnyHeader *header; header = tny_msg_get_header (TNY_MSG (part)); - filename = tny_header_get_subject (header); + filename = tny_header_dup_subject (header); g_object_unref (header); if (filename == NULL) - filename = _("mail_va_no_subject"); + filename = g_strdup (_("mail_va_no_subject")); } else { - filename = tny_mime_part_get_filename (TNY_MIME_PART (part)); + filename = g_strdup (tny_mime_part_get_filename (TNY_MIME_PART (part))); } confirmation_message = g_strdup_printf (_("mcen_nc_purge_file_text"), filename); + g_free (filename); g_object_unref (part); } else { confirmation_message = g_strdup_printf (ngettext("mcen_nc_purge_file_text", @@ -2801,18 +2908,21 @@ update_window_title (ModestMsgViewWindow *window) ModestMsgViewWindowPrivate *priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window); TnyMsg *msg = NULL; TnyHeader *header = NULL; - const gchar *subject = NULL; + gchar *subject = NULL; msg = tny_msg_view_get_msg (TNY_MSG_VIEW (priv->msg_view)); if (msg != NULL) { header = tny_msg_get_header (msg); - subject = tny_header_get_subject (header); + subject = tny_header_dup_subject (header); + g_object_unref (header); g_object_unref (msg); } - if ((subject == NULL)||(subject[0] == '\0')) - subject = _("mail_va_no_subject"); + if ((subject == NULL)||(subject[0] == '\0')) { + g_free (subject); + subject = g_strdup (_("mail_va_no_subject")); + } gtk_window_set_title (GTK_WINDOW (window), subject); }