[gnome-disk-utility] Bump required udisks version to 1.97.0

[David Zeuthen <davidz src gnome org>]

commit 4b4c35efe62edc3a8016b175b995aff382b60d1f
Author: David Zeuthen <davidz redhat com>
Date:   Wed May 9 14:55:19 2012 -0400

    Bump required udisks version to 1.97.0
    
    Signed-off-by: David Zeuthen <davidz redhat com>

 configure.ac                  |    2 +-
 src/disk-image-mounter/main.c |    4 ----
 src/disks/gduwindow.c         |   25 -------------------------
 3 files changed, 1 insertions(+), 30 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 541dc16..ff5c24a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,7 @@ GNOME_MAINTAINER_MODE_DEFINES
 # ***************************
 
 GLIB2_REQUIRED=2.31.0
-UDISKS2_REQUIRED=1.90.0
+UDISKS2_REQUIRED=1.97.0
 GTK3_REQUIRED=3.3.11
 KEYRING1_REQUIRED=3.4.0
 
diff --git a/src/disk-image-mounter/main.c b/src/disk-image-mounter/main.c
index c4c2a4c..4f5651c 100644
--- a/src/disk-image-mounter/main.c
+++ b/src/disk-image-mounter/main.c
@@ -390,8 +390,6 @@ main (int argc, char *argv[])
        */
       if (num_mounts > 0)
         {
-#ifdef UDISKS_CHECK_VERSION
-# if UDISKS_CHECK_VERSION(1,97,0)
           error = NULL;
           if (!udisks_loop_call_set_autoclear_sync (loop,
                                                     TRUE,
@@ -406,8 +404,6 @@ main (int argc, char *argv[])
                           error->message, g_quark_to_string (error->domain), error->code);
               g_error_free (error);
             }
-# endif
-#endif
           loop_device_objpaths = g_list_prepend (loop_device_objpaths, g_strdup (loop_object_path));
         }
       else if (loop != NULL)
diff --git a/src/disks/gduwindow.c b/src/disks/gduwindow.c
index 4f7ce3a..bbafd18 100644
--- a/src/disks/gduwindow.c
+++ b/src/disks/gduwindow.c
@@ -1671,16 +1671,8 @@ update_device_page_for_drive (GduWindow      *window,
       /* If the device is not tagged, assume that udisks does not have
        * working seat-support... so just assume it's available at our
        * 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
        */
-#ifdef UDISKS_CHECK_VERSION
-# if UDISKS_CHECK_VERSION(1,95,0)
       drive_seat = udisks_drive_get_seat (drive);
-# endif
-#endif
       if (drive_seat != NULL)
         {
           /* If device is attached to seat0, only consider it to be another seat if
@@ -1933,15 +1925,11 @@ update_device_page_for_block (GduWindow          *window,
                   s, SET_MARKUP_FLAGS_NONE);
       g_free (s);
 
-#ifdef UDISKS_CHECK_VERSION
-# if UDISKS_CHECK_VERSION(1,97,0)
       set_switch (window,
                   "devtab-loop-autoclear-label",
                   "devtab-loop-autoclear-switch-box",
                   "devtab-loop-autoclear-switch",
                   udisks_loop_get_autoclear (loop));
-# endif
-#endif
     }
 
   usage = udisks_block_get_id_usage (block);
@@ -2128,15 +2116,11 @@ update_device_page_for_free_space (GduWindow          *window,
                   s, SET_MARKUP_FLAGS_NONE);
       g_free (s);
 
-#ifdef UDISKS_CHECK_VERSION
-# if UDISKS_CHECK_VERSION(1,97,0)
       set_switch (window,
                   "devtab-loop-autoclear-label",
                   "devtab-loop-autoclear-switch-box",
                   "devtab-loop-autoclear-switch",
                   udisks_loop_get_autoclear (loop));
-# endif
-#endif
     }
 
   table = udisks_object_peek_partition_table (object);
@@ -2836,9 +2820,6 @@ on_devtab_action_deactivate_swap_activated (GtkAction *action, gpointer user_dat
 
 /* ---------------------------------------------------------------------------------------------------- */
 
-#ifdef UDISKS_CHECK_VERSION
-# if UDISKS_CHECK_VERSION(1,97,0)
-
 static void
 loop_set_autoclear_cb (UDisksLoop      *loop,
                        GAsyncResult    *res,
@@ -2862,8 +2843,6 @@ loop_set_autoclear_cb (UDisksLoop      *loop,
     }
   g_object_unref (window);
 }
-# endif
-#endif
 
 static void
 on_devtab_loop_autoclear_switch_notify_active (GObject    *gobject,
@@ -2884,8 +2863,6 @@ on_devtab_loop_autoclear_switch_notify_active (GObject    *gobject,
     }
 
   sw_value = !! gtk_switch_get_active (GTK_SWITCH (gobject));
-#ifdef UDISKS_CHECK_VERSION
-# if UDISKS_CHECK_VERSION(1,97,0)
   if (sw_value != (!!udisks_loop_get_autoclear (loop)))
     {
       udisks_loop_call_set_autoclear (loop,
@@ -2895,8 +2872,6 @@ on_devtab_loop_autoclear_switch_notify_active (GObject    *gobject,
                                       (GAsyncReadyCallback) loop_set_autoclear_cb,
                                       g_object_ref (window));
     }
-# endif
-#endif
 
  out:
   ;