[gnome-disk-utility/udisks2-port] Catch up with udisks changes

[David Zeuthen <davidz src gnome org>]

commit 3ac4a71304a423bc8c5aebd0baa3f8d6621ca7e7
Author: David Zeuthen <davidz redhat com>
Date:   Fri Sep 30 10:14:57 2011 -0400

    Catch up with udisks changes
    
    Signed-off-by: David Zeuthen <davidz redhat com>

 src/palimpsest/gdudevicetreemodel.c |    8 +++++++-
 src/palimpsest/gduwindow.c          |   21 ++++++++++++++-------
 2 files changed, 21 insertions(+), 8 deletions(-)
---
diff --git a/src/palimpsest/gdudevicetreemodel.c b/src/palimpsest/gdudevicetreemodel.c
index b073e21..a7f90d4 100644
--- a/src/palimpsest/gdudevicetreemodel.c
+++ b/src/palimpsest/gdudevicetreemodel.c
@@ -535,7 +535,13 @@ update_drive (GduDeviceTreeModel *model,
       warning = TRUE;
     }
 
-  udisks_util_get_drive_info (drive, &name, &description, &drive_icon, &media_description, &media_icon);
+  udisks_client_get_drive_info (model->client,
+                                drive,
+                                &name,
+                                &description,
+                                &drive_icon,
+                                &media_description,
+                                &media_icon);
   if (warning)
     {
       s = g_strdup_printf ("<span foreground=\"#ff0000\">%s</span>\n"
diff --git a/src/palimpsest/gduwindow.c b/src/palimpsest/gduwindow.c
index 297f809..56024a5 100644
--- a/src/palimpsest/gduwindow.c
+++ b/src/palimpsest/gduwindow.c
@@ -1335,12 +1335,13 @@ setup_device_page (GduWindow     *window,
       blocks = get_top_level_blocks_for_drive (window, g_dbus_object_get_object_path (G_DBUS_OBJECT (object)));
       blocks = g_list_sort (blocks, (GCompareFunc) block_compare_on_preferred);
 
-      udisks_util_get_drive_info (drive,
-                                  &drive_name,
-                                  &drive_desc,
-                                  &drive_icon,
-                                  &drive_media_desc,
-                                  &drive_media_icon);
+      udisks_client_get_drive_info (window->client,
+                                    drive,
+                                    &drive_name,
+                                    &drive_desc,
+                                    &drive_icon,
+                                    &drive_media_desc,
+                                    &drive_media_icon);
       if (blocks != NULL)
         gdu_volume_grid_set_block_object (GDU_VOLUME_GRID (window->volume_grid), blocks->data);
       else
@@ -1396,7 +1397,13 @@ update_device_page_for_drive (GduWindow      *window,
 
   ata = udisks_object_peek_drive_ata (object);
 
-  udisks_util_get_drive_info (drive, &name, &description, &drive_icon, &media_description, &media_icon);
+  udisks_client_get_drive_info (window->client,
+                                drive,
+                                &name,
+                                &description,
+                                &drive_icon,
+                                &media_description,
+                                &media_icon);
 
   drive_vendor = udisks_drive_get_vendor (drive);
   drive_model = udisks_drive_get_model (drive);