From 0f6aece3ac0c060ccbcfdb321fa592316f15e258 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sergio=20Villar=20Sen=C3=ADn?= Date: Mon, 4 May 2009 17:20:40 +0200 Subject: [PATCH] Fixes NB#114434, when saving an attachment with the same name as another already existing file, show the filename in the confirmation dialog --- src/hildon2/modest-msg-view-window.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/hildon2/modest-msg-view-window.c b/src/hildon2/modest-msg-view-window.c index acf889c..3d6753d 100644 --- a/src/hildon2/modest-msg-view-window.c +++ b/src/hildon2/modest-msg-view-window.c @@ -2703,12 +2703,22 @@ save_mime_parts_to_file_with_checks (SaveMimePartInfo *info) } if (replaced_files) { GtkWidget *confirm_overwrite_dialog; - const gchar *message = (replaced_files == 1) ? - _FM("docm_nc_replace_file") : _FM("docm_nc_replace_multiple"); - confirm_overwrite_dialog = hildon_note_new_confirmation (NULL, message); - if (gtk_dialog_run (GTK_DIALOG (confirm_overwrite_dialog)) != GTK_RESPONSE_OK) { - is_ok = FALSE; + + if (replaced_files == 1) { + SaveMimePartPair *pair = files->data; + const gchar *filename = tny_mime_part_get_filename (pair->part); + gchar *message = g_strdup_printf ("%s\n%s", + _FM("docm_nc_replace_file"), + (filename) ? filename : ""); + confirm_overwrite_dialog = hildon_note_new_confirmation (NULL, message); + g_free (message); + } else { + confirm_overwrite_dialog = hildon_note_new_confirmation (NULL, + _FM("docm_nc_replace_multiple")); } + if (gtk_dialog_run (GTK_DIALOG (confirm_overwrite_dialog)) != GTK_RESPONSE_OK) + is_ok = FALSE; + gtk_widget_destroy (confirm_overwrite_dialog); } -- 1.7.9.5