[tracker-miners/sam/upower: 2/2] Remove support for upower < 0.99

[Sam Thursfield <sthursfield src gnome org>]

commit 130205e6a39fafc8a1100ab42b87b4789400729f
Author: Sam Thursfield <sam afuera me uk>
Date:   Wed May 20 21:14:10 2020 +0200

    Remove support for upower < 0.99
    
    The ::on-low-battery signal was removed in 2013, see
    https://gitlab.freedesktop.org/upower/upower/-/commit/858ab85f9531a0d8de1449528d83223bb45990d3.

 config-miners.h.meson.in             |  3 ---
 src/miners/fs/tracker-power-upower.c | 44 ------------------------------------
 2 files changed, 47 deletions(-)
---
diff --git a/config-miners.h.meson.in b/config-miners.h.meson.in
index 4caa01905..a6a4a7797 100644
--- a/config-miners.h.meson.in
+++ b/config-miners.h.meson.in
@@ -59,9 +59,6 @@
 /* Define to 1 if you have the `strnlen' function. */
 #mesondefine HAVE_STRNLEN
 
-/* Define to 1 if you have the `up_client_get_on_low_battery' function. */
-#mesondefine HAVE_UP_CLIENT_GET_ON_LOW_BATTERY
-
 /* Define to the address where bug reports for this package should be sent. */
 #mesondefine PACKAGE_BUGREPORT
 
diff --git a/src/miners/fs/tracker-power-upower.c b/src/miners/fs/tracker-power-upower.c
index 3a99f0895..42080fcc2 100644
--- a/src/miners/fs/tracker-power-upower.c
+++ b/src/miners/fs/tracker-power-upower.c
@@ -28,9 +28,7 @@
 
 typedef struct {
        UpClient  *client;
-#ifndef HAVE_UP_CLIENT_GET_ON_LOW_BATTERY
        UpDevice  *composite_device;
-#endif
        gboolean   on_battery;
        gboolean   on_low_battery;
 } TrackerPowerPrivate;
@@ -41,10 +39,6 @@ static void     tracker_power_get_property        (GObject         *object,
                                                    guint            param_id,
                                                    GValue                  *value,
                                                    GParamSpec      *pspec);
-#ifdef HAVE_UP_CLIENT_GET_ON_LOW_BATTERY
-static void     tracker_power_client_changed_cb   (UpClient        *client,
-                                                   TrackerPower    *power);
-#endif /* HAVE_UP_CLIENT_GET_ON_LOW_BATTERY */
 
 enum {
        PROP_0,
@@ -83,7 +77,6 @@ tracker_power_class_init (TrackerPowerClass *klass)
                                                               G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 }
 
-#ifndef HAVE_UP_CLIENT_GET_ON_LOW_BATTERY
 static void
 on_on_battery_changed (UpClient     *client,
                        GParamSpec   *pspec,
@@ -115,7 +108,6 @@ on_warning_level_changed (UpDevice     *device,
                g_object_notify (G_OBJECT (power), "on-low-battery");
        }
 }
-#endif /* !HAVE_UP_CLIENT_GET_ON_LOW_BATTERY */
 
 static void
 tracker_power_init (TrackerPower *power)
@@ -140,11 +132,6 @@ tracker_power_initable_init (GInitable     *initable,
                return FALSE;
        }
 
-#ifdef HAVE_UP_CLIENT_GET_ON_LOW_BATTERY
-       g_signal_connect (priv->client, "changed",
-                         G_CALLBACK (tracker_power_client_changed_cb), power);
-       tracker_power_client_changed_cb (priv->client, power);
-#else
        g_signal_connect (priv->client, "notify::on-battery",
                          G_CALLBACK (on_on_battery_changed), power);
        on_on_battery_changed (priv->client, NULL, power);
@@ -152,7 +139,6 @@ tracker_power_initable_init (GInitable     *initable,
        g_signal_connect (priv->composite_device, "notify::warning-level",
                              G_CALLBACK (on_warning_level_changed), power);
        on_warning_level_changed (priv->composite_device, NULL, power);
-#endif /* HAVE_UP_CLIENT_GET_ON_LOW_BATTERY */
 
        return TRUE;
 }
@@ -164,10 +150,7 @@ tracker_power_finalize (GObject *object)
 
        priv = GET_PRIV (object);
 
-#ifndef HAVE_UP_CLIENT_GET_ON_LOW_BATTERY
        g_clear_object (&priv->composite_device);
-#endif /* HAVE_UP_CLIENT_GET_ON_LOW_BATTERY */
-
        g_clear_object (&priv->client);
 
        (G_OBJECT_CLASS (tracker_power_parent_class)->finalize) (object);
@@ -196,33 +179,6 @@ tracker_power_get_property (GObject    *object,
        };
 }
 
-#ifdef HAVE_UP_CLIENT_GET_ON_LOW_BATTERY
-static void
-tracker_power_client_changed_cb (UpClient     *client,
-                                 TrackerPower *power)
-{
-       TrackerPowerPrivate *priv;
-       gboolean on_battery;
-       gboolean on_low_battery;
-
-       priv = GET_PRIV (power);
-
-       /* get the on-battery state */
-       on_battery = up_client_get_on_battery (priv->client);
-       if (on_battery != priv->on_battery) {
-               priv->on_battery = on_battery;
-               g_object_notify (G_OBJECT (power), "on-battery");
-       }
-
-       /* get the on-low-battery state */
-       on_low_battery = up_client_get_on_low_battery (priv->client);
-       if (on_low_battery != priv->on_low_battery) {
-               priv->on_low_battery = on_low_battery;
-               g_object_notify (G_OBJECT (power), "on-low-battery");
-       }
-}
-#endif /* HAVE_UP_CLIENT_GET_ON_LOW_BATTERY */
-
 static void
 tracker_power_initable_iface_init (GInitableIface *iface)
 {