[mutter] legacy-monitor-config: Let the manager listen on lid closed changes
- From: Jonas Ådahl <jadahl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] legacy-monitor-config: Let the manager listen on lid closed changes
- Date: Fri, 7 Apr 2017 14:35:05 +0000 (UTC)
commit 57acbc53fb1d6afe7b87779f8a90685542804ade
Author: Jonas Ådahl <jadahl gmail com>
Date: Sat Mar 4 15:18:29 2017 +0800
legacy-monitor-config: Let the manager listen on lid closed changes
This is in preparation for making config-manager work alongside the
legacy configuration system.
https://bugzilla.gnome.org/show_bug.cgi?id=777732
src/backends/meta-monitor-config.c | 12 +++---------
src/backends/meta-monitor-config.h | 3 +++
src/backends/meta-monitor-manager.c | 13 ++-----------
3 files changed, 8 insertions(+), 20 deletions(-)
---
diff --git a/src/backends/meta-monitor-config.c b/src/backends/meta-monitor-config.c
index 063a3da..0928342 100644
--- a/src/backends/meta-monitor-config.c
+++ b/src/backends/meta-monitor-config.c
@@ -96,9 +96,6 @@ static gboolean meta_monitor_config_assign_crtcs (MetaConfiguration *config,
GPtrArray *crtcs,
GPtrArray *outputs);
-static void power_client_changed_cb (MetaMonitorManager *manager,
- gpointer user_data);
-
static void
free_output_key (MetaOutputKey *key)
{
@@ -794,8 +791,6 @@ meta_monitor_config_new (MetaMonitorManager *manager)
self = g_object_new (META_TYPE_MONITOR_CONFIG, NULL);
self->lid_is_closed = meta_monitor_manager_is_lid_closed (manager);
- g_signal_connect_object (manager, "lid-is-closed-changed",
- G_CALLBACK (power_client_changed_cb), self, 0);
meta_monitor_config_load (self);
@@ -1584,11 +1579,10 @@ turn_off_laptop_display (MetaMonitorConfig *self,
self->current_is_for_laptop_lid = TRUE;
}
-static void
-power_client_changed_cb (MetaMonitorManager *manager,
- gpointer user_data)
+void
+meta_monitor_config_lid_is_closed_changed (MetaMonitorConfig *self,
+ MetaMonitorManager *manager)
{
- MetaMonitorConfig *self = user_data;
gboolean is_closed;
is_closed = meta_monitor_manager_is_lid_closed (manager);
diff --git a/src/backends/meta-monitor-config.h b/src/backends/meta-monitor-config.h
index cb88650..fff6f86 100644
--- a/src/backends/meta-monitor-config.h
+++ b/src/backends/meta-monitor-config.h
@@ -46,4 +46,7 @@ void meta_monitor_config_restore_previous (MetaMonitorConfig *con
gboolean meta_monitor_config_get_is_builtin_display_on (MetaMonitorConfig *config);
+void meta_monitor_config_lid_is_closed_changed (MetaMonitorConfig *self,
+ MetaMonitorManager *manager);
+
#endif /* META_MONITOR_CONFIG_H */
diff --git a/src/backends/meta-monitor-manager.c b/src/backends/meta-monitor-manager.c
index 4cd65c3..832dbea 100644
--- a/src/backends/meta-monitor-manager.c
+++ b/src/backends/meta-monitor-manager.c
@@ -45,7 +45,6 @@
enum {
CONFIRM_DISPLAY_CHANGE,
- LID_IS_CLOSED_CHANGED,
SIGNALS_LAST
};
@@ -243,8 +242,8 @@ meta_monitor_manager_lid_is_closed_changed (MetaMonitorManager *manager)
{
if (manager->config_manager)
meta_monitor_manager_ensure_configured (manager);
-
- g_signal_emit (manager, signals[LID_IS_CLOSED_CHANGED], 0);
+ else
+ meta_monitor_config_lid_is_closed_changed (manager->legacy_config, manager);
}
static void
@@ -668,14 +667,6 @@ meta_monitor_manager_class_init (MetaMonitorManagerClass *klass)
0,
NULL, NULL, NULL,
G_TYPE_NONE, 0);
-
- signals[LID_IS_CLOSED_CHANGED] =
- g_signal_new ("lid-is-closed-changed",
- G_TYPE_FROM_CLASS (object_class),
- G_SIGNAL_RUN_LAST,
- 0,
- NULL, NULL, NULL,
- G_TYPE_NONE, 0);
}
static const double known_diagonals[] = {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]