diff options
| author | Sayamindu Dasgupta <sayamindu@src.gnome.org> | 2007-08-26 19:20:29 +0000 |
|---|---|---|
| committer | Sayamindu Dasgupta <sayamindu@src.gnome.org> | 2007-08-26 19:20:29 +0000 |
| commit | b9a6dd9098382a7caf2b6e16a57ac75d3cef7642 (patch) | |
| tree | 5441f395a421a0c87f45550ea70a6b025fa1777c | |
| parent | a56e7d949304d95c3026e27c1283942f5a8baa3c (diff) | |
| download | nautilus-lockdown.tar.gz | |
Make restricted file system view and global desktop items play nicely togethernautilus-lockdown
svn path=/branches/nautilus-lockdown/; revision=13109
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/file-manager/fm-directory-view.c | 16 |
2 files changed, 9 insertions, 13 deletions
@@ -1,5 +1,11 @@ 2007-08-27 Sayamindu Dasgupta <sayamindu@gmail.com> * 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 <sayamindu@gmail.com> + * src/file-manager/fm-directory-view.c: * libnautilus-private/nautilus-desktop-link.c: * libnautilus-private/nautilus-global-preferences.c: Fix crash if /apps/nautilus/desktop/global_items_visible 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 |