Mercurial > hg > forks > geeqie
changeset 2015:cb2fb10d84b3
changed "readonly destination directory" to a warning
| author | Vladimir Nadvornik <nadvornik@suse.cz> |
|---|---|
| date | Fri, 27 Jul 2012 16:28:48 +0200 |
| parents | b3bc1aa2d666 |
| children | ef876f3fdb10 |
| files | src/filedata.c src/typedefs.h |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/filedata.c Fri Jul 27 15:03:58 2012 +0200 +++ b/src/filedata.c Fri Jul 27 16:28:48 2012 +0200 @@ -2116,7 +2116,7 @@ } else if (!access_file(dest_dir, W_OK)) { - ret |= CHANGE_NO_WRITE_PERM_DEST_DIR; + ret |= CHANGE_WARN_NO_WRITE_PERM_DEST_DIR; DEBUG_1("Change checked: destination dir is readonly: %s -> %s", fd->path, fd->change->dest); } else if (!same) @@ -2193,7 +2193,7 @@ g_string_append(result, _("destination can't be overwritten")); } - if (error & CHANGE_NO_WRITE_PERM_DEST_DIR) + if (error & CHANGE_WARN_NO_WRITE_PERM_DEST_DIR) { if (result->len > 0) g_string_append(result, ", "); g_string_append(result, _("destination directory is not writable"));
--- a/src/typedefs.h Fri Jul 27 15:03:58 2012 +0200 +++ b/src/typedefs.h Fri Jul 27 16:28:48 2012 +0200 @@ -158,11 +158,11 @@ CHANGE_WARN_SAME = 1 << 2, CHANGE_WARN_CHANGED_EXT = 1 << 3, CHANGE_WARN_UNSAVED_META = 1 << 4, + CHANGE_WARN_NO_WRITE_PERM_DEST_DIR = 1 << 5, CHANGE_ERROR_MASK = (~0) << 8, /* the values below are fatal errors */ CHANGE_NO_READ_PERM = 1 << 8, CHANGE_NO_WRITE_PERM_DIR = 1 << 9, CHANGE_NO_DEST_DIR = 1 << 10, - CHANGE_NO_WRITE_PERM_DEST_DIR = 1 << 11, CHANGE_NO_WRITE_PERM_DEST = 1 << 12, CHANGE_DEST_EXISTS = 1 << 13, CHANGE_NO_SRC = 1 << 14,