diff options
| author | Stefano Karapetsas <[email protected]> | 2013-08-09 12:14:57 -0700 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2013-08-09 12:14:57 -0700 |
| commit | 753b74787e629905f9fdda268c5425471087faa6 (patch) | |
| tree | a1e5760797b7c31de34538fe16dcd495fa6e188e /src/gpm-manager.c | |
| parent | e810bafae029af1dcb62e9f8e4e876dcff1f3314 (diff) | |
| parent | 93b2cd78da14035d052275b91f2a827bb08ebea8 (diff) | |
| download | mate-power-manager-753b74787e629905f9fdda268c5425471087faa6.tar.bz2 mate-power-manager-753b74787e629905f9fdda268c5425471087faa6.tar.xz | |
Merge pull request #73 from NiceandGently/master
fix systemd-login1 support for gpm_manager_blank_screen
Diffstat (limited to 'src/gpm-manager.c')
| -rw-r--r-- | src/gpm-manager.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gpm-manager.c b/src/gpm-manager.c index aeb5a31..7561b22 100644 --- a/src/gpm-manager.c +++ b/src/gpm-manager.c @@ -775,8 +775,8 @@ gpm_manager_idle_do_sleep (GpmManager *manager) static void gpm_manager_idle_changed_cb (GpmIdle *idle, GpmIdleMode mode, GpmManager *manager) { - /* ConsoleKit says we are not on active console */ - if (!egg_console_kit_is_active (manager->priv->console)) { + /* ConsoleKit/systemd say we are not on active console */ + if (!LOGIND_RUNNING() && !egg_console_kit_is_active (manager->priv->console)) { egg_debug ("ignoring as not on active console"); return; } @@ -1004,8 +1004,8 @@ gpm_manager_client_changed_cb (UpClient *client, GpmManager *manager) /* save in local cache */ manager->priv->on_battery = on_battery; - /* ConsoleKit says we are not on active console */ - if (!egg_console_kit_is_active (manager->priv->console)) { + /* ConsoleKit/systemd say we are not on active console */ + if (!LOGIND_RUNNING() && !egg_console_kit_is_active (manager->priv->console)) { egg_debug ("ignoring as not on active console"); return; } |