From b9a6dd9098382a7caf2b6e16a57ac75d3cef7642 Mon Sep 17 00:00:00 2001 From: Sayamindu Dasgupta Date: Sun, 26 Aug 2007 19:20:29 +0000 Subject: Make restricted file system view and global desktop items play nicely together svn path=/branches/nautilus-lockdown/; revision=13109 --- ChangeLog | 6 ++++++ src/file-manager/fm-directory-view.c | 16 +++------------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index b2d0917dc..91d4063fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-08-27 Sayamindu Dasgupta + * src/file-manager/fm-directory-view.c: + (fm_directory_view_should_show_file): + Make restricted file system view and global desktop items + play nicely together. + 2007-08-27 Sayamindu Dasgupta * src/file-manager/fm-directory-view.c: * libnautilus-private/nautilus-desktop-link.c: diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c index 10de9e24f..073375461 100644 --- a/src/file-manager/fm-directory-view.c +++ b/src/file-manager/fm-directory-view.c @@ -9433,19 +9433,9 @@ fm_directory_view_accepts_dragged_files (FMDirectoryView *view) gboolean fm_directory_view_should_show_file (FMDirectoryView *view, NautilusFile *file) { - gchar *uri; - uri = nautilus_file_get_uri(file); - - if (!nautilus_lockdown_manager_is_uri_allowed(nautilus_lockdown_manager_get(), uri)) { - g_free (uri); - return FALSE; - } - else { - g_free (uri); - return nautilus_file_should_show (file, - view->details->show_hidden_files, - view->details->show_backup_files); - } + return nautilus_file_should_show (file, + view->details->show_hidden_files, + view->details->show_backup_files); } static gboolean -- cgit v1.2.1