diff options
| author | raveit65 <[email protected]> | 2013-08-09 17:04:31 +0200 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2013-10-03 13:10:27 +0200 |
| commit | 8cc7c8067a15188fcb39ef9ab02ae5271ee9c1d3 (patch) | |
| tree | 615e441cdd0c0d740d84878a77bb80e84c4f196c | |
| parent | 63ff37f7d142800ceae6b429513996206ad3f14d (diff) | |
| download | mate-power-manager-8cc7c8067a15188fcb39ef9ab02ae5271ee9c1d3.tar.bz2 mate-power-manager-8cc7c8067a15188fcb39ef9ab02ae5271ee9c1d3.tar.xz | |
fix systemd-login1 support for gpm_manager_blank_screen
| -rw-r--r-- | src/gpm-backlight.c | 10 | ||||
| -rw-r--r-- | src/gpm-manager.c | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/gpm-backlight.c b/src/gpm-backlight.c index c2d58e2..8e20400 100644 --- a/src/gpm-backlight.c +++ b/src/gpm-backlight.c @@ -66,7 +66,7 @@ struct GpmBacklightPrivate GpmControl *control; GpmDpms *dpms; GpmIdle *idle; - EggConsoleKit *consolekit; + EggConsoleKit *console; gboolean can_dim; gboolean system_is_idle; GTimer *idle_timer; @@ -554,8 +554,8 @@ idle_changed_cb (GpmIdle *idle, GpmIdleMode mode, GpmBacklight *backlight) if (gpm_button_is_lid_closed (backlight->priv->button)) return; - /* don't dim or undim the screen unless we are on the active console */ - if (!egg_console_kit_is_active (backlight->priv->consolekit)) { + /* don't dim or undim the screen unless ConsoleKit/systemd say we are on the active console */ + if (!LOGIND_RUNNING() && !egg_console_kit_is_active (backlight->priv->console)) { egg_debug ("ignoring as not on active console"); return; } @@ -677,7 +677,7 @@ gpm_backlight_finalize (GObject *object) g_object_unref (backlight->priv->button); g_object_unref (backlight->priv->idle); g_object_unref (backlight->priv->brightness); - g_object_unref (backlight->priv->consolekit); + g_object_unref (backlight->priv->console); g_return_if_fail (backlight->priv != NULL); G_OBJECT_CLASS (gpm_backlight_parent_class)->finalize (object); @@ -772,7 +772,7 @@ gpm_backlight_init (GpmBacklight *backlight) G_CALLBACK (control_resume_cb), backlight); /* Don't do dimming on inactive console */ - backlight->priv->consolekit = egg_console_kit_new (); + backlight->priv->console = egg_console_kit_new (); /* sync at startup */ gpm_backlight_brightness_evaluate_and_set (backlight, FALSE, TRUE); diff --git a/src/gpm-manager.c b/src/gpm-manager.c index aeb5a31..5cff047 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; } @@ -1005,7 +1005,7 @@ gpm_manager_client_changed_cb (UpClient *client, GpmManager *manager) manager->priv->on_battery = on_battery; /* ConsoleKit says we are not on active console */ - if (!egg_console_kit_is_active (manager->priv->console)) { + if (!LOGIND_RUNNING() && !egg_console_kit_is_active (manager->priv->console)) { egg_debug ("ignoring as not on active console"); return; } |