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);
/* 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(
* 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;
* 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
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))) {
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);
}
}
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_get_msgs_full_error_handler,
+ modest_ui_actions_disk_operations_error_handler,
NULL, NULL);
modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), 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);
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);
}
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);
}