From 12ed4d0b4518fa6ce45749ce9552d610fca60e1b Mon Sep 17 00:00:00 2001 From: Slava Zanko Date: Thu, 29 Oct 2009 01:39:24 +0200 Subject: [PATCH] Ticket #1753: panel: bad mounpoint is no longer 'red' highlighted Restored behavior with stale mountpoint (now handled as stale link). Signed-off-by: Ilia Maslakov Signed-off-by: Slava Zanko --- misc/filehighlight.ini | 11 ++++++----- src/filehighlight/get-color.c | 4 +++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/misc/filehighlight.ini b/misc/filehighlight.ini index 6d576dfa8..cca5499d1 100644 --- a/misc/filehighlight.ini +++ b/misc/filehighlight.ini @@ -4,11 +4,6 @@ [directory] type=DIR -[stalelink] - type=STALE_LINK - -[symlink] - type=SYMLINK [device] type=DEVICE @@ -16,6 +11,12 @@ [special] type=SPECIAL +[stalelink] + type=STALE_LINK + +[symlink] + type=SYMLINK + [core] regexp=^core\\.*\\d*$ diff --git a/src/filehighlight/get-color.c b/src/filehighlight/get-color.c index ef786e83e..a87ed6304 100644 --- a/src/filehighlight/get-color.c +++ b/src/filehighlight/get-color.c @@ -88,7 +88,9 @@ mc_fhl_is_link_to_dir (file_entry * fe) inline static gboolean mc_fhl_is_stale_link (file_entry * fe) { - return mc_fhl_is_link (fe) && (fe->f.stale_link); + gboolean is_link = mc_fhl_is_link (fe); + + return (!is_link && !mc_fhl_is_file (fe)) || (is_link && (fe->f.stale_link)); } inline static gboolean