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

[David Zeuthen <davidz src gnome org>]

commit 8d60c092ab6a2f7e55986e871bba617268bf0cf1
Author: David Zeuthen <davidz redhat com>
Date:   Sun Oct 23 12:07:11 2011 -0400

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

 src/palimpsest/gdudevicetreemodel.c |    2 +-
 src/palimpsest/gdupartitiondialog.c |    4 ++--
 src/palimpsest/gduvolumegrid.c      |   12 ++++++------
 src/palimpsest/gduwindow.c          |    6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/src/palimpsest/gdudevicetreemodel.c b/src/palimpsest/gdudevicetreemodel.c
index 871e028..eb53051 100644
--- a/src/palimpsest/gdudevicetreemodel.c
+++ b/src/palimpsest/gdudevicetreemodel.c
@@ -745,7 +745,7 @@ update_block (GduDeviceTreeModel  *model,
   loop = udisks_object_peek_loop (object);
 
   size = udisks_block_get_size (block);
-  size_str = udisks_util_get_size_for_display (size, FALSE, FALSE);
+  size_str = udisks_client_get_size_for_display (model->client, size, FALSE, FALSE);
 
   preferred_device = udisks_block_get_preferred_device (block);
   loop_backing_file = loop != NULL ? udisks_loop_get_backing_file (loop) : NULL;
diff --git a/src/palimpsest/gdupartitiondialog.c b/src/palimpsest/gdupartitiondialog.c
index 0be566f..6c83f01 100644
--- a/src/palimpsest/gdupartitiondialog.c
+++ b/src/palimpsest/gdupartitiondialog.c
@@ -98,7 +98,7 @@ gdu_partition_dialog_show (GduWindow    *window,
 
   scheme = udisks_partition_table_get_type_ (partition_table);
   cur_type = udisks_partition_get_type_ (partition);
-  part_types = udisks_util_get_part_types_for_scheme (scheme);
+  part_types = udisks_client_get_part_types_for_scheme (gdu_window_get_client (window), scheme);
   active_index = -1;
   gtk_combo_box_text_remove_all (GTK_COMBO_BOX_TEXT (combo_box));
   for (n = 0; part_types != NULL && part_types[n] != NULL; n++)
@@ -106,7 +106,7 @@ gdu_partition_dialog_show (GduWindow    *window,
       const gchar *type;
       gchar *type_for_display;
       type = part_types[n];
-      type_for_display = udisks_util_get_part_type_for_display (scheme, type, TRUE);
+      type_for_display = udisks_client_get_part_type_for_display (gdu_window_get_client (window), scheme, type, TRUE);
       if (g_strcmp0 (type, cur_type) == 0)
         active_index = n;
       gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo_box), NULL, type_for_display);
diff --git a/src/palimpsest/gduvolumegrid.c b/src/palimpsest/gduvolumegrid.c
index f2ad901..e277c58 100644
--- a/src/palimpsest/gduvolumegrid.c
+++ b/src/palimpsest/gduvolumegrid.c
@@ -1936,7 +1936,7 @@ grid_element_set_details (GduVolumeGrid  *grid,
     case GDU_VOLUME_GRID_ELEMENT_TYPE_FREE_SPACE:
       {
         gchar *size_str;
-        size_str = udisks_util_get_size_for_display (element->size, FALSE, FALSE);
+        size_str = udisks_client_get_size_for_display (grid->client, element->size, FALSE, FALSE);
         element->markup = g_strdup_printf ("%s\n%s",
                                            C_("volume-grid", "Free Space"),
                                            size_str);
@@ -1959,7 +1959,7 @@ grid_element_set_details (GduVolumeGrid  *grid,
         UDisksFilesystem *filesystem;
         UDisksPartition *partition;
 
-        size_str = udisks_util_get_size_for_display (element->size, FALSE, FALSE);
+        size_str = udisks_client_get_size_for_display (grid->client, element->size, FALSE, FALSE);
         block = udisks_object_peek_block (element->object);
         filesystem = udisks_object_peek_filesystem (element->object);
         partition = udisks_object_peek_partition (element->object);
@@ -1998,7 +1998,7 @@ grid_element_set_details (GduVolumeGrid  *grid,
               }
             else
               {
-                type_for_display = udisks_util_get_id_for_display (usage, type, version, FALSE);
+                type_for_display = udisks_client_get_id_for_display (grid->client, usage, type, version, FALSE);
                 if (strlen (label) > 0)
                   cs = label;
                 else
@@ -2018,7 +2018,7 @@ grid_element_set_details (GduVolumeGrid  *grid,
             UDisksSwapspace *swapspace;
 
             label = udisks_block_get_id_label (block);
-            type_for_display = udisks_util_get_id_for_display (usage, type, version, FALSE);
+            type_for_display = udisks_client_get_id_for_display (grid->client, usage, type, version, FALSE);
             if (strlen (label) == 0)
               label = C_("volume-grid", "Swap");
             s = g_strdup_printf ("%s\n%s %s", label, size_str, type_for_display);
@@ -2033,7 +2033,7 @@ grid_element_set_details (GduVolumeGrid  *grid,
           }
         else if (g_strcmp0 (usage, "raid") == 0 && strlen (label) > 0)
           {
-            type_for_display = udisks_util_get_id_for_display (usage, type, version, FALSE);
+            type_for_display = udisks_client_get_id_for_display (grid->client, usage, type, version, FALSE);
             s = g_strdup_printf ("%s\n%s %s",
                                  label,
                                  size_str,
@@ -2042,7 +2042,7 @@ grid_element_set_details (GduVolumeGrid  *grid,
           }
         else
           {
-            type_for_display = udisks_util_get_id_for_display (usage, type, version, FALSE);
+            type_for_display = udisks_client_get_id_for_display (grid->client, usage, type, version, FALSE);
             s = g_strdup_printf ("%s\n%s",
                                  type_for_display,
                                  size_str);
diff --git a/src/palimpsest/gduwindow.c b/src/palimpsest/gduwindow.c
index 5948b0a..c8a82cf 100644
--- a/src/palimpsest/gduwindow.c
+++ b/src/palimpsest/gduwindow.c
@@ -1092,7 +1092,7 @@ set_size (GduWindow      *window,
           SetMarkupFlags  flags)
 {
   gchar *s;
-  s = udisks_util_get_size_for_display (size, FALSE, TRUE);
+  s = udisks_client_get_size_for_display (window->client, size, FALSE, TRUE);
   set_markup (window, key_label_id, label_id, s, size);
   g_free (s);
 }
@@ -1471,7 +1471,7 @@ update_device_page_for_drive (GduWindow      *window,
   size = udisks_drive_get_size (drive);
   if (size > 0)
     {
-      s = udisks_util_get_size_for_display (size, FALSE, TRUE);
+      s = udisks_client_get_size_for_display (window->client, size, FALSE, TRUE);
       set_markup (window,
                   "devtab-drive-size-label",
                   "devtab-drive-size-value-label",
@@ -1792,7 +1792,7 @@ update_device_page_for_block (GduWindow          *window,
         }
       else
         {
-          type_for_display = udisks_util_get_id_for_display (usage, type, version, TRUE);
+          type_for_display = udisks_client_get_id_for_display (window->client, usage, type, version, TRUE);
         }
     }
   else