aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/mail-display.c15
2 files changed, 16 insertions, 6 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 357c9e53ff..afc779a7d6 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2001-08-15 Jeffrey Stedfast <fejj@ximian.com>
+
+ * mail-display.c (save_part): Remember the filename is in utf8, so
+ use the e_utf8 functions to set the filename in the file selection
+ dialog.
+
2001-08-15 Peter Williams <peterw@ximian.com>
* message-list.c (on_cursor_activated_idle): Always remove the
@@ -32,6 +38,7 @@
* message-list.c (regen_list_regen): Remove camel operation
registration/etc.
+>>>>>>> 1.1564
2001-08-14 Jeffrey Stedfast <fejj@ximian.com>
* mail-accounts.c (load_accounts): Convert the UTF-8 account name
diff --git a/mail/mail-display.c b/mail/mail-display.c
index a681fdd5cf..0a6631d4c7 100644
--- a/mail/mail-display.c
+++ b/mail/mail-display.c
@@ -30,6 +30,7 @@
#include <gdk-pixbuf/gdk-pixbuf-loader.h>
#include <gal/util/e-util.h>
#include <gal/widgets/e-popup-menu.h>
+#include <gal/widgets/e-unicode.h>
#include <gtk/gtkinvisible.h>
#include <gtkhtml/gtkhtml-embedded.h>
#include <gtkhtml/htmlengine.h> /* XXX */
@@ -211,24 +212,26 @@ save_part (CamelMimePart *part)
{
GtkFileSelection *file_select;
char *filename;
-
- if(save_pathname == NULL)
+
+ if (save_pathname == NULL)
save_pathname = g_strdup (g_get_home_dir ());
-
+
filename = make_safe_filename (save_pathname, part);
-
+
file_select = GTK_FILE_SELECTION (
gtk_file_selection_new (_("Save Attachment")));
gtk_file_selection_set_filename (file_select, filename);
+ /* set the GtkEntry with the locale filename by breaking abstraction */
+ e_utf8_gtk_entry_set_text (GTK_ENTRY (file_select->selection_entry), g_basename (filename));
g_free (filename);
-
+
gtk_signal_connect (GTK_OBJECT (file_select->ok_button), "clicked",
GTK_SIGNAL_FUNC (save_data_cb), part);
gtk_signal_connect_object (GTK_OBJECT (file_select->cancel_button),
"clicked",
GTK_SIGNAL_FUNC (gtk_widget_destroy),
GTK_OBJECT (file_select));
-
+
gtk_widget_show (GTK_WIDGET (file_select));
}