diff options
| author | Stefano Karapetsas <[email protected]> | 2014-04-30 18:46:26 +0200 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2014-04-30 18:46:26 +0200 |
| commit | 4322d7eaaf96f52ba5413ee9e3dfab95ee3f95bd (patch) | |
| tree | f60ec1cb01afde990ea361910e4152973a3f3ba0 /mate-session | |
| parent | 43c97d4cff1ec3fe0253cf73003ec7b36cfdc7d0 (diff) | |
| download | mate-session-manager-4322d7eaaf96f52ba5413ee9e3dfab95ee3f95bd.tar.bz2 mate-session-manager-4322d7eaaf96f52ba5413ee9e3dfab95ee3f95bd.tar.xz | |
Revert "Allow to build with upower 0.99"
This reverts commit 80be90bb422ef8cb5a28c7ff3fe2a337dce8c368.
Diffstat (limited to 'mate-session')
| -rw-r--r-- | mate-session/gsm-logout-dialog.c | 8 | ||||
| -rw-r--r-- | mate-session/gsm-manager.c | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/mate-session/gsm-logout-dialog.c b/mate-session/gsm-logout-dialog.c index 697b70d..da3d651 100644 --- a/mate-session/gsm-logout-dialog.c +++ b/mate-session/gsm-logout-dialog.c @@ -211,10 +211,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) && !UP_CHECK_VERSION(0, 99, 0) +#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER) else #endif -#if defined(HAVE_UPOWER) && !UP_CHECK_VERSION(0, 99, 0) +#ifdef HAVE_UPOWER ret = up_client_get_can_suspend (logout_dialog->priv->up_client); #endif return ret; @@ -229,10 +229,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) && !UP_CHECK_VERSION(0, 99, 0) +#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER) else #endif -#if defined(HAVE_UPOWER) && !UP_CHECK_VERSION(0, 99, 0) +#ifdef HAVE_UPOWER 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 638ef10..eda565b 100644 --- a/mate-session/gsm-manager.c +++ b/mate-session/gsm-manager.c @@ -1163,10 +1163,10 @@ manager_attempt_hibernate (GsmManager *manager) gsm_systemd_attempt_hibernate (systemd); } #endif -#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER) && !UP_CHECK_VERSION(0, 99, 0) +#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER) else { #endif -#if defined(HAVE_UPOWER) && !UP_CHECK_VERSION(0, 99, 0) +#ifdef HAVE_UPOWER can_hibernate = up_client_get_can_hibernate (manager->priv->up_client); if (can_hibernate) { @@ -1182,7 +1182,7 @@ manager_attempt_hibernate (GsmManager *manager) } } #endif -#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER) && !UP_CHECK_VERSION(0, 99, 0) +#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER) } #endif } @@ -1208,10 +1208,10 @@ manager_attempt_suspend (GsmManager *manager) gsm_systemd_attempt_suspend (systemd); } #endif -#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER) && !UP_CHECK_VERSION(0, 99, 0) +#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER) else { #endif -#if defined(HAVE_UPOWER) && !UP_CHECK_VERSION(0, 99, 0) +#ifdef HAVE_UPOWER can_suspend = up_client_get_can_suspend (manager->priv->up_client); if (can_suspend) { @@ -1227,7 +1227,7 @@ manager_attempt_suspend (GsmManager *manager) } } #endif -#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER) && !UP_CHECK_VERSION(0, 99, 0) +#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER) } #endif } |