[gnome-flashback] monitor-manager: remove 'mirror' capability



commit f816ec5d806cd78ebbda6513a226352ba7dad7df
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Fri May 8 20:49:24 2020 +0300

    monitor-manager: remove 'mirror' capability
    
    Based on mutter commits:
    https://gitlab.gnome.org/GNOME/mutter/-/commit/0a6034ef3a745c25ab63
    https://gitlab.gnome.org/GNOME/mutter/-/commit/bd28581471b43ca9845e

 backends/gf-monitor-manager-enums-private.h | 5 ++---
 backends/gf-monitor-manager-xrandr.c        | 9 +--------
 backends/gf-monitor-manager.c               | 6 ------
 backends/org.gnome.Mutter.DisplayConfig.xml | 2 --
 4 files changed, 3 insertions(+), 19 deletions(-)
---
diff --git a/backends/gf-monitor-manager-enums-private.h b/backends/gf-monitor-manager-enums-private.h
index 988483f..717b68d 100644
--- a/backends/gf-monitor-manager-enums-private.h
+++ b/backends/gf-monitor-manager-enums-private.h
@@ -32,9 +32,8 @@ G_BEGIN_DECLS
 typedef enum
 {
   GF_MONITOR_MANAGER_CAPABILITY_NONE = 0,
-  GF_MONITOR_MANAGER_CAPABILITY_MIRRORING = (1 << 0),
-  GF_MONITOR_MANAGER_CAPABILITY_LAYOUT_MODE = (1 << 1),
-  GF_MONITOR_MANAGER_CAPABILITY_GLOBAL_SCALE_REQUIRED = (1 << 2)
+  GF_MONITOR_MANAGER_CAPABILITY_LAYOUT_MODE = (1 << 0),
+  GF_MONITOR_MANAGER_CAPABILITY_GLOBAL_SCALE_REQUIRED = (1 << 1)
 } GfMonitorManagerCapability;
 
 /* Equivalent to the 'method' enum in org.gnome.Mutter.DisplayConfig */
diff --git a/backends/gf-monitor-manager-xrandr.c b/backends/gf-monitor-manager-xrandr.c
index ac78321..4659b54 100644
--- a/backends/gf-monitor-manager-xrandr.c
+++ b/backends/gf-monitor-manager-xrandr.c
@@ -1060,14 +1060,7 @@ gf_monitor_manager_xrandr_calculate_supported_scales (GfMonitorManager
 static GfMonitorManagerCapability
 gf_monitor_manager_xrandr_get_capabilities (GfMonitorManager *manager)
 {
-  GfMonitorManagerCapability capabilities;
-
-  capabilities = GF_MONITOR_MANAGER_CAPABILITY_NONE;
-
-  capabilities |= GF_MONITOR_MANAGER_CAPABILITY_MIRRORING;
-  capabilities |= GF_MONITOR_MANAGER_CAPABILITY_GLOBAL_SCALE_REQUIRED;
-
-  return capabilities;
+  return GF_MONITOR_MANAGER_CAPABILITY_GLOBAL_SCALE_REQUIRED;
 }
 
 static gboolean
diff --git a/backends/gf-monitor-manager.c b/backends/gf-monitor-manager.c
index d6c19cf..469f32b 100644
--- a/backends/gf-monitor-manager.c
+++ b/backends/gf-monitor-manager.c
@@ -1650,12 +1650,6 @@ gf_monitor_manager_handle_get_current_state (GfDBusDisplayConfig   *skeleton,
     }
 
   capabilities = gf_monitor_manager_get_capabilities (manager);
-  if ((capabilities & GF_MONITOR_MANAGER_CAPABILITY_MIRRORING) == 0)
-    {
-      g_variant_builder_add (&properties_builder, "{sv}",
-                             "supports-mirroring",
-                             g_variant_new_boolean (FALSE));
-    }
 
   g_variant_builder_add (&properties_builder, "{sv}",
                          "layout-mode",
diff --git a/backends/org.gnome.Mutter.DisplayConfig.xml b/backends/org.gnome.Mutter.DisplayConfig.xml
index 1fbd21b..3b55e0b 100644
--- a/backends/org.gnome.Mutter.DisplayConfig.xml
+++ b/backends/org.gnome.Mutter.DisplayConfig.xml
@@ -316,8 +316,6 @@
 
         Possible @properties are:
 
-        * "supports-mirroring" (b): FALSE if mirroring not supported; TRUE or not
-                                    present if mirroring is supported.
         * "layout-mode" (u): Represents in what way logical monitors are laid
                              out on the screen. The layout mode can be either
                              of the ones listed below. Absence of this property


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]