summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Sullivan <sullivan@src.gnome.org>2000-11-02 20:07:32 +0000
committerJohn Sullivan <sullivan@src.gnome.org>2000-11-02 20:07:32 +0000
commit68ab462902ca78697f2c177d4f4925bab17f807c (patch)
tree54bade938468a709410953a949747627039e03ce
parent7db82cee95a24217914a24f380bda799a309b961 (diff)
downloadnautilus-68ab462902ca78697f2c177d4f4925bab17f807c.tar.gz
Fixed bug 3613 (activating any file as root tries to
execute it) * src/file-manager/fm-directory-view.c: (file_is_launchable): Need to check nautilus_file_is_executable as well as nautilus_file_can_execute.
-rw-r--r--ChangeLog9
-rw-r--r--src/file-manager/fm-directory-view.c3
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5c0a6e520..d0f203572 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2000-11-02 John Sullivan <sullivan@eazel.com>
+
+ Fixed bug 3613 (activating any file as root tries to
+ execute it)
+
+ * src/file-manager/fm-directory-view.c: (file_is_launchable):
+ Need to check nautilus_file_is_executable as well as
+ nautilus_file_can_execute.
+
2000-11-02 Maciej Stachowiak <mjs@eazel.com>
* components/music/Makefile.am: Install a nautilus-mpg123 symlink
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index ae26d4b76..b5d63c8fc 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -3642,7 +3642,8 @@ file_is_launchable (NautilusFile *file)
{
return !nautilus_file_is_directory (file)
&& nautilus_file_can_get_permissions (file)
- && nautilus_file_can_execute (file);
+ && nautilus_file_can_execute (file)
+ && nautilus_file_is_executable (file);
}
static void