#111 Merge directory quiet functionality

[And Sch]

This is incorrect behavior in Rox Filer 2.11. When merging directories, even with quiet on, it will prompt for every single file. This is very annoying and incorrect behavior. I have a proposed fix which seems to work in action.c:

if (!printf_reply(from_parent, TRUE,
                      _("?'%s' already exists - %s?"),
                      dest_path,
                      merge ? _("merge contents")
                        : _("overwrite")))
                return;

Should be split into:

if (merge)
            {
                if (!printf_reply(from_parent, TRUE,
                      _("?'%s' already exists - %s?"),
                      dest_path, _("merge contents")))
                return;
            }
            else
            {
                if (!printf_reply(from_parent, FALSE,
                      _("?'%s' already exists - %s?"),
                      dest_path, _("overwrite")))
                return;
            }

This way the handling of merging and overwriting is done separately. If quiet is on, overwriting should be quieted, but merging the directory should not.

Thanks for your consideration.

[Thomas Leonard]

Seems reasonable. Done (changed TRUE to merge).