diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-04-28 13:45:49 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-04-28 13:45:49 +0200 |
| commit | 1e3b2cbb77fac8693e267389b3376185861e772d (patch) | |
| tree | 7ccc010a4b0df72429ad93d9dd73b1601f08f17d /src/nm-sleep-monitor.c | |
| parent | 07db1217a9dad4610b3d556c38947ac66129b537 (diff) | |
| download | NetworkManager-1e3b2cbb77fac8693e267389b3376185861e772d.tar.gz | |
sleep-monitor: make sleep-monitor not a singleton
The only user of the sleep-monitor singleton was NMManager anyway.
Also, even if we ever get more users that are interested in the SLEEPING
signal, we would hook them onto NMManager -- because NMManager should
collect, coordinate and possibly forward the SLEEPING signal. In no case,
another object should react on the SLEEPING signal and thus bypassing the
NMManager.
Diffstat (limited to 'src/nm-sleep-monitor.c')
| -rw-r--r-- | src/nm-sleep-monitor.c | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/src/nm-sleep-monitor.c b/src/nm-sleep-monitor.c index bc87743bf7..42a61f6fe3 100644 --- a/src/nm-sleep-monitor.c +++ b/src/nm-sleep-monitor.c @@ -90,8 +90,6 @@ static guint signals[LAST_SIGNAL] = {0}; G_DEFINE_TYPE (NMSleepMonitor, nm_sleep_monitor, G_TYPE_OBJECT); -NM_DEFINE_SINGLETON_GETTER (NMSleepMonitor, nm_sleep_monitor_get, NM_TYPE_SLEEP_MONITOR); - static void sleep_signal (NMSleepMonitor *self, gboolean is_about_to_suspend); /*****************************************************************************/ @@ -99,20 +97,10 @@ static void sleep_signal (NMSleepMonitor *self, gboolean is_about_to_suspend); #define _NMLOG_DOMAIN LOGD_SUSPEND #define _NMLOG(level, ...) \ G_STMT_START { \ - const NMLogLevel __level = (level); \ - \ - if (nm_logging_enabled (__level, _NMLOG_DOMAIN)) { \ - char __prefix[20]; \ - const NMSleepMonitor *const __self = (self); \ - \ - _nm_log (__level, _NMLOG_DOMAIN, 0, \ - "%s%s: " _NM_UTILS_MACRO_FIRST (__VA_ARGS__), \ - _NMLOG_PREFIX_NAME, \ - (!__self || __self == singleton_instance \ - ? "" \ - : nm_sprintf_buf (__prefix, "[%p]", __self)) \ - _NM_UTILS_MACRO_REST (__VA_ARGS__)); \ - } \ + nm_log ((level), _NMLOG_DOMAIN, \ + "%s: " _NM_UTILS_MACRO_FIRST (__VA_ARGS__), \ + _NMLOG_PREFIX_NAME \ + _NM_UTILS_MACRO_REST (__VA_ARGS__)); \ } G_STMT_END /*****************************************************************************/ @@ -303,6 +291,12 @@ nm_sleep_monitor_init (NMSleepMonitor *self) (GAsyncReadyCallback) on_proxy_acquired, self); } +NMSleepMonitor * +nm_sleep_monitor_new (void) +{ + return g_object_new (NM_TYPE_SLEEP_MONITOR, NULL); +} + static void dispose (GObject *object) { |