File mate-power-manager_fix-display-to-sleep-when-in... of Package mate-power-manager

Overview Repositories Revisions Requests Users Attributes Meta

File mate-power-manager_fix-display-to-sleep-when-inactive.patch of Package mate-power-manager (Revision 15187f3a138b9b9aeaf7f4149f217bb9)

Currently displaying revision 15187f3a138b9b9aeaf7f4149f217bb9 , Show latest

From 753b74787e629905f9fdda268c5425471087faa6 Mon Sep 17 00:00:00 2001
From: Stefano Karapetsas <stefano@karapetsas.com>
Date: Fri, 09 Aug 2013 19:14:57 +0000
Subject: Merge pull request #73 from NiceandGently/master

fix systemd-login1 support for gpm_manager_blank_screen
---
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..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;
 	}
--
cgit

Places

File mate-power-manager_fix-display-to-sleep-when-inactive.patch of Package mate-power-manager (Revision 15187f3a138b9b9aeaf7f4149f217bb9)

Places