diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-04-27 17:19:31 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-04-28 13:00:12 +0200 |
| commit | 2b087b478232561c76d68fd41d60f811a3d7b233 (patch) | |
| tree | 5bb98a660b5bd60ec261a6b2b091b66938423a43 | |
| parent | 400e9fc9fb0febae9b5ebc5e59d1d695cfe9faf9 (diff) | |
| download | NetworkManager-2b087b478232561c76d68fd41d60f811a3d7b233.tar.gz | |
sleep-monitor: cleanup #if usage by using USE_UPOWER in "nm-sleep-monitor.c"
| -rw-r--r-- | src/nm-sleep-monitor.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/nm-sleep-monitor.c b/src/nm-sleep-monitor.c index d9551a7bce..5a450e2ad8 100644 --- a/src/nm-sleep-monitor.c +++ b/src/nm-sleep-monitor.c @@ -35,12 +35,16 @@ #define SUSPEND_DBUS_NAME "org.freedesktop.UPower" #define SUSPEND_DBUS_PATH "/org/freedesktop/UPower" #define SUSPEND_DBUS_INTERFACE "org.freedesktop.UPower" +#define USE_UPOWER 1 +#define _NMLOG_PREFIX_NAME "sleep-monitor-up" #elif defined (SUSPEND_RESUME_SYSTEMD) #define SUSPEND_DBUS_NAME "org.freedesktop.login1" #define SUSPEND_DBUS_PATH "/org/freedesktop/login1" #define SUSPEND_DBUS_INTERFACE "org.freedesktop.login1.Manager" +#define USE_UPOWER 0 +#define _NMLOG_PREFIX_NAME "sleep-monitor-sd" #elif defined(SUSPEND_RESUME_CONSOLEKIT) @@ -51,6 +55,8 @@ #define SUSPEND_DBUS_NAME "org.freedesktop.ConsoleKit" #define SUSPEND_DBUS_PATH "/org/freedesktop/ConsoleKit/Manager" #define SUSPEND_DBUS_INTERFACE "org.freedesktop.ConsoleKit.Manager" +#define USE_UPOWER 0 +#define _NMLOG_PREFIX_NAME "sleep-monitor-ck" #else @@ -89,12 +95,6 @@ NM_DEFINE_SINGLETON_GETTER (NMSleepMonitor, nm_sleep_monitor_get, NM_TYPE_SLEEP_ /*****************************************************************************/ -#ifdef SUSPEND_RESUME_SYSTEMD -#define _NMLOG_PREFIX_NAME "sleep-monitor-sd" -#else -#define _NMLOG_PREFIX_NAME "sleep-monitor-ck" -#endif - #define _NMLOG_DOMAIN LOGD_SUSPEND #define _NMLOG(level, ...) \ G_STMT_START { \ @@ -116,7 +116,7 @@ NM_DEFINE_SINGLETON_GETTER (NMSleepMonitor, nm_sleep_monitor_get, NM_TYPE_SLEEP_ /*****************************************************************************/ -#if defined (SUSPEND_RESUME_UPOWER) +#if USE_UPOWER static void upower_sleeping_cb (GDBusProxy *proxy, gpointer user_data) @@ -275,12 +275,12 @@ on_proxy_acquired (GObject *object, static void nm_sleep_monitor_init (NMSleepMonitor *self) { -#if defined (SUSPEND_RESUME_UPOWER) +#if USE_UPOWER GError *error = NULL; #endif self->inhibit_fd = -1; -#if defined (SUSPEND_RESUME_UPOWER) +#if USE_UPOWER self->proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM, G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START | G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, @@ -315,7 +315,7 @@ dispose (GObject *object) { NMSleepMonitor *self = NM_SLEEP_MONITOR (object); -#if ! defined (SUSPEND_RESUME_UPOWER) +#if !USE_UPOWER drop_inhibitor (self); #endif |