X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-msg-view-window.c;h=eea919dfa2cc39d1d1f22c3b13a3af6dcf2972b0;hp=5676299fe9ed6a6ceb2db35d7b6e038a39ba170e;hb=3166614c9890ecc6a047f7acf463c0a0b65304f9;hpb=5097300975920f8e18482f2fbfa453a0b96e25b9 diff --git a/src/maemo/modest-msg-view-window.c b/src/maemo/modest-msg-view-window.c index 5676299..eea919d 100644 --- a/src/maemo/modest-msg-view-window.c +++ b/src/maemo/modest-msg-view-window.c @@ -50,10 +50,14 @@ #include "modest-progress-bar-widget.h" #include "modest-defs.h" #include "modest-hildon-includes.h" -#include #include "modest-ui-dimming-manager.h" #include #include +#include +#include +#include +#include +#include #define DEFAULT_FOLDER "MyDocs/.documents" @@ -132,9 +136,15 @@ static void on_account_removed (TnyAccountStore *account_store, TnyAccount *account, gpointer user_data); +static void on_move_focus (ModestMsgViewWindow *window, + GtkDirectionType direction, + gpointer userdata); + static void view_msg_cb (ModestMailOperation *mail_op, TnyHeader *header, + gboolean canceled, TnyMsg *msg, + GError *error, gpointer user_data); static void set_toolbar_mode (ModestMsgViewWindow *self, @@ -143,6 +153,7 @@ static void set_toolbar_mode (ModestMsgViewWindow *self, static void update_window_title (ModestMsgViewWindow *window); static gboolean set_toolbar_transfer_mode (ModestMsgViewWindow *self); +static void init_window (ModestMsgViewWindow *obj); /* list my signals */ @@ -153,7 +164,7 @@ enum { static const GtkToggleActionEntry msg_view_toggle_action_entries [] = { { "FindInMessage", MODEST_TOOLBAR_ICON_FIND, N_("qgn_toolb_gene_find"), NULL, NULL, G_CALLBACK (modest_msg_view_window_toggle_find_toolbar), FALSE }, - { "ToolsFindInMessage", NULL, N_("mcen_me_viewer_find"), NULL, NULL, G_CALLBACK (modest_msg_view_window_toggle_find_toolbar), FALSE }, + { "ToolsFindInMessage", NULL, N_("mcen_me_viewer_find"), "F", NULL, G_CALLBACK (modest_msg_view_window_toggle_find_toolbar), FALSE }, }; static const GtkRadioActionEntry msg_view_zoom_action_entries [] = { @@ -318,8 +329,55 @@ static void modest_msg_view_window_init (ModestMsgViewWindow *obj) { ModestMsgViewWindowPrivate *priv; + ModestWindowPrivate *parent_priv = NULL; + GtkActionGroup *action_group = NULL; + GError *error = NULL; + GdkPixbuf *window_icon; + priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE(obj); + parent_priv = MODEST_WINDOW_GET_PRIVATE(obj); + parent_priv->ui_manager = gtk_ui_manager_new(); + + action_group = gtk_action_group_new ("ModestMsgViewWindowActions"); + gtk_action_group_set_translation_domain (action_group, GETTEXT_PACKAGE); + + /* Add common actions */ + gtk_action_group_add_actions (action_group, + modest_action_entries, + G_N_ELEMENTS (modest_action_entries), + obj); + gtk_action_group_add_toggle_actions (action_group, + modest_toggle_action_entries, + G_N_ELEMENTS (modest_toggle_action_entries), + obj); + gtk_action_group_add_toggle_actions (action_group, + msg_view_toggle_action_entries, + G_N_ELEMENTS (msg_view_toggle_action_entries), + obj); + gtk_action_group_add_radio_actions (action_group, + msg_view_zoom_action_entries, + G_N_ELEMENTS (msg_view_zoom_action_entries), + 100, + G_CALLBACK (modest_ui_actions_on_change_zoom), + obj); + + gtk_ui_manager_insert_action_group (parent_priv->ui_manager, action_group, 0); + g_object_unref (action_group); + + /* Load the UI definition */ + gtk_ui_manager_add_ui_from_file (parent_priv->ui_manager, MODEST_UIDIR "modest-msg-view-window-ui.xml", + &error); + if (error) { + g_printerr ("modest: could not merge modest-msg-view-window-ui.xml: %s\n", error->message); + g_error_free (error); + error = NULL; + } + /* ****** */ + /* Add accelerators */ + gtk_window_add_accel_group (GTK_WINDOW (obj), + gtk_ui_manager_get_accel_group (parent_priv->ui_manager)); + priv->is_search_result = FALSE; priv->msg_view = NULL; @@ -339,6 +397,19 @@ modest_msg_view_window_init (ModestMsgViewWindow *obj) priv->purge_timeout = 0; priv->remove_attachment_banner = NULL; priv->msg_uid = NULL; + + /* Init window */ + init_window (MODEST_MSG_VIEW_WINDOW(obj)); + /* Set window icon */ + window_icon = modest_platform_get_icon (MODEST_APP_MSG_VIEW_ICON); + if (window_icon) { + gtk_window_set_icon (GTK_WINDOW (obj), window_icon); + g_object_unref (window_icon); + } + + + modest_window_mgr_register_help_id (modest_runtime_get_window_mgr(), + GTK_WINDOW(obj),"applications_email_viewer"); } @@ -455,7 +526,7 @@ menubar_to_menu (GtkUIManager *ui_manager) { GtkWidget *main_menu; GtkWidget *menubar; - GList *iter; + GList *iter, *children; /* Create new main menu */ main_menu = gtk_menu_new(); @@ -463,43 +534,61 @@ menubar_to_menu (GtkUIManager *ui_manager) /* Get the menubar from the UI manager */ menubar = gtk_ui_manager_get_widget (ui_manager, "/MenuBar"); - iter = gtk_container_get_children (GTK_CONTAINER (menubar)); + iter = children = gtk_container_get_children (GTK_CONTAINER (menubar)); while (iter) { GtkWidget *menu; menu = GTK_WIDGET (iter->data); gtk_widget_reparent(menu, main_menu); - + iter = g_list_next (iter); } + g_list_free (children); + return main_menu; } static void -init_window (ModestMsgViewWindow *obj, TnyMsg *msg) +init_window (ModestMsgViewWindow *obj) { GtkWidget *main_vbox; ModestMsgViewWindowPrivate *priv; ModestWindowPrivate *parent_priv; - + ModestConf *conf; + GtkAction *action = NULL; + priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE(obj); parent_priv = MODEST_WINDOW_GET_PRIVATE(obj); - priv->msg_view = modest_msg_view_new (msg); + 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); main_vbox = gtk_vbox_new (FALSE, 6); /* Menubar */ parent_priv->menubar = menubar_to_menu (parent_priv->ui_manager); - gtk_widget_show_all (GTK_WIDGET(parent_priv->menubar)); + conf = modest_runtime_get_conf (); + action = gtk_ui_manager_get_action (parent_priv->ui_manager, + "/MenuBar/ViewMenu/ViewShowToolbarMenu/ViewShowToolbarNormalScreenMenu"); + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), + modest_conf_get_bool (conf, MODEST_CONF_MSG_VIEW_WINDOW_SHOW_TOOLBAR, NULL)); + action = gtk_ui_manager_get_action (parent_priv->ui_manager, + "/MenuBar/ViewMenu/ViewShowToolbarMenu/ViewShowToolbarFullScreenMenu"); + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), + modest_conf_get_bool (conf, MODEST_CONF_MSG_VIEW_WINDOW_SHOW_TOOLBAR_FULLSCREEN, NULL)); hildon_window_set_menu (HILDON_WINDOW(obj), GTK_MENU(parent_priv->menubar)); + gtk_widget_show (GTK_WIDGET(parent_priv->menubar)); +#ifdef MODEST_USE_MOZEMBED + priv->main_scroll = priv->msg_view; + gtk_widget_set_size_request (priv->msg_view, -1, 1600); +#else priv->main_scroll = gtk_scrolled_window_new (NULL, NULL); + gtk_container_add (GTK_CONTAINER (priv->main_scroll), priv->msg_view); +#endif gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->main_scroll), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (priv->main_scroll), GTK_SHADOW_NONE); modest_maemo_set_thumbable_scrollbar (GTK_SCROLLED_WINDOW(priv->main_scroll), TRUE); - gtk_container_add (GTK_CONTAINER (priv->main_scroll), priv->msg_view); gtk_box_pack_start (GTK_BOX(main_vbox), priv->main_scroll, TRUE, TRUE, 0); gtk_container_add (GTK_CONTAINER(obj), main_vbox); @@ -509,7 +598,6 @@ init_window (ModestMsgViewWindow *obj, TnyMsg *msg) g_signal_connect (G_OBJECT (priv->find_toolbar), "close", G_CALLBACK (modest_msg_view_window_find_toolbar_close), obj); g_signal_connect (G_OBJECT (priv->find_toolbar), "search", G_CALLBACK (modest_msg_view_window_find_toolbar_search), obj); - 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)); } @@ -518,12 +606,12 @@ modest_msg_view_window_disconnect_signals (ModestWindow *self) { ModestMsgViewWindowPrivate *priv; ModestHeaderView *header_view = NULL; - ModestMainWindow *main_window = NULL; - ModestWindowMgr *window_mgr = NULL; - + ModestWindow *main_window = NULL; + priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (self); - if (g_signal_handler_is_connected (gtk_clipboard_get (GDK_SELECTION_PRIMARY), + if (gtk_clipboard_get (GDK_SELECTION_PRIMARY) && + 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); @@ -538,39 +626,37 @@ modest_msg_view_window_disconnect_signals (ModestWindow *self) g_signal_handler_disconnect (G_OBJECT (modest_runtime_get_account_store ()), priv->account_removed_handler); - 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), + 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); + } - 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) + main_window = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr(), + FALSE); /* don't create */ + if (!main_window) return; - + header_view = MODEST_HEADER_VIEW( modest_main_window_get_child_widget( - main_window, MODEST_WIDGET_TYPE_HEADER_VIEW)); - + MODEST_MAIN_WINDOW(main_window), + MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW)); if (header_view == NULL) return; @@ -666,7 +752,7 @@ 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, TnyMsg *msg, +modest_msg_view_window_construct (ModestMsgViewWindow *self, const gchar *modest_account_name, const gchar *msg_uid) { @@ -675,94 +761,48 @@ modest_msg_view_window_construct (ModestMsgViewWindow *self, TnyMsg *msg, ModestWindowPrivate *parent_priv = NULL; ModestDimmingRulesGroup *menu_rules_group = NULL; ModestDimmingRulesGroup *toolbar_rules_group = NULL; - GtkActionGroup *action_group = NULL; - GError *error = NULL; - GdkPixbuf *window_icon; + ModestDimmingRulesGroup *clipboard_rules_group = NULL; - g_return_if_fail (msg); - obj = G_OBJECT (self); priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE(obj); parent_priv = MODEST_WINDOW_GET_PRIVATE(obj); priv->msg_uid = g_strdup (msg_uid); - parent_priv->ui_manager = gtk_ui_manager_new(); parent_priv->ui_dimming_manager = modest_ui_dimming_manager_new(); - action_group = gtk_action_group_new ("ModestMsgViewWindowActions"); - gtk_action_group_set_translation_domain (action_group, GETTEXT_PACKAGE); - menu_rules_group = modest_dimming_rules_group_new ("ModestMenuDimmingRules", FALSE); toolbar_rules_group = modest_dimming_rules_group_new ("ModestToolbarDimmingRules", TRUE); - - /* Add common actions */ - gtk_action_group_add_actions (action_group, - modest_action_entries, - G_N_ELEMENTS (modest_action_entries), - obj); - gtk_action_group_add_toggle_actions (action_group, - modest_toggle_action_entries, - G_N_ELEMENTS (modest_toggle_action_entries), - obj); - gtk_action_group_add_toggle_actions (action_group, - msg_view_toggle_action_entries, - G_N_ELEMENTS (msg_view_toggle_action_entries), - obj); - gtk_action_group_add_radio_actions (action_group, - msg_view_zoom_action_entries, - G_N_ELEMENTS (msg_view_zoom_action_entries), - 100, - G_CALLBACK (modest_ui_actions_on_change_zoom), - obj); - - gtk_ui_manager_insert_action_group (parent_priv->ui_manager, action_group, 0); - g_object_unref (action_group); - - /* Load the UI definition */ - gtk_ui_manager_add_ui_from_file (parent_priv->ui_manager, MODEST_UIDIR "modest-msg-view-window-ui.xml", - &error); - if (error) { - g_printerr ("modest: could not merge modest-msg-view-window-ui.xml: %s\n", error->message); - g_error_free (error); - error = NULL; - } - /* ****** */ + clipboard_rules_group = modest_dimming_rules_group_new ("ModestClipboardDimmingRules", FALSE); /* Add common dimming rules */ modest_dimming_rules_group_add_rules (menu_rules_group, modest_msg_view_menu_dimming_entries, G_N_ELEMENTS (modest_msg_view_menu_dimming_entries), - self); + 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), - self); + 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, 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 (menu_rules_group); g_object_unref (toolbar_rules_group); + g_object_unref (clipboard_rules_group); - /* Add accelerators */ - gtk_window_add_accel_group (GTK_WINDOW (obj), - gtk_ui_manager_get_accel_group (parent_priv->ui_manager)); - - /* Init window */ - init_window (MODEST_MSG_VIEW_WINDOW(obj), msg); restore_settings (MODEST_MSG_VIEW_WINDOW(obj)); - /* Set window icon */ - window_icon = modest_platform_get_icon (MODEST_APP_MSG_VIEW_ICON); - if (window_icon) { - gtk_window_set_icon (GTK_WINDOW (obj), window_icon); - g_object_unref (window_icon); - } - /* g_signal_connect (G_OBJECT(obj), "delete-event", G_CALLBACK(on_delete_event), obj); */ - g_signal_connect (G_OBJECT(priv->msg_view), "link_clicked", + 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); + g_signal_connect (G_OBJECT(priv->msg_view), "activate_link", G_CALLBACK (modest_ui_actions_on_msg_link_clicked), obj); g_signal_connect (G_OBJECT(priv->msg_view), "link_hover", G_CALLBACK (modest_ui_actions_on_msg_link_hover), obj); @@ -781,6 +821,9 @@ modest_msg_view_window_construct (ModestMsgViewWindow *self, TnyMsg *msg, G_CALLBACK (modest_msg_view_window_window_state_event), NULL); + g_signal_connect (G_OBJECT (obj), "move-focus", + G_CALLBACK (on_move_focus), obj); + /* Mail Operation Queue */ priv->queue_change_handler = g_signal_connect (G_OBJECT (modest_runtime_get_mail_operation_queue ()), "queue-changed", @@ -804,9 +847,11 @@ modest_msg_view_window_construct (ModestMsgViewWindow *self, TnyMsg *msg, /* Check toolbar dimming rules */ modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (obj)); - + modest_window_check_dimming_rules_group (MODEST_WINDOW (obj), "ModestClipboardDimmingRules"); + } +/* FIXME: parameter checks */ ModestWindow * modest_msg_view_window_new_with_header_model (TnyMsg *msg, const gchar *modest_account_name, @@ -818,24 +863,29 @@ modest_msg_view_window_new_with_header_model (TnyMsg *msg, ModestMsgViewWindowPrivate *priv = NULL; TnyFolder *header_folder = NULL; ModestHeaderView *header_view = NULL; - ModestMainWindow *main_window = NULL; - ModestWindowMgr *window_mgr = NULL; + ModestWindow *main_window = NULL; + ModestWindowMgr *mgr = NULL; - window = g_object_new(MODEST_TYPE_MSG_VIEW_WINDOW, NULL); + mgr = modest_runtime_get_window_mgr (); + window = MODEST_MSG_VIEW_WINDOW (modest_window_mgr_get_msg_view_window (mgr)); g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window), NULL); - modest_msg_view_window_construct (window, msg, modest_account_name, msg_uid); + + modest_msg_view_window_construct (window, 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); + + main_window = modest_window_mgr_get_main_window(mgr, FALSE); /* don't create */ + if (!main_window) { + g_warning ("%s: BUG: no main window", __FUNCTION__); + return NULL; + } + header_view = MODEST_HEADER_VIEW(modest_main_window_get_child_widget( - main_window, MODEST_WIDGET_TYPE_HEADER_VIEW)); + MODEST_MAIN_WINDOW(main_window), + MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW)); if (header_view != NULL){ header_folder = modest_header_view_get_folder(header_view); g_assert(header_folder != NULL); @@ -871,6 +921,10 @@ modest_msg_view_window_new_with_header_model (TnyMsg *msg, MODEST_HEADER_VIEW_OBSERVER(window)); } + tny_msg_view_set_msg (TNY_MSG_VIEW (priv->msg_view), msg); + update_window_title (MODEST_MSG_VIEW_WINDOW (window)); + gtk_widget_show_all (GTK_WIDGET (window)); + modest_msg_view_window_update_priority (window); /* Check toolbar dimming rules */ @@ -886,10 +940,12 @@ modest_msg_view_window_new_for_search_result (TnyMsg *msg, { ModestMsgViewWindow *window = NULL; ModestMsgViewWindowPrivate *priv = NULL; + ModestWindowMgr *mgr = NULL; - window = g_object_new(MODEST_TYPE_MSG_VIEW_WINDOW, NULL); + mgr = modest_runtime_get_window_mgr (); + window = MODEST_MSG_VIEW_WINDOW (modest_window_mgr_get_msg_view_window (mgr)); g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window), NULL); - modest_msg_view_window_construct (window, msg, modest_account_name, msg_uid); + modest_msg_view_window_construct (window, modest_account_name, msg_uid); priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window); @@ -897,6 +953,9 @@ modest_msg_view_window_new_for_search_result (TnyMsg *msg, * so we can disable some UI appropriately: */ priv->is_search_result = TRUE; + tny_msg_view_set_msg (TNY_MSG_VIEW (priv->msg_view), msg); + update_window_title (window); + return MODEST_WINDOW(window); } @@ -906,11 +965,18 @@ modest_msg_view_window_new_for_attachment (TnyMsg *msg, const gchar *msg_uid) { GObject *obj = NULL; + ModestMsgViewWindowPrivate *priv; + ModestWindowMgr *mgr = NULL; + g_return_val_if_fail (msg, NULL); - - obj = g_object_new(MODEST_TYPE_MSG_VIEW_WINDOW, NULL); + mgr = modest_runtime_get_window_mgr (); + obj = G_OBJECT (modest_window_mgr_get_msg_view_window (mgr)); + priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (obj); modest_msg_view_window_construct (MODEST_MSG_VIEW_WINDOW (obj), - msg, modest_account_name, msg_uid); + modest_account_name, msg_uid); + + tny_msg_view_set_msg (TNY_MSG_VIEW (priv->msg_view), msg); + update_window_title (MODEST_MSG_VIEW_WINDOW (obj)); return MODEST_WINDOW(obj); } @@ -974,6 +1040,8 @@ void modest_msg_view_window_on_row_inserted( 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); + g_object_unref(G_OBJECT(header)); + header = NULL; if(!g_str_equal(priv->msg_uid, uid)){ g_free(uid); return; @@ -1045,10 +1113,9 @@ 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(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 @@ -1082,9 +1149,6 @@ void modest_msg_view_window_update_model_replaced( 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. @@ -1124,8 +1188,10 @@ modest_msg_view_window_get_header (ModestMsgViewWindow *self) */ if (priv->header_model == NULL) { msg = modest_msg_view_window_get_message (self); - header = tny_msg_get_header (msg); - g_object_unref (msg); + if (msg) { + header = tny_msg_get_header (msg); + g_object_unref (msg); + } return header; } @@ -1134,6 +1200,8 @@ modest_msg_view_window_get_header (ModestMsgViewWindow *self) * 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, @@ -1152,16 +1220,13 @@ modest_msg_view_window_get_header (ModestMsgViewWindow *self) TnyMsg* modest_msg_view_window_get_message (ModestMsgViewWindow *self) { - ModestMsgView *msg_view; ModestMsgViewWindowPrivate *priv; - + g_return_val_if_fail (self, NULL); - + priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE(self); - - msg_view = MODEST_MSG_VIEW (priv->msg_view); - - return modest_msg_view_get_message (msg_view); + + return tny_msg_view_get_msg (TNY_MSG_VIEW (priv->msg_view)); } const gchar* @@ -1222,7 +1287,7 @@ modest_msg_view_window_find_toolbar_search (GtkWidget *widget, gchar *current_search; ModestMsgViewWindowPrivate *priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (obj); - if (modest_msg_view_get_message_is_empty (MODEST_MSG_VIEW (priv->msg_view))) { + if (modest_mime_part_view_is_empty (MODEST_MIME_PART_VIEW (priv->msg_view))) { hildon_banner_show_information (NULL, NULL, _("mail_ib_nothing_to_find")); return; } @@ -1239,18 +1304,22 @@ modest_msg_view_window_find_toolbar_search (GtkWidget *widget, gboolean result; g_free (priv->last_search); priv->last_search = g_strdup (current_search); - result = modest_msg_view_search (MODEST_MSG_VIEW (priv->msg_view), - priv->last_search); + result = modest_isearch_view_search (MODEST_ISEARCH_VIEW (priv->msg_view), + priv->last_search); if (!result) { hildon_banner_show_information (NULL, NULL, dgettext("hildon-libs", "ckct_ib_find_no_matches")); g_free (priv->last_search); priv->last_search = NULL; - } + } else { + modest_msg_view_grab_focus (MODEST_MSG_VIEW (priv->msg_view)); + } } else { - if (!modest_msg_view_search_next (MODEST_MSG_VIEW (priv->msg_view))) { + if (!modest_isearch_view_search_next (MODEST_ISEARCH_VIEW (priv->msg_view))) { hildon_banner_show_information (NULL, NULL, dgettext("hildon-libs", "ckct_ib_find_search_complete")); g_free (priv->last_search); priv->last_search = NULL; + } else { + modest_msg_view_grab_focus (MODEST_MSG_VIEW (priv->msg_view)); } } @@ -1263,11 +1332,20 @@ modest_msg_view_window_set_zoom (ModestWindow *window, gdouble zoom) { ModestMsgViewWindowPrivate *priv; + ModestWindowPrivate *parent_priv; + GtkAction *action = NULL; + gint int_zoom = (gint) rint (zoom*100.0+0.1); g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window)); priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window); - modest_msg_view_set_zoom (MODEST_MSG_VIEW (priv->msg_view), zoom); + parent_priv = MODEST_WINDOW_GET_PRIVATE (window); + modest_zoomable_set_zoom (MODEST_ZOOMABLE (priv->msg_view), zoom); + + action = gtk_ui_manager_get_action (parent_priv->ui_manager, + "/MenuBar/ViewMenu/ZoomMenu/Zoom50Menu"); + + gtk_radio_action_set_current_value (GTK_RADIO_ACTION (action), int_zoom); } static gdouble @@ -1278,7 +1356,7 @@ modest_msg_view_window_get_zoom (ModestWindow *window) g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window), 1.0); priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window); - return modest_msg_view_get_zoom (MODEST_MSG_VIEW (priv->msg_view)); + return modest_zoomable_get_zoom (MODEST_ZOOMABLE (priv->msg_view)); } static gboolean @@ -1408,8 +1486,11 @@ modest_msg_view_window_last_message_selected (ModestMsgViewWindow *window) 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; + if (header) { + if (!(tny_header_get_flags(header) & TNY_HEADER_FLAG_DELETED)) + is_last_selected = FALSE; + g_object_unref(G_OBJECT(header)); + } } gtk_tree_path_free (path); return is_last_selected; @@ -1477,8 +1558,11 @@ modest_msg_view_window_first_message_selected (ModestMsgViewWindow *window) 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; + if (header) { + if (!(tny_header_get_flags(header) & TNY_HEADER_FLAG_DELETED)) + is_first_selected = FALSE; + g_object_unref(G_OBJECT(header)); + } } gtk_tree_path_free (path); return is_first_selected; @@ -1500,7 +1584,7 @@ static gboolean message_reader (ModestMsgViewWindow *window, ModestMsgViewWindowPrivate *priv, TnyHeader *header, - GtkTreePath *path) + GtkTreeRowReference *row_reference) { ModestMailOperation *mail_op = NULL; ModestMailOperationTypeOperation op_type; @@ -1508,7 +1592,7 @@ message_reader (ModestMsgViewWindow *window, ModestWindow *msg_window = NULL; ModestWindowMgr *mgr; - g_return_val_if_fail (path != NULL, FALSE); + g_return_val_if_fail (row_reference != NULL, FALSE); mgr = modest_runtime_get_window_mgr (); already_showing = modest_window_mgr_find_registered_header (mgr, header, &msg_window); @@ -1551,13 +1635,12 @@ message_reader (ModestMsgViewWindow *window, } /* New mail operation */ - mail_op = modest_mail_operation_new_with_error_handling (op_type, - G_OBJECT(window), + mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT(window), modest_ui_actions_get_msgs_full_error_handler, - NULL); + 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, path); + modest_mail_operation_get_msg (mail_op, header, view_msg_cb, row_reference); g_object_unref (mail_op); /* Update toolbar dimming rules */ @@ -1574,6 +1657,7 @@ modest_msg_view_window_select_next_message (ModestMsgViewWindow *window) GtkTreeIter tmp_iter; TnyHeader *header; gboolean retval = TRUE; + GtkTreeRowReference *row_reference = NULL; g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window), FALSE); priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window); @@ -1595,18 +1679,21 @@ modest_msg_view_window_select_next_message (ModestMsgViewWindow *window) if (path == NULL) return FALSE; + row_reference = gtk_tree_row_reference_copy (priv->next_row_reference); + gtk_tree_model_get_iter (priv->header_model, &tmp_iter, path); + gtk_tree_path_free (path); gtk_tree_model_get (priv->header_model, &tmp_iter, TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, &header, -1); /* Read the message & show it */ - if (!message_reader (window, priv, header, path)) { + if (!message_reader (window, priv, header, row_reference)) { retval = FALSE; - gtk_tree_path_free (path); + gtk_tree_row_reference_free (row_reference); } /* Free */ @@ -1621,7 +1708,8 @@ modest_msg_view_window_select_first_message (ModestMsgViewWindow *self) ModestMsgViewWindowPrivate *priv = NULL; TnyHeader *header = NULL; GtkTreeIter iter; - GtkTreePath *path; + 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); @@ -1642,9 +1730,11 @@ modest_msg_view_window_select_first_message (ModestMsgViewWindow *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, path); + message_reader (self, priv, header, row_reference); /* Free */ g_object_unref (header); @@ -1657,6 +1747,7 @@ modest_msg_view_window_select_previous_message (ModestMsgViewWindow *window) { ModestMsgViewWindowPrivate *priv = NULL; GtkTreePath *path; + GtkTreeRowReference *row_reference = NULL; g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window), FALSE); priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window); @@ -1681,12 +1772,15 @@ modest_msg_view_window_select_previous_message (ModestMsgViewWindow *window) continue; } + row_reference = gtk_tree_row_reference_new (priv->header_model, path); /* Read the message & show it */ - if (!message_reader (window, priv, header, path)) { + if (!message_reader (window, priv, header, row_reference)) { + gtk_tree_row_reference_free (row_reference); g_object_unref (header); break; } + gtk_tree_path_free (path); g_object_unref (header); return TRUE; @@ -1699,17 +1793,19 @@ modest_msg_view_window_select_previous_message (ModestMsgViewWindow *window) static void view_msg_cb (ModestMailOperation *mail_op, TnyHeader *header, + gboolean canceled, TnyMsg *msg, + GError *error, gpointer user_data) { ModestMsgViewWindow *self = NULL; ModestMsgViewWindowPrivate *priv = NULL; - GtkTreePath *path; + GtkTreeRowReference *row_reference = NULL; /* If there was any error */ - path = (GtkTreePath *) user_data; + row_reference = (GtkTreeRowReference *) user_data; if (!modest_ui_actions_msg_retrieval_check (mail_op, header, msg)) { - gtk_tree_path_free (path); + gtk_tree_row_reference_free (row_reference); return; } @@ -1720,17 +1816,17 @@ view_msg_cb (ModestMailOperation *mail_op, /* Update the row reference */ gtk_tree_row_reference_free (priv->row_reference); - priv->row_reference = gtk_tree_row_reference_new (priv->header_model, path); + priv->row_reference = gtk_tree_row_reference_copy (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_path_free (path); + gtk_tree_row_reference_free (row_reference); /* Mark header as read */ if (!(tny_header_get_flags (header) & TNY_HEADER_FLAG_SEEN)) - tny_header_set_flags (header, TNY_HEADER_FLAG_SEEN); + tny_header_set_flag (header, TNY_HEADER_FLAG_SEEN); /* Set new message */ - modest_msg_view_set_message (MODEST_MSG_VIEW (priv->msg_view), msg); + tny_msg_view_set_msg (TNY_MSG_VIEW (priv->msg_view), msg); modest_msg_view_window_update_priority (self); update_window_title (MODEST_MSG_VIEW_WINDOW (self)); modest_msg_view_grab_focus (MODEST_MSG_VIEW (priv->msg_view)); @@ -1760,20 +1856,13 @@ modest_msg_view_window_get_folder_type (ModestMsgViewWindow *window) folder_type = TNY_FOLDER_TYPE_UNKNOWN; - msg = modest_msg_view_get_message (MODEST_MSG_VIEW (priv->msg_view)); + msg = tny_msg_view_get_msg (TNY_MSG_VIEW (priv->msg_view)); if (msg) { TnyFolder *folder; folder = tny_msg_get_folder (msg); - if (folder) { folder_type = tny_folder_get_folder_type (folder); - - if (folder_type == TNY_FOLDER_TYPE_NORMAL || folder_type == TNY_FOLDER_TYPE_UNKNOWN) { - const gchar *fname = tny_folder_get_name (folder); - folder_type = modest_tny_folder_guess_folder_type_from_name (fname); - } - g_object_unref (folder); } g_object_unref (msg); @@ -1804,7 +1893,10 @@ 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); + if (header) { + flags = tny_header_get_flags (header); + g_object_unref(G_OBJECT(header)); + } gtk_tree_path_free (path); } @@ -1838,18 +1930,6 @@ modest_msg_view_window_window_state_event (GtkWidget *widget, GdkEventWindowStat } -void -modest_msg_view_window_toggle_fullscreen (ModestMsgViewWindow *window) -{ - ModestWindowPrivate *parent_priv; - GtkAction *fs_toggle_action; - parent_priv = MODEST_WINDOW_GET_PRIVATE (window); - - fs_toggle_action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ViewMenu/ViewToggleFullscreenMenu"); - gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (fs_toggle_action), - !gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (fs_toggle_action))); -} - static void set_homogeneous (GtkWidget *widget, gpointer data) @@ -1869,6 +1949,8 @@ modest_msg_view_window_show_toolbar (ModestWindow *self, GtkWidget *reply_button = NULL, *menu = NULL; GtkWidget *placeholder = NULL; gint insert_index; + const gchar *action_name; + GtkAction *action; parent_priv = MODEST_WINDOW_GET_PRIVATE(self); priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE(self); @@ -1879,6 +1961,7 @@ modest_msg_view_window_show_toolbar (ModestWindow *self, if (!parent_priv->toolbar) { parent_priv->toolbar = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar"); + gtk_widget_set_no_show_all (parent_priv->toolbar, TRUE); /* Set homogeneous toolbar */ gtk_container_foreach (GTK_CONTAINER (parent_priv->toolbar), @@ -1934,6 +2017,20 @@ modest_msg_view_window_show_toolbar (ModestWindow *self, gtk_widget_set_no_show_all (parent_priv->toolbar, TRUE); gtk_widget_hide (GTK_WIDGET (parent_priv->toolbar)); } + + /* Update also the actions (to update the toggles in the + menus), we have to do it manually because some other window + of the same time could have changed it (remember that the + toolbar fullscreen mode is shared by all the windows of the + same type */ + if (modest_window_mgr_get_fullscreen_mode (modest_runtime_get_window_mgr ())) + action_name = "/MenuBar/ViewMenu/ViewShowToolbarMenu/ViewShowToolbarFullScreenMenu"; + else + action_name = "/MenuBar/ViewMenu/ViewShowToolbarMenu/ViewShowToolbarNormalScreenMenu"; + + action = gtk_ui_manager_get_action (parent_priv->ui_manager, action_name); + modest_maemo_toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), + show_toolbar); } static void @@ -1941,34 +2038,10 @@ modest_msg_view_window_clipboard_owner_change (GtkClipboard *clipboard, GdkEvent *event, ModestMsgViewWindow *window) { - ModestWindowPrivate *parent_priv; -/* GtkAction *action; */ - gboolean is_address; - gchar *selection; - GtkWidget *focused; - if (!GTK_WIDGET_VISIBLE (window)) return; - parent_priv = MODEST_WINDOW_GET_PRIVATE (window); - selection = gtk_clipboard_wait_for_text (clipboard); - - 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); */ - - focused = gtk_window_get_focus (GTK_WINDOW (window)); - -/* action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EditMenu/EditCopyMenu"); */ -/* gtk_action_set_sensitive (action, (selection != NULL) && (!MODEST_IS_ATTACHMENTS_VIEW (focused))); */ - -/* action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EditMenu/EditCutMenu"); */ -/* gtk_action_set_sensitive (action, (selection != NULL) && (!MODEST_IS_ATTACHMENTS_VIEW (focused))); */ - - g_free (selection); -/* modest_msg_view_window_update_dimmed (window); */ - + modest_window_check_dimming_rules_group (MODEST_WINDOW (window), "ModestClipboardDimmingRules"); } gboolean @@ -2122,11 +2195,24 @@ void modest_msg_view_window_view_attachment (ModestMsgViewWindow *window, TnyMimePart *mime_part) { ModestMsgViewWindowPrivate *priv; + const gchar *msg_uid; + gchar *attachment_uid = NULL; + gint attachment_index = 0; + GList *attachments; + g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window)); g_return_if_fail (TNY_IS_MIME_PART (mime_part) || (mime_part == NULL)); - priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window); + msg_uid = modest_msg_view_window_get_message_uid (MODEST_MSG_VIEW_WINDOW (window)); + attachments = modest_msg_view_get_attachments (MODEST_MSG_VIEW (priv->msg_view)); + attachment_index = g_list_index (attachments, mime_part); + g_list_free (attachments); + + if (msg_uid && attachment_index >= 0) { + attachment_uid = g_strdup_printf ("%s/%d", msg_uid, attachment_index); + } + if (mime_part == NULL) { gboolean error = FALSE; GList *selected_attachments = modest_msg_view_get_selected_attachments (MODEST_MSG_VIEW (priv->msg_view)); @@ -2156,26 +2242,25 @@ modest_msg_view_window_view_attachment (ModestMsgViewWindow *window, TnyMimePart if (!TNY_IS_MSG (mime_part)) { gchar *filepath = NULL; const gchar *att_filename = tny_mime_part_get_filename (mime_part); - gchar *extension = NULL; TnyFsStream *temp_stream = NULL; - - if (att_filename) { - extension = g_strrstr (att_filename, "."); - if (extension != NULL) - extension++; - } - - temp_stream = modest_maemo_utils_create_temp_stream (extension, &filepath); - + temp_stream = modest_maemo_utils_create_temp_stream (att_filename, attachment_uid, + &filepath); + if (temp_stream) { const gchar *content_type; content_type = tny_mime_part_get_content_type (mime_part); tny_mime_part_decode_to_stream (mime_part, TNY_STREAM (temp_stream)); + + /* make the file read-only */ + if (g_chmod(filepath, 0444) != 0) + g_warning ("%s: failed to set file '%s' to read-only: %s", + __FUNCTION__, filepath, strerror(errno)); modest_platform_activate_file (filepath, content_type); g_object_unref (temp_stream); g_free (filepath); - /* TODO: delete temporary file */ + /* NOTE: files in the temporary area will be automatically + * cleaned after some time if they are no longer in use */ } } else { /* message attachment */ @@ -2197,11 +2282,11 @@ modest_msg_view_window_view_attachment (ModestMsgViewWindow *window, TnyMimePart g_warning ("window for is already being created"); } else { /* it's not found, so create a new window for it */ - modest_window_mgr_register_header (mgr, header); /* register the uid before building the window */ + modest_window_mgr_register_header (mgr, header, attachment_uid); /* register the uid before building the window */ 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_for_attachment (TNY_MSG (mime_part), account, NULL); + msg_win = modest_msg_view_window_new_for_attachment (TNY_MSG (mime_part), account, attachment_uid); modest_window_set_zoom (MODEST_WINDOW (msg_win), modest_window_get_zoom (MODEST_WINDOW (window))); modest_window_mgr_register_window (mgr, msg_win); @@ -2283,7 +2368,7 @@ save_mime_part_to_file (SaveMimePartInfo *info) TnyStream *stream; SaveMimePartPair *pair = (SaveMimePartPair *) info->pairs->data; - result = gnome_vfs_create (&handle, pair->filename, GNOME_VFS_OPEN_WRITE, FALSE, 0777); + result = gnome_vfs_create (&handle, pair->filename, GNOME_VFS_OPEN_WRITE, FALSE, 0644); if (result == GNOME_VFS_OK) { stream = tny_vfs_stream_new (handle); tny_mime_part_decode_to_stream (pair->part, stream); @@ -2329,7 +2414,11 @@ save_mime_parts_to_file_with_checks (SaveMimePartInfo *info) if (!is_ok) { save_mime_part_info_free (info, TRUE); } else { + GtkWidget *banner = hildon_banner_show_animation (NULL, NULL, + _CS("sfil_ib_saving")); + info->banner = g_object_ref (banner); g_thread_create ((GThreadFunc)save_mime_part_to_file, info, FALSE, NULL); + g_object_unref (banner); } } @@ -2435,12 +2524,8 @@ modest_msg_view_window_save_attachments (ModestMsgViewWindow *window, GList *mim if (files_to_save != NULL) { SaveMimePartInfo *info = g_slice_new0 (SaveMimePartInfo); - GtkWidget *banner = hildon_banner_show_animation (NULL, NULL, - _CS("sfil_ib_saving")); info->pairs = files_to_save; - info->banner = banner; info->result = TRUE; - g_object_ref (banner); save_mime_parts_to_file_with_checks (info); } } @@ -2451,6 +2536,9 @@ show_remove_attachment_information (gpointer userdata) ModestMsgViewWindow *window = (ModestMsgViewWindow *) userdata; ModestMsgViewWindowPrivate *priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window); + /* We're outside the main lock */ + gdk_threads_enter (); + if (priv->remove_attachment_banner != NULL) { gtk_widget_destroy (priv->remove_attachment_banner); g_object_unref (priv->remove_attachment_banner); @@ -2459,6 +2547,8 @@ show_remove_attachment_information (gpointer userdata) priv->remove_attachment_banner = g_object_ref ( hildon_banner_show_animation (NULL, NULL, _("mcen_ib_removing_attachment"))); + gdk_threads_leave (); + return FALSE; } @@ -2536,10 +2626,10 @@ modest_msg_view_window_remove_attachments (ModestMsgViewWindow *window, gboolean /* modest_msg_view_remove_attachment (MODEST_MSG_VIEW (priv->msg_view), node->data); */ } - msg = modest_msg_view_get_message (MODEST_MSG_VIEW (priv->msg_view)); - modest_msg_view_set_message (MODEST_MSG_VIEW (priv->msg_view), NULL); + msg = tny_msg_view_get_msg (TNY_MSG_VIEW (priv->msg_view)); + tny_msg_view_clear (TNY_MSG_VIEW (priv->msg_view)); tny_msg_rewrite_cache (msg); - modest_msg_view_set_message (MODEST_MSG_VIEW (priv->msg_view), msg); + tny_msg_view_set_msg (TNY_MSG_VIEW (priv->msg_view), msg); g_list_foreach (mime_parts, (GFunc) g_object_unref, NULL); g_list_free (mime_parts); @@ -2566,8 +2656,9 @@ update_window_title (ModestMsgViewWindow *window) TnyMsg *msg = NULL; TnyHeader *header = NULL; const gchar *subject = NULL; + + msg = tny_msg_view_get_msg (TNY_MSG_VIEW (priv->msg_view)); - msg = modest_msg_view_get_message (MODEST_MSG_VIEW (priv->msg_view)); if (msg != NULL) { header = tny_msg_get_header (msg); subject = tny_header_get_subject (header); @@ -2579,3 +2670,18 @@ update_window_title (ModestMsgViewWindow *window) gtk_window_set_title (GTK_WINDOW (window), subject); } + + +static void on_move_focus (ModestMsgViewWindow *window, + GtkDirectionType direction, + gpointer userdata) +{ + GtkWidget *current_focus = NULL; + + current_focus = gtk_window_get_focus (GTK_WINDOW (window)); + if ((current_focus != NULL) && + MODEST_IS_ATTACHMENTS_VIEW (current_focus)) { + g_signal_stop_emission_by_name (G_OBJECT (window), "move-focus"); + } +} +