diff options
| author | Cosimo Cecchi <cosimoc@gnome.org> | 2009-04-22 11:57:53 +0200 |
|---|---|---|
| committer | Cosimo Cecchi <cosimoc@gnome.org> | 2010-04-26 16:54:25 +0200 |
| commit | 95016daa49bdd8b951dd0fa500b9634e12e91856 (patch) | |
| tree | 6fd63c18004aa9201f87f18b50befc57a813ef02 /libnautilus-private/nautilus-file-conflict-dialog.c | |
| parent | dc21af1dc03759661fea147a8b98a8772749b29e (diff) | |
| download | nautilus-95016daa49bdd8b951dd0fa500b9634e12e91856.tar.gz | |
Adapt the file operations code to use the new dialog
Cut out of the file operations module, the code used to display
conflict dialogs. Use the new dialog instead.
Rename is not working yet.
Diffstat (limited to 'libnautilus-private/nautilus-file-conflict-dialog.c')
| -rw-r--r-- | libnautilus-private/nautilus-file-conflict-dialog.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libnautilus-private/nautilus-file-conflict-dialog.c b/libnautilus-private/nautilus-file-conflict-dialog.c index 49f9f0ec7..c7f4b16b7 100644 --- a/libnautilus-private/nautilus-file-conflict-dialog.c +++ b/libnautilus-private/nautilus-file-conflict-dialog.c @@ -235,7 +235,8 @@ build_dialog_appearance (NautilusFileConflictDialog *fcd) FALSE); details->rename_button = button; gtk_dialog_add_button (dialog, - _("_Replace"), + (source_is_dir && dest_is_dir) ? + _("_Merge") : _("_Replace"), CONFLICT_RESPONSE_REPLACE); } |