Jonas Ådahl
parent
7aab2a1e12
commit
283de929dd
189
0001-display-Only-display-configuration-options-if-apply-.patch
Normal file
189
0001-display-Only-display-configuration-options-if-apply-.patch
Normal file
@ -0,0 +1,189 @@
|
||||
From f6e0cba768d376a7f710dd8a69c17ec50c7a13a9 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
|
||||
Date: Fri, 4 Feb 2022 11:09:24 +0100
|
||||
Subject: [PATCH] display: Only display configuration options if apply is
|
||||
allowed
|
||||
|
||||
org.gnome.Mutter.DisplayConfig contains a new property that tells
|
||||
whether apply will be allowed to be called or not. Whether it is true or
|
||||
not depends on policy stored in any of its monitors.xml configuration
|
||||
files.
|
||||
|
||||
In order to make it clearer that configuration is not possible, except
|
||||
for night light, make sure to hide the unconfigurable parts, leaving
|
||||
only night light.
|
||||
---
|
||||
.../display/cc-display-config-manager-dbus.c | 36 +++++++++++++++++++
|
||||
panels/display/cc-display-config-manager.c | 6 ++++
|
||||
panels/display/cc-display-config-manager.h | 3 ++
|
||||
panels/display/cc-display-panel.c | 11 ++++++
|
||||
panels/display/cc-display-panel.ui | 2 +-
|
||||
5 files changed, 57 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/panels/display/cc-display-config-manager-dbus.c b/panels/display/cc-display-config-manager-dbus.c
|
||||
index 653bea0b5..392140101 100644
|
||||
--- a/panels/display/cc-display-config-manager-dbus.c
|
||||
+++ b/panels/display/cc-display-config-manager-dbus.c
|
||||
@@ -31,6 +31,8 @@ struct _CcDisplayConfigManagerDBus
|
||||
guint monitors_changed_id;
|
||||
|
||||
GVariant *current_state;
|
||||
+
|
||||
+ gboolean apply_allowed;
|
||||
};
|
||||
|
||||
G_DEFINE_TYPE (CcDisplayConfigManagerDBus,
|
||||
@@ -118,6 +120,8 @@ bus_gotten (GObject *object,
|
||||
CcDisplayConfigManagerDBus *self;
|
||||
GDBusConnection *connection;
|
||||
g_autoptr(GError) error = NULL;
|
||||
+ g_autoptr(GDBusProxy) proxy = NULL;
|
||||
+ g_autoptr(GVariant) variant = NULL;
|
||||
|
||||
connection = g_bus_get_finish (result, &error);
|
||||
if (!connection)
|
||||
@@ -143,12 +147,35 @@ bus_gotten (GObject *object,
|
||||
monitors_changed,
|
||||
self,
|
||||
NULL);
|
||||
+
|
||||
+ proxy = g_dbus_proxy_new_sync (self->connection,
|
||||
+ G_DBUS_PROXY_FLAGS_NONE,
|
||||
+ NULL,
|
||||
+ "org.gnome.Mutter.DisplayConfig",
|
||||
+ "/org/gnome/Mutter/DisplayConfig",
|
||||
+ "org.gnome.Mutter.DisplayConfig",
|
||||
+ NULL,
|
||||
+ &error);
|
||||
+ if (!proxy)
|
||||
+ {
|
||||
+ g_warning ("Failed to create D-Bus proxy to \"org.gnome.Mutter.DisplayConfig\": %s",
|
||||
+ error->message);
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ variant = g_dbus_proxy_get_cached_property (proxy, "ApplyMonitorsConfigAllowed");
|
||||
+ if (variant)
|
||||
+ self->apply_allowed = g_variant_get_boolean (variant);
|
||||
+ else
|
||||
+ g_warning ("Missing property 'ApplyMonitorsConfigAllowed' on DisplayConfig API");
|
||||
+
|
||||
get_current_state (self);
|
||||
}
|
||||
|
||||
static void
|
||||
cc_display_config_manager_dbus_init (CcDisplayConfigManagerDBus *self)
|
||||
{
|
||||
+ self->apply_allowed = TRUE;
|
||||
self->cancellable = g_cancellable_new ();
|
||||
g_bus_get (G_BUS_TYPE_SESSION, self->cancellable, bus_gotten, self);
|
||||
}
|
||||
@@ -170,6 +197,14 @@ cc_display_config_manager_dbus_finalize (GObject *object)
|
||||
G_OBJECT_CLASS (cc_display_config_manager_dbus_parent_class)->finalize (object);
|
||||
}
|
||||
|
||||
+static gboolean
|
||||
+cc_display_config_manager_dbus_get_apply_allowed (CcDisplayConfigManager *pself)
|
||||
+{
|
||||
+ CcDisplayConfigManagerDBus *self = CC_DISPLAY_CONFIG_MANAGER_DBUS (pself);
|
||||
+
|
||||
+ return self->apply_allowed;
|
||||
+}
|
||||
+
|
||||
static void
|
||||
cc_display_config_manager_dbus_class_init (CcDisplayConfigManagerDBusClass *klass)
|
||||
{
|
||||
@@ -179,6 +214,7 @@ cc_display_config_manager_dbus_class_init (CcDisplayConfigManagerDBusClass *klas
|
||||
gobject_class->finalize = cc_display_config_manager_dbus_finalize;
|
||||
|
||||
parent_class->get_current = cc_display_config_manager_dbus_get_current;
|
||||
+ parent_class->get_apply_allowed = cc_display_config_manager_dbus_get_apply_allowed;
|
||||
}
|
||||
|
||||
CcDisplayConfigManager *
|
||||
diff --git a/panels/display/cc-display-config-manager.c b/panels/display/cc-display-config-manager.c
|
||||
index 0da298a29..3d683c53d 100644
|
||||
--- a/panels/display/cc-display-config-manager.c
|
||||
+++ b/panels/display/cc-display-config-manager.c
|
||||
@@ -59,3 +59,9 @@ cc_display_config_manager_get_current (CcDisplayConfigManager *self)
|
||||
{
|
||||
return CC_DISPLAY_CONFIG_MANAGER_GET_CLASS (self)->get_current (self);
|
||||
}
|
||||
+
|
||||
+gboolean
|
||||
+cc_display_config_manager_get_apply_allowed (CcDisplayConfigManager *self)
|
||||
+{
|
||||
+ return CC_DISPLAY_CONFIG_MANAGER_GET_CLASS (self)->get_apply_allowed (self);
|
||||
+}
|
||||
diff --git a/panels/display/cc-display-config-manager.h b/panels/display/cc-display-config-manager.h
|
||||
index 1e1b36373..64f0775e9 100644
|
||||
--- a/panels/display/cc-display-config-manager.h
|
||||
+++ b/panels/display/cc-display-config-manager.h
|
||||
@@ -34,10 +34,13 @@ struct _CcDisplayConfigManagerClass
|
||||
GObjectClass parent_class;
|
||||
|
||||
CcDisplayConfig * (*get_current) (CcDisplayConfigManager *self);
|
||||
+ gboolean (* get_apply_allowed) (CcDisplayConfigManager *self);
|
||||
};
|
||||
|
||||
CcDisplayConfig * cc_display_config_manager_get_current (CcDisplayConfigManager *self);
|
||||
|
||||
+gboolean cc_display_config_manager_get_apply_allowed (CcDisplayConfigManager *self);
|
||||
+
|
||||
void _cc_display_config_manager_emit_changed (CcDisplayConfigManager *self);
|
||||
|
||||
G_END_DECLS
|
||||
diff --git a/panels/display/cc-display-panel.c b/panels/display/cc-display-panel.c
|
||||
index 93c983f89..2cfd714d3 100644
|
||||
--- a/panels/display/cc-display-panel.c
|
||||
+++ b/panels/display/cc-display-panel.c
|
||||
@@ -69,6 +69,8 @@ struct _CcDisplayPanel
|
||||
|
||||
gint rebuilding_counter;
|
||||
|
||||
+ GtkWidget *displays_page;
|
||||
+
|
||||
CcDisplayArrangement *arrangement;
|
||||
CcDisplaySettings *settings;
|
||||
|
||||
@@ -691,6 +693,7 @@ cc_display_panel_class_init (CcDisplayPanelClass *klass)
|
||||
gtk_widget_class_bind_template_child (widget_class, CcDisplayPanel, current_output_label);
|
||||
gtk_widget_class_bind_template_child (widget_class, CcDisplayPanel, display_settings_frame);
|
||||
gtk_widget_class_bind_template_child (widget_class, CcDisplayPanel, multi_selection_box);
|
||||
+ gtk_widget_class_bind_template_child (widget_class, CcDisplayPanel, displays_page);
|
||||
gtk_widget_class_bind_template_child (widget_class, CcDisplayPanel, night_light_page);
|
||||
gtk_widget_class_bind_template_child (widget_class, CcDisplayPanel, output_enabled_switch);
|
||||
gtk_widget_class_bind_template_child (widget_class, CcDisplayPanel, output_selection_combo);
|
||||
@@ -779,8 +782,16 @@ rebuild_ui (CcDisplayPanel *panel)
|
||||
GList *outputs, *l;
|
||||
CcDisplayConfigType type;
|
||||
|
||||
+ if (!cc_display_config_manager_get_apply_allowed (panel->manager))
|
||||
+ {
|
||||
+ gtk_widget_set_visible (panel->displays_page, FALSE);
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
panel->rebuilding_counter++;
|
||||
|
||||
+ gtk_widget_set_visible (panel->displays_page, TRUE);
|
||||
+
|
||||
g_list_store_remove_all (panel->primary_display_list);
|
||||
gtk_list_store_clear (panel->output_selection_list);
|
||||
|
||||
diff --git a/panels/display/cc-display-panel.ui b/panels/display/cc-display-panel.ui
|
||||
index 855b34814..80fd63ace 100644
|
||||
--- a/panels/display/cc-display-panel.ui
|
||||
+++ b/panels/display/cc-display-panel.ui
|
||||
@@ -47,7 +47,7 @@
|
||||
|
||||
<!-- Displays page -->
|
||||
<child>
|
||||
- <object class="GtkScrolledWindow">
|
||||
+ <object class="GtkScrolledWindow" id="displays_page">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="hscrollbar_policy">never</property>
|
||||
--
|
||||
2.33.1
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
Name: gnome-control-center
|
||||
Version: 40.0
|
||||
Release: 20%{?dist}
|
||||
Release: 21%{?dist}
|
||||
Summary: Utilities to configure the GNOME desktop
|
||||
|
||||
License: GPLv2+ and CC-BY-SA
|
||||
@ -35,6 +35,9 @@ Patch5: application-use-icon-name-that-exists.patch
|
||||
Patch6: backport-multitasking-panel.patch
|
||||
Patch7: rpminspect-desktop-fixes.patch
|
||||
|
||||
# Backport monitor config policy (#2046159)
|
||||
Patch8: 0001-display-Only-display-configuration-options-if-apply-.patch
|
||||
|
||||
BuildRequires: chrpath
|
||||
BuildRequires: cups-devel
|
||||
BuildRequires: desktop-file-utils
|
||||
@ -223,6 +226,10 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gnome-control-center
|
||||
%dir %{_datadir}/gnome/wm-properties
|
||||
|
||||
%changelog
|
||||
* Fri Feb 04 2022 Jonas Ådahl <tpopela@redhat.com> - 40.0-21
|
||||
- Backport monitor config policy
|
||||
Resolves: #2046159
|
||||
|
||||
* Wed Feb 02 2022 Tomas Popela <tpopela@redhat.com> - 40.0-20
|
||||
- Fix rpminspect desktop files warnings
|
||||
- Resolves: #2041348
|
||||
|
||||
Loading…
Reference in New Issue
Block a user