From: Colin Leroy Date: Sat, 9 Apr 2011 06:41:38 +0000 (+0000) Subject: 2011-04-09 [colin] 3.7.8cvs77 X-Git-Tag: REL_3_7_9~2 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=6e4303f262a209470a0956860aec715d40d896eb 2011-04-09 [colin] 3.7.8cvs77 * src/gtk/filesel.c Revert part of yesterday's patch. While gtk_file_chooser_set_current_name() wants an UTF-8 string, gtk_file_chooser_set_current_folder() wants a glib- encoding filename. Hooray for stupid. --- diff --git a/ChangeLog b/ChangeLog index 0c23e5c6b..0a6176e9f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2011-04-09 [colin] 3.7.8cvs77 + + * src/gtk/filesel.c + Revert part of yesterday's patch. While gtk_file_chooser_set_current_name() + wants an UTF-8 string, gtk_file_chooser_set_current_folder() wants a glib- + encoding filename. Hooray for stupid. + 2011-04-08 [colin] 3.7.8cvs76 * src/action.c diff --git a/PATCHSETS b/PATCHSETS index df02d3786..339c76eb4 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -4150,3 +4150,4 @@ ( cvs diff -u -r 1.49.2.139 -r 1.49.2.140 src/procmime.c; ) > 3.7.8cvs74.patchset ( cvs diff -u -r 1.61.2.96 -r 1.61.2.97 src/account.c; cvs diff -u -r 1.213.2.200 -r 1.213.2.201 src/folder.c; cvs diff -u -r 1.87.2.63 -r 1.87.2.64 src/folder.h; cvs diff -u -r 1.2.2.36 -r 1.2.2.37 src/folder_item_prefs.c; cvs diff -u -r 1.2.2.23 -r 1.2.2.24 src/folder_item_prefs.h; cvs diff -u -r 1.105.2.165 -r 1.105.2.166 src/prefs_account.c; ) > 3.7.8cvs75.patchset ( cvs diff -u -r 1.12.2.64 -r 1.12.2.65 src/action.c; ) > 3.7.8cvs76.patchset +( cvs diff -u -r 1.2.2.43 -r 1.2.2.44 src/gtk/filesel.c; ) > 3.7.8cvs77.patchset diff --git a/configure.ac b/configure.ac index 8174895ec..81e8afa22 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ MINOR_VERSION=7 MICRO_VERSION=8 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=76 +EXTRA_VERSION=77 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/gtk/filesel.c b/src/gtk/filesel.c index a511aabf1..726abbf94 100644 --- a/src/gtk/filesel.c +++ b/src/gtk/filesel.c @@ -169,8 +169,11 @@ static GList *filesel_create(const gchar *title, const gchar *path, realpath = g_strdup(get_home_dir()); } if (g_utf8_validate(realpath, -1, NULL)) - gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(chooser), - realpath); + tmp = g_filename_from_utf8(realpath, -1, NULL, NULL, NULL); + if (tmp == NULL) + tmp = g_strdup(realpath); + gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(chooser), tmp); + g_free(tmp); if (action == GTK_FILE_CHOOSER_ACTION_SAVE) { if (g_utf8_validate(filename, -1, NULL)) gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(chooser),