[nautilus] file-operations: fix apply to all in conflict dialog

[Carlos Soriano Sánchez <csoriano src gnome org>]

commit 6434e7c4c0afd2e5c28ec8469a874b7eae8af52b
Author: Carlos Soriano <csoriano gnome org>
Date:   Mon Jul 18 10:58:54 2016 +0200

    file-operations: fix apply to all in conflict dialog
    
    The condition when cancelling the dialog was always true, and therefore
    always setting the apply_to_all.
    
    It was harmless due to the dialog being canceled anyway.
    
    Thanks to Michael McConville to create the original patch.

 src/nautilus-file-operations.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/src/nautilus-file-operations.c b/src/nautilus-file-operations.c
index 1ec5591..8ec8f06 100644
--- a/src/nautilus-file-operations.c
+++ b/src/nautilus-file-operations.c
@@ -4426,7 +4426,7 @@ do_run_conflict_dialog (gpointer _data)
        if (response == CONFLICT_RESPONSE_RENAME) {
                data->resp_data->new_name = 
                        nautilus_file_conflict_dialog_get_new_name (NAUTILUS_FILE_CONFLICT_DIALOG (dialog));
-       } else if (response != GTK_RESPONSE_CANCEL ||
+       } else if (response != GTK_RESPONSE_CANCEL &&
                   response != GTK_RESPONSE_NONE) {
                   data->resp_data->apply_to_all =
                           nautilus_file_conflict_dialog_get_apply_to_all