Fix disabled monitor when laptop lid is closed

Resolves: #1638444
This commit is contained in:
Jonas Ådahl 2018-10-11 18:14:43 +02:00 committed by Kalev Lember
parent f5c77e40b3
commit 75565b2364
2 changed files with 41 additions and 1 deletions

View File

@ -0,0 +1,34 @@
From 5e1e1fa78af7c91a9ba209c3abe71fff4e6a25d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Thu, 11 Oct 2018 15:16:26 +0200
Subject: [PATCH] monitor-manager: Don't use switch-config when ensuring
configuration
Switch-configs are only to be used in certain circumstances (see
meta_monitor_manager_can_switch_config()) so when ensuring
configuration and attempting to create a linear configuration, use the
linear configuration constructor function directly without going via the
switch config method, otherwise we might incorrectly fall back to the
fallback configuration (only enable primary monitor).
---
src/backends/meta-monitor-manager.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/backends/meta-monitor-manager.c b/src/backends/meta-monitor-manager.c
index baed7521dd..d9236b928b 100644
--- a/src/backends/meta-monitor-manager.c
+++ b/src/backends/meta-monitor-manager.c
@@ -561,9 +561,7 @@ meta_monitor_manager_ensure_configured (MetaMonitorManager *manager)
g_clear_object (&config);
}
- config =
- meta_monitor_config_manager_create_for_switch_config (manager->config_manager,
- META_MONITOR_SWITCH_CONFIG_ALL_LINEAR);
+ config = meta_monitor_config_manager_create_linear (manager->config_manager);
if (config)
{
if (!meta_monitor_manager_apply_monitors_config (manager,
--
2.17.1

View File

@ -7,7 +7,7 @@
Name: mutter Name: mutter
Version: 3.30.1 Version: 3.30.1
Release: 2%{?dist} Release: 3%{?dist}
Summary: Window and compositing manager based on Clutter Summary: Window and compositing manager based on Clutter
License: GPLv2+ License: GPLv2+
@ -17,6 +17,9 @@ Source0: http://download.gnome.org/sources/%{name}/3.30/%{name}-%{version}
Patch0: startup-notification.patch Patch0: startup-notification.patch
# Fix disabled monitor when laptop lid is closed (rhbz#1638444)
Patch1: 0001-monitor-manager-Don-t-use-switch-config-when-ensurin.patch
BuildRequires: chrpath BuildRequires: chrpath
BuildRequires: pango-devel BuildRequires: pango-devel
BuildRequires: startup-notification-devel BuildRequires: startup-notification-devel
@ -181,6 +184,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
%{_datadir}/mutter/tests %{_datadir}/mutter/tests
%changelog %changelog
* Thu Oct 11 2018 Jonas Ådahl <jadahl@redhat.com> - 3.30.1-3
- Fix disabled monitor when laptop lid is closed (rhbz#1638444)
* Thu Oct 11 2018 David Herrmann <dh.herrmann@gmail.com> - 3.30.1-2 * Thu Oct 11 2018 David Herrmann <dh.herrmann@gmail.com> - 3.30.1-2
- Reduce 'dbus-x11' dependency to 'dbus'. The xinit script are no longer the - Reduce 'dbus-x11' dependency to 'dbus'. The xinit script are no longer the
canonical way to start dbus, but the 'dbus' package is nowadays required to canonical way to start dbus, but the 'dbus' package is nowadays required to