diff options
| author | Tomas Bzatek <tbzatek@redhat.com> | 2012-07-31 11:32:37 +0200 |
|---|---|---|
| committer | Tomas Bzatek <tbzatek@redhat.com> | 2012-07-31 11:32:37 +0200 |
| commit | a494b809eaf82994108bfbbe5d950fed1a0a8c7c (patch) | |
| tree | 2962721066c9aa6b24e2644cd32cd9c013cc4ffc /monitor | |
| parent | 76bbf5cfc3d98c2e6cbcf17d21f7900c9e28935a (diff) | |
| download | gvfs-a494b809eaf82994108bfbbe5d950fed1a0a8c7c.tar.gz | |
udisks2: Remove UDISKS_CHECK_VERSION ifdefs since we require 1.97 now
Diffstat (limited to 'monitor')
| -rw-r--r-- | monitor/udisks2/gvfsudisks2utils.c | 8 | ||||
| -rw-r--r-- | monitor/udisks2/gvfsudisks2volumemonitor.c | 4 |
2 files changed, 2 insertions, 10 deletions
diff --git a/monitor/udisks2/gvfsudisks2utils.c b/monitor/udisks2/gvfsudisks2utils.c index f6185276..c969dabf 100644 --- a/monitor/udisks2/gvfsudisks2utils.c +++ b/monitor/udisks2/gvfsudisks2utils.c @@ -566,14 +566,10 @@ gvfs_udisks2_utils_is_drive_on_our_seat (UDisksDrive *drive) * seat. * * Note that seat support was added in udisks 1.95.0 (and so was the - * UDISKS_CHECK_VERSION macro) - for now, be compatible with older - * versions instead of bumping requirement in configure.ac + * UDISKS_CHECK_VERSION macro). */ -#ifdef UDISKS_CHECK_VERSION -# if UDISKS_CHECK_VERSION(1,95,0) drive_seat = udisks_drive_get_seat (drive); -# endif -#endif + if (drive_seat == NULL || strlen (drive_seat) == 0) { ret = TRUE; diff --git a/monitor/udisks2/gvfsudisks2volumemonitor.c b/monitor/udisks2/gvfsudisks2volumemonitor.c index 7792ec6d..f8be6b6a 100644 --- a/monitor/udisks2/gvfsudisks2volumemonitor.c +++ b/monitor/udisks2/gvfsudisks2volumemonitor.c @@ -828,8 +828,6 @@ should_include_volume (GVfsUDisks2VolumeMonitor *monitor, * loop device, check the SetupByUid property - we don't want to * show loop devices set up by other users */ -#ifdef UDISKS_CHECK_VERSION -# if UDISKS_CHECK_VERSION(1,97,0) loop = udisks_client_get_loop_for_block (monitor->client, block); if (loop != NULL) { @@ -854,8 +852,6 @@ should_include_volume (GVfsUDisks2VolumeMonitor *monitor, if (udisks_block_get_size (block_for_loop) == 0) goto out; } -# endif -#endif /* ignore the volume if the drive is ignored */ udisks_drive = udisks_client_get_drive_for_block (monitor->client, block); |