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);
static gboolean msg_is_visible (TnyHeader *header, gboolean check_outbox);
+static void check_dimming_rules_after_change (ModestMsgViewWindow *window);
/* list my signals */
enum {
/* 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;
/* 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));
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);
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,
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);
}
tny_msg_view_set_msg (TNY_MSG_VIEW (priv->msg_view), msg);
update_window_title (MODEST_MSG_VIEW_WINDOW (obj));
+ 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));
return MODEST_WINDOW(obj);
}
-void modest_msg_view_window_on_row_changed(
- GtkTreeModel *header_model,
- GtkTreePath *arg1,
- GtkTreeIter *arg2,
- ModestMsgViewWindow *window){
- modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window));
+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_toolbar_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
* 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_toolbar_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_toolbar_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_toolbar_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
* 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;
* 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)
- gtk_tree_row_reference_free (priv->row_reference);
- priv->row_reference = NULL;
- if (priv->next_row_reference)
- gtk_tree_row_reference_free (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_toolbar_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);
- g_assert(model != NULL);
+ /* 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;
+ }
+
+ 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
{
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
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);
- modest_mail_operation_get_msg (mail_op, info->header, view_msg_cb, info->row_reference);
+ modest_mail_operation_get_msg (mail_op, info->header, TRUE, view_msg_cb, info->row_reference);
g_object_unref (mail_op);
/* Update dimming rules */
/* Free */
g_object_unref (header);
- return retval;
+ return retval;
}
gboolean
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);
}
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));
}
}
GList *files_to_save = NULL;
GtkWidget *save_dialog = NULL;
gchar *folder = NULL;
- gboolean canceled = FALSE;
const gchar *filename = NULL;
gchar *save_multiple_str = NULL;
iter = tny_list_create_iterator (mime_parts);
TnyMimePart *mime_part = (TnyMimePart *) tny_iterator_get_current (iter);
g_object_unref (iter);
- if (!modest_tny_mime_part_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 {
/* 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 */
while (!tny_iterator_is_done (iter)) {
TnyMimePart *mime_part = (TnyMimePart *) tny_iterator_get_current (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;
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);
}
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);
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",
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);
}
projects / modest / blobdiff