diff options
| author | Stephen Fisher <steve@stephen-fisher.com> | 2007-05-22 00:33:46 +0000 |
|---|---|---|
| committer | Stephen Fisher <steve@stephen-fisher.com> | 2007-05-22 00:33:46 +0000 |
| commit | bd148a7335e93478a82af115a2922693409f9121 (patch) | |
| tree | 36ac5477c0d11800feee54a15f0223ba0edf195b | |
| parent | ea0bed2b1796b2c9ba18e794f9f7de0c8a5293e3 (diff) | |
Fix bug #1600 in the Win32 file dialog (it was fixed for the GTK file dialog in SVN revision 21807).
svn path=/trunk/; revision=21872
| -rw-r--r-- | gtk/win32-file-dlg.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gtk/win32-file-dlg.c b/gtk/win32-file-dlg.c index 112eff183b..950c851a85 100644 --- a/gtk/win32-file-dlg.c +++ b/gtk/win32-file-dlg.c @@ -381,8 +381,8 @@ win32_merge_file (HWND h_wnd) { switch (merge_action) { case merge_append: /* append file */ - in_filenames[0] = utf_16to8(file_name); - in_filenames[1] = cfile.filename; + in_filenames[0] = cfile.filename; + in_filenames[1] = utf_16to8(file_name); merge_status = cf_merge_files(&tmpname, 2, in_filenames, filetype, TRUE); break; case merge_chrono: @@ -393,9 +393,9 @@ win32_merge_file (HWND h_wnd) { break; case merge_prepend: /* prepend file */ - in_filenames[0] = cfile.filename; - in_filenames[1] = utf_16to8(file_name); - merge_status = cf_merge_files(&tmpname, 2, in_filenames, filetype, TRUE); + in_filenames[0] = utf_16to8(file_name); + in_filenames[1] = cfile.filename; + merge_status = cf_merge_files(&tmpname, 2, in_filenames, filetype, TRUE); break; default: g_assert_not_reached(); |