[mutter/wip/up-client-cleanups: 133/136] monitor-manager: Don't throw an error if UPower isn't running
- From: Jonas Ådahl <jadahl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wip/up-client-cleanups: 133/136] monitor-manager: Don't throw an error if UPower isn't running
- Date: Wed, 18 Jul 2018 10:19:02 +0000 (UTC)
commit 644a618fb15d90056107bc4e1fbd7397f17219a8
Author: Bastien Nocera <hadess hadess net>
Date: Mon Apr 16 10:54:08 2018 +0200
monitor-manager: Don't throw an error if UPower isn't running
Don't try to connect to a UpClient signal if creating the client failed,
because UPower isn't running for example.
src/backends/meta-monitor-manager.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/src/backends/meta-monitor-manager.c b/src/backends/meta-monitor-manager.c
index c2244743a..5c7eae8e9 100644
--- a/src/backends/meta-monitor-manager.c
+++ b/src/backends/meta-monitor-manager.c
@@ -733,8 +733,11 @@ meta_monitor_manager_constructed (GObject *object)
if (manager_class->is_lid_closed == meta_monitor_manager_real_is_lid_closed)
{
manager->up_client = up_client_new ();
- g_signal_connect_object (manager->up_client, "notify::lid-is-closed",
- G_CALLBACK (lid_is_closed_changed), manager, 0);
+ if (manager->up_client)
+ {
+ g_signal_connect_object (manager->up_client, "notify::lid-is-closed",
+ G_CALLBACK (lid_is_closed_changed), manager, 0);
+ }
}
g_signal_connect_object (manager, "notify::power-save-mode",
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]