diff options
| author | Ross Lagerwall <rosslagerwall@gmail.com> | 2013-10-17 09:21:48 +0200 |
|---|---|---|
| committer | Ross Lagerwall <rosslagerwall@gmail.com> | 2013-12-05 23:51:30 +0000 |
| commit | ad521f604df7aad2dacf993942b257e93fda203b (patch) | |
| tree | e1a4a70ad4f8f2f7af5f00d3a939688c3507f953 /daemon/gvfsbackendsmb.c | |
| parent | c1dc110ff36297caa61747e1e59a8d9ca85a07b3 (diff) | |
| download | gvfs-ad521f604df7aad2dacf993942b257e93fda203b.tar.gz | |
Require libsmbclient from Samba 3.4.0 or higher
Also remove the old libsmb-compat.h header file.
https://bugzilla.gnome.org/show_bug.cgi?id=573837
Diffstat (limited to 'daemon/gvfsbackendsmb.c')
| -rw-r--r-- | daemon/gvfsbackendsmb.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/daemon/gvfsbackendsmb.c b/daemon/gvfsbackendsmb.c index d24d00ed..8a3fa8d5 100644 --- a/daemon/gvfsbackendsmb.c +++ b/daemon/gvfsbackendsmb.c @@ -51,7 +51,6 @@ #include "gvfskeyring.h" #include <libsmbclient.h> -#include "libsmb-compat.h" #define PRINT_DEBUG @@ -1709,15 +1708,13 @@ do_query_fs_info (GVfsBackend *backend, GFileAttributeMatcher *attribute_matcher) { GVfsBackendSmb *op_backend = G_VFS_BACKEND_SMB (backend); - - g_file_info_set_attribute_string (info, G_FILE_ATTRIBUTE_FILESYSTEM_TYPE, "cifs"); - -#ifdef HAVE_SAMBA_STAT_VFS smbc_statvfs_fn smbc_statvfs; struct statvfs st = {0}; char *uri; int res, saved_errno; + g_file_info_set_attribute_string (info, G_FILE_ATTRIBUTE_FILESYSTEM_TYPE, "cifs"); + if (g_file_attribute_matcher_matches (attribute_matcher, G_FILE_ATTRIBUTE_FILESYSTEM_SIZE) || g_file_attribute_matcher_matches (attribute_matcher, @@ -1757,7 +1754,6 @@ do_query_fs_info (GVfsBackend *backend, return; } } -#endif g_vfs_job_succeeded (G_VFS_JOB (job)); } |