summaryrefslogtreecommitdiff
path: root/mate-session/gsm-manager.c
diff options
context:
space:
mode:
authorOlaf Leidinger <[email protected]>2015-11-14 16:46:28 +0100
committerOlaf Leidinger <[email protected]>2015-11-14 16:46:28 +0100
commitf9a2293e611930bab7a799efe2569313a4414348 (patch)
treec51e1606038df706e4d1fb03326afbeb88fb35b6 /mate-session/gsm-manager.c
parentdebd5bbbe3dda8934687eb66dbf0a5bfa97f5b2e (diff)
downloadmate-session-manager-f9a2293e611930bab7a799efe2569313a4414348.tar.bz2
mate-session-manager-f9a2293e611930bab7a799efe2569313a4414348.tar.xz
compile fix for upower 0.99 series
upower 0.99 has lost support for hibernate and suspend. This leads to undefined references to up_client_get_can_suspend and up_client_get_can_hibernate on my system. This patch removes any call to those functions for upower >= 0.99.
Diffstat (limited to 'mate-session/gsm-manager.c')
-rw-r--r--mate-session/gsm-manager.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/mate-session/gsm-manager.c b/mate-session/gsm-manager.c
index db392b8..7930993 100644
--- a/mate-session/gsm-manager.c
+++ b/mate-session/gsm-manager.c
@@ -1184,10 +1184,10 @@ manager_attempt_hibernate (GsmManager *manager)
gsm_systemd_attempt_hibernate (systemd);
}
#endif
-#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER)
+#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER_HIBERNATE_SUSPEND)
else {
#endif
-#ifdef HAVE_UPOWER
+#ifdef HAVE_UPOWER_HIBERNATE_SUSPEND
can_hibernate = up_client_get_can_hibernate (manager->priv->up_client);
if (can_hibernate) {
@@ -1203,7 +1203,7 @@ manager_attempt_hibernate (GsmManager *manager)
}
}
#endif
-#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER)
+#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER_HIBERNATE_SUSPEND)
}
#endif
}
@@ -1229,10 +1229,10 @@ manager_attempt_suspend (GsmManager *manager)
gsm_systemd_attempt_suspend (systemd);
}
#endif
-#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER)
+#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER_HIBERNATE_SUSPEND)
else {
#endif
-#ifdef HAVE_UPOWER
+#ifdef HAVE_UPOWER_HIBERNATE_SUSPEND
can_suspend = up_client_get_can_suspend (manager->priv->up_client);
if (can_suspend) {
@@ -1248,7 +1248,7 @@ manager_attempt_suspend (GsmManager *manager)
}
}
#endif
-#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER)
+#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER_HIBERNATE_SUSPEND)
}
#endif
}