X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmaemo%2Fmodest-msg-view-window.c;h=6152030353fb3ad10558c947d3458f00a47fa7de;hb=5b68f7c4a513a7a6f45549e7bf40838ce754db27;hp=df07a35bdd976561b319ae971da9d97f34c783f7;hpb=93540692199f400bd03936d3ac1d7340a2710d14;p=modest diff --git a/src/maemo/modest-msg-view-window.c b/src/maemo/modest-msg-view-window.c index df07a35..6152030 100644 --- a/src/maemo/modest-msg-view-window.c +++ b/src/maemo/modest-msg-view-window.c @@ -870,11 +870,16 @@ 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); @@ -1066,15 +1071,15 @@ void modest_msg_view_window_on_row_inserted( /* 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); + priv->row_changed_handler = g_signal_connect (new_model, "row-changed", + G_CALLBACK (modest_msg_view_window_on_row_changed), + window); + priv->row_deleted_handler = g_signal_connect (new_model, "row-deleted", + G_CALLBACK (modest_msg_view_window_on_row_deleted), + window); + priv->rows_reordered_handler = 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( @@ -1103,10 +1108,10 @@ 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){ +void +modest_msg_view_window_update_model_replaced(ModestHeaderViewObserver *observer, + GtkTreeModel *model, + const gchar *tny_folder_id){ ModestMsgViewWindowPrivate *priv = NULL; ModestMsgViewWindow *window = NULL; @@ -1120,7 +1125,8 @@ 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 || + (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 @@ -1317,6 +1323,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))) { @@ -1325,6 +1332,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); } } @@ -1622,6 +1630,9 @@ message_reader_performer (gboolean canceled, 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, @@ -1631,6 +1642,10 @@ message_reader_performer (gboolean canceled, modest_mail_operation_get_msg (mail_op, info->header, 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); @@ -1769,7 +1784,7 @@ modest_msg_view_window_select_next_message (ModestMsgViewWindow *window) /* Free */ g_object_unref (header); - return retval; + return retval; } gboolean @@ -1827,6 +1842,9 @@ 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) { gtk_tree_row_reference_free (row_reference); @@ -2236,9 +2254,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); } @@ -2642,9 +2659,10 @@ modest_msg_view_window_save_attachments (ModestMsgViewWindow *window, TnyList *m pair = g_slice_new0 (SaveMimePartPair); if (save_multiple_str) { - pair->filename = - g_build_filename (chooser_uri, - tny_mime_part_get_filename (mime_part), NULL); + 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_strdup (chooser_uri); } @@ -2731,7 +2749,7 @@ 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); @@ -2740,14 +2758,15 @@ modest_msg_view_window_remove_attachments (ModestMsgViewWindow *window, gboolean 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", @@ -2810,18 +2829,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); }