diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-08-04 13:06:16 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-08-04 14:41:33 +0200 |
| commit | 3b29a4e0dab5dc6f86a2c8d5f05c2db483a958d7 (patch) | |
| tree | 5e25cb65bc8f9c19572eafe1b8dd38573bafbd6b | |
| parent | d40d1ba931afc1c23d9828814eb1c743442ef1ae (diff) | |
| download | NetworkManager-3b29a4e0dab5dc6f86a2c8d5f05c2db483a958d7.tar.gz | |
fixup! sleep-monitor: add support for ConsoleKit2 inhibit
Whitespace fixes.
| -rw-r--r-- | configure.ac | 28 | ||||
| -rw-r--r-- | src/nm-sleep-monitor-systemd.c | 12 |
2 files changed, 20 insertions, 20 deletions
diff --git a/configure.ac b/configure.ac index d317381aa3..9fce12bb4d 100644 --- a/configure.ac +++ b/configure.ac @@ -457,31 +457,31 @@ if test "z$with_suspend_resume" = "z"; then PKG_CHECK_EXISTS([libsystemd >= 209], [have_systemd_inhibit=yes], [PKG_CHECK_EXISTS([libsystemd-login >= 183], [have_systemd_inhibit=yes], [have_systemd_inhibit=no])]) if test "z${have_systemd_inhibit}" = "zyes"; then - # Use systemd if it's new enough - with_suspend_resume="systemd" + # Use systemd if it's new enough + with_suspend_resume="systemd" else if test "$use_consolekit" = "yes"; then - # Use consolekit suspend if session tracking is consolekit - with_suspend_resume="consolekit" - else - # Fall back to upower - with_suspend_resume="upower" - fi + # Use consolekit suspend if session tracking is consolekit + with_suspend_resume="consolekit" + else + # Fall back to upower + with_suspend_resume="upower" + fi fi fi case $with_suspend_resume in upower) ;; systemd) - PKG_CHECK_MODULES(SYSTEMD_INHIBIT, [libsystemd >= 209],, - [PKG_CHECK_MODULES(SYSTEMD_INHIBIT, [libsystemd-login >= 183])]) - AC_DEFINE([SUSPEND_RESUME_SYSTEMD], 1, [Define to 1 to use systemd suspend api]) + PKG_CHECK_MODULES(SYSTEMD_INHIBIT, [libsystemd >= 209],, + [PKG_CHECK_MODULES(SYSTEMD_INHIBIT, [libsystemd-login >= 183])]) + AC_DEFINE([SUSPEND_RESUME_SYSTEMD], 1, [Define to 1 to use systemd suspend api]) ;; consolekit) - AC_DEFINE([SUSPEND_RESUME_CONSOLEKIT], 1, [Define to 1 to use ConsoleKit2 suspend api]) - ;; + AC_DEFINE([SUSPEND_RESUME_CONSOLEKIT], 1, [Define to 1 to use ConsoleKit2 suspend api]) + ;; *) - AC_MSG_ERROR(--with-suspend-resume must be one of [upower, systemd, consolekit]) + AC_MSG_ERROR(--with-suspend-resume must be one of [upower, systemd, consolekit]) ;; esac AM_CONDITIONAL(SUSPEND_RESUME_UPOWER, test "x$with_suspend_resume" = "xupower") diff --git a/src/nm-sleep-monitor-systemd.c b/src/nm-sleep-monitor-systemd.c index 30be9c6c6a..2d97ce931a 100644 --- a/src/nm-sleep-monitor-systemd.c +++ b/src/nm-sleep-monitor-systemd.c @@ -205,12 +205,12 @@ nm_sleep_monitor_init (NMSleepMonitor *self) #endif /* SUSPEND_RESUME_SYSTEMD */ #ifdef SUSPEND_RESUME_CONSOLEKIT g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM, - G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START | - G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, - NULL, - CK_NAME, CK_PATH, CK_INTERFACE, - NULL, - (GAsyncReadyCallback) on_proxy_acquired, self); + G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START | + G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, + NULL, + CK_NAME, CK_PATH, CK_INTERFACE, + NULL, + (GAsyncReadyCallback) on_proxy_acquired, self); #endif /* SUSPEND_RESUME_CONSOLEKIT */ } |