diff options
| author | infirit <[email protected]> | 2014-12-19 00:28:04 +0100 |
|---|---|---|
| committer | infirit <[email protected]> | 2014-12-19 00:28:04 +0100 |
| commit | ee379181d3b6b89c23a660d027caa9c2d027aa7d (patch) | |
| tree | ce6e8a9b66ee4b0cdc58679d9dd53f77a7c3529f /src/proctable.cpp | |
| parent | 21eeae3b6a844222365b873a8826001af33f1e97 (diff) | |
| download | mate-system-monitor-ee379181d3b6b89c23a660d027caa9c2d027aa7d.tar.bz2 mate-system-monitor-ee379181d3b6b89c23a660d027caa9c2d027aa7d.tar.xz | |
Update systemd support from several GSD commits
Msg: Backout change from using free() to g_free() in systemd patch
Commit: f1f7bddf007c950608f5f8c5a771a7fb2ab187d5
From: Chris Kühl <[email protected]>
Msg: Require systemd 38 or greater when using --enable-systemd
Commit: ff551c6974cfa0801a368ee5c2406ce941ac8cab
From: Chris Kühl <[email protected]>
Msg: build: Disallow building with systemd v43 due to C++ incompatibility
Commit: 8a17cd6ff6b0ab4979c6ed8426724ce355d23679
From: Chris Kühl <[email protected]>
Msg: Check for logind, not for systemd
Commit: 4cf87daa48a8ab606afe5e3c2ac54c8f6276ba98
From: Martin Pitt <[email protected]>
Diffstat (limited to 'src/proctable.cpp')
| -rw-r--r-- | src/proctable.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/proctable.cpp b/src/proctable.cpp index 25b1f36..20f0db5 100644 --- a/src/proctable.cpp +++ b/src/proctable.cpp @@ -45,7 +45,6 @@ #include <list> #ifdef HAVE_SYSTEMD -#include <systemd/sd-daemon.h> #include <systemd/sd-login.h> #endif @@ -488,7 +487,7 @@ proctable_new (ProcData * const procdata) } #ifdef HAVE_SYSTEMD - if (sd_booted() <= 0) + if (!LOGIND_RUNNING()) #endif { GtkTreeViewColumn *column; @@ -756,7 +755,7 @@ get_process_systemd_info(ProcInfo *info) #ifdef HAVE_SYSTEMD uid_t uid; - if (sd_booted() <= 0) + if (!LOGIND_RUNNING()) return; free(info->unit); |