diff options
| author | David Zeuthen <davidz@redhat.com> | 2011-09-30 10:15:16 -0400 |
|---|---|---|
| committer | David Zeuthen <davidz@redhat.com> | 2011-09-30 10:15:16 -0400 |
| commit | 3a7df6f425cf96e1a09845513f1f5c4edfb57343 (patch) | |
| tree | 1e72ac943a452813bd1348868d275b60530851b0 /monitor | |
| parent | 9c2a9b4da43edf22d24fb7b9f349cba9a83bdc5c (diff) | |
| download | gvfs-3a7df6f425cf96e1a09845513f1f5c4edfb57343.tar.gz | |
udisks2: Catch up with udisks changes
Signed-off-by: David Zeuthen <davidz@redhat.com>
Diffstat (limited to 'monitor')
| -rw-r--r-- | monitor/udisks2/gvfsudisks2drive.c | 13 | ||||
| -rw-r--r-- | monitor/udisks2/gvfsudisks2volume.c | 13 |
2 files changed, 14 insertions, 12 deletions
diff --git a/monitor/udisks2/gvfsudisks2drive.c b/monitor/udisks2/gvfsudisks2drive.c index 81fa838b..73ac0c1e 100644 --- a/monitor/udisks2/gvfsudisks2drive.c +++ b/monitor/udisks2/gvfsudisks2drive.c @@ -175,12 +175,13 @@ update_drive (GVfsUDisks2Drive *drive) drive->can_eject = FALSE; } - udisks_util_get_drive_info (drive->udisks_drive, - NULL, /* drive_name */ - &drive->name, - &drive->icon, - NULL, /* media_desc */ - NULL); /* media_icon */ + udisks_client_get_drive_info (gvfs_udisks2_volume_monitor_get_udisks_client (drive->monitor), + drive->udisks_drive, + NULL, /* drive_name */ + &drive->name, + &drive->icon, + NULL, /* media_desc */ + NULL); /* media_icon */ /* ---------------------------------------------------------------------------------------------------- */ /* fallbacks */ diff --git a/monitor/udisks2/gvfsudisks2volume.c b/monitor/udisks2/gvfsudisks2volume.c index 8e9b4568..efd68e82 100644 --- a/monitor/udisks2/gvfsudisks2volume.c +++ b/monitor/udisks2/gvfsudisks2volume.c @@ -231,12 +231,13 @@ update_volume (GVfsUDisks2Volume *volume) GIcon *drive_icon; gchar *media_desc; GIcon *media_icon; - udisks_util_get_drive_info (udisks_drive, - NULL, /* drive_name */ - &drive_desc, - &drive_icon, - &media_desc, - &media_icon); + udisks_client_get_drive_info (gvfs_udisks2_volume_monitor_get_udisks_client (volume->monitor), + udisks_drive, + NULL, /* drive_name */ + &drive_desc, + &drive_icon, + &media_desc, + &media_icon); if (media_desc == NULL) { media_desc = drive_desc; |