[nautilus/gnome-3-24] Revert "file-conflict-dialog: Prevent replacing a directory with a symbolic link"

[Carlos Soriano <csoriano src gnome org>]

commit 891c0dcb760456b4ffcb9a0d252bc78f67af320e
Author: Carlos Soriano <csoriano gnome org>
Date:   Sat Apr 22 22:27:19 2017 +0200

    Revert "file-conflict-dialog: Prevent replacing a directory with a symbolic link"
    
    This reverts commit b881c990337624ee511710b32b8ccff9269a5597.
    
    It broke string freeze

 src/nautilus-file-conflict-dialog.c  |    6 ------
 src/nautilus-file-conflict-dialog.h  |    1 -
 src/nautilus-operations-ui-manager.c |   25 ++++---------------------
 3 files changed, 4 insertions(+), 28 deletions(-)
---
diff --git a/src/nautilus-file-conflict-dialog.c b/src/nautilus-file-conflict-dialog.c
index 62eafd1..55e5366 100644
--- a/src/nautilus-file-conflict-dialog.c
+++ b/src/nautilus-file-conflict-dialog.c
@@ -153,12 +153,6 @@ nautilus_file_conflict_dialog_disable_skip (NautilusFileConflictDialog *fcd)
 }
 
 void
-nautilus_file_conflict_dialog_disable_replace (NautilusFileConflictDialog *fcd)
-{
-    gtk_widget_set_sensitive (fcd->replace_button, FALSE);
-}
-
-void
 nautilus_file_conflict_dialog_disable_apply_to_all (NautilusFileConflictDialog *fcd)
 {
     gtk_widget_hide (fcd->checkbox);
diff --git a/src/nautilus-file-conflict-dialog.h b/src/nautilus-file-conflict-dialog.h
index 206d100..1b8452f 100644
--- a/src/nautilus-file-conflict-dialog.h
+++ b/src/nautilus-file-conflict-dialog.h
@@ -50,7 +50,6 @@ void nautilus_file_conflict_dialog_set_replace_button_label (NautilusFileConflic
                                                              gchar *label);
 
 void nautilus_file_conflict_dialog_disable_skip (NautilusFileConflictDialog *fcd);
-void nautilus_file_conflict_dialog_disable_replace (NautilusFileConflictDialog *fcd);
 void nautilus_file_conflict_dialog_disable_apply_to_all (NautilusFileConflictDialog *fcd);
 
 char*      nautilus_file_conflict_dialog_get_new_name     (NautilusFileConflictDialog *dialog);
diff --git a/src/nautilus-operations-ui-manager.c b/src/nautilus-operations-ui-manager.c
index fd56e18..ab6da21 100644
--- a/src/nautilus-operations-ui-manager.c
+++ b/src/nautilus-operations-ui-manager.c
@@ -137,15 +137,7 @@ set_copy_move_dialog_text (FileConflictDialogData *data)
 
     if (destination_is_directory)
     {
-        if (nautilus_file_is_symbolic_link (data->source)
-            && !nautilus_file_is_symbolic_link (data->destination))
-        {
-            primary_text = g_strdup_printf (_("You are trying to replace the destination folder “%s” with a 
symbolic link."),
-                                            destination_name);
-            message = g_strdup_printf(_("This is not allowed in order to avoid the deletion of the 
destination folder's contents."));
-            message_extra = _("Please rename the symbolic link or press the skip button.");
-        }
-        else if (source_is_directory)
+        if (source_is_directory)
         {
             primary_text = g_strdup_printf (_("Merge folder “%s”?"),
                                             destination_name);
@@ -347,19 +339,10 @@ set_replace_button_label (FileConflictDialogData *data)
     source_is_directory = nautilus_file_is_directory (data->source);
     destination_is_directory = nautilus_file_is_directory (data->destination);
 
-    if (destination_is_directory)
+    if (source_is_directory && destination_is_directory)
     {
-        if (nautilus_file_is_symbolic_link (data->source)
-            && !nautilus_file_is_symbolic_link (data->destination))
-        {
-            nautilus_file_conflict_dialog_disable_replace (data->dialog);
-            nautilus_file_conflict_dialog_disable_apply_to_all (data->dialog);
-        }
-        else if (source_is_directory)
-        {
-            nautilus_file_conflict_dialog_set_replace_button_label (data->dialog,
-                                                                    _("Merge"));
-        }
+        nautilus_file_conflict_dialog_set_replace_button_label (data->dialog,
+                                                                _("Merge"));
     }
 }