diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.ja | 5 | ||||
| -rw-r--r-- | src/importcsv.c | 6 | ||||
| -rw-r--r-- | src/importldif.c | 6 |
4 files changed, 20 insertions, 2 deletions
@@ -1,6 +1,11 @@ 2007-04-10 * src/importldif.c + src/importcsv.c: convert filename to UTF-8. + +2007-04-10 + + * src/importldif.c src/importcsv.c: use GtkFileChooser. * src/passphrase.c src/editjpilot.c diff --git a/ChangeLog.ja b/ChangeLog.ja index 7d4e62f5..91e6ef92 100644 --- a/ChangeLog.ja +++ b/ChangeLog.ja @@ -1,6 +1,11 @@ 2007-04-10 * src/importldif.c + src/importcsv.c: ファイル名を UTF-8 に変換。 + +2007-04-10 + + * src/importldif.c src/importcsv.c: GtkFileChooser を使用するようにした。 * src/passphrase.c src/editjpilot.c diff --git a/src/importcsv.c b/src/importcsv.c index 24f218fc..78322060 100644 --- a/src/importcsv.c +++ b/src/importcsv.c @@ -56,6 +56,7 @@ #include "manage_window.h" #include "mgutils.h" #include "importcsv.h" +#include "codeconv.h" #include "utils.h" #define IMPORTCSV_GUESS_NAME "CSV Import" @@ -476,7 +477,10 @@ static void imp_csv_file_select( void ) { GTK_FILE_CHOOSER_ACTION_OPEN ); g_free( sFile ); if (sSelFile) { - gtk_entry_set_text( GTK_ENTRY(impcsv_dlg.file_entry), sSelFile ); + gchar *sUTF8File; + sUTF8File = conv_filename_to_utf8( sSelFile ); + gtk_entry_set_text( GTK_ENTRY(impcsv_dlg.file_entry), sUTF8File ); + g_free( sUTF8File ); g_free( sSelFile ); } } diff --git a/src/importldif.c b/src/importldif.c index d1b392b6..a26501f7 100644 --- a/src/importldif.c +++ b/src/importldif.c @@ -53,6 +53,7 @@ #include "manage_window.h" #include "mgutils.h" #include "ldif.h" +#include "codeconv.h" #include "utils.h" #define IMPORTLDIF_GUESS_NAME "LDIF Import" @@ -428,7 +429,10 @@ static void imp_ldif_file_select( void ) { GTK_FILE_CHOOSER_ACTION_OPEN ); g_free( sFile ); if ( sSelFile ) { - gtk_entry_set_text( GTK_ENTRY(impldif_dlg.file_entry), sSelFile ); + gchar *sUTF8File; + sUTF8File = conv_filename_to_utf8( sSelFile ); + gtk_entry_set_text( GTK_ENTRY(impldif_dlg.file_entry), sUTF8File ); + g_free( sUTF8File ); g_free( sSelFile ); } } |