summaryrefslogtreecommitdiff
path: root/mate-session
diff options
context:
space:
mode:
authormonsta <[email protected]>2015-12-13 17:38:01 +0300
committermonsta <[email protected]>2015-12-13 17:38:01 +0300
commit6b09840cadebe81b1baf7dc13cb67346071f53a2 (patch)
tree8f51640da087bd680a078eafb8bb95a2eb159783 /mate-session
parent2cdcacd350c8c5456ddded9145bb7fbcc65ddbff (diff)
parentf9a2293e611930bab7a799efe2569313a4414348 (diff)
downloadmate-session-manager-6b09840cadebe81b1baf7dc13cb67346071f53a2.tar.bz2
mate-session-manager-6b09840cadebe81b1baf7dc13cb67346071f53a2.tar.xz
Merge pull request #110 from oleid/master
compile fix for upower 0.99 series
Diffstat (limited to 'mate-session')
-rw-r--r--mate-session/gsm-logout-dialog.c8
-rw-r--r--mate-session/gsm-manager.c12
2 files changed, 10 insertions, 10 deletions
diff --git a/mate-session/gsm-logout-dialog.c b/mate-session/gsm-logout-dialog.c
index 464101b..f53c197 100644
--- a/mate-session/gsm-logout-dialog.c
+++ b/mate-session/gsm-logout-dialog.c
@@ -215,10 +215,10 @@ gsm_logout_supports_system_suspend (GsmLogoutDialog *logout_dialog)
if (LOGIND_RUNNING())
ret = gsm_systemd_can_suspend (logout_dialog->priv->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
ret = up_client_get_can_suspend (logout_dialog->priv->up_client);
#endif
return ret;
@@ -233,10 +233,10 @@ gsm_logout_supports_system_hibernate (GsmLogoutDialog *logout_dialog)
if (LOGIND_RUNNING())
ret = gsm_systemd_can_hibernate (logout_dialog->priv->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
ret = up_client_get_can_hibernate (logout_dialog->priv->up_client);
#endif
return ret;
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
}