From a9a10aaa2070d726c255b035f4664079373f733a Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Mon, 21 Oct 2013 13:07:36 +0200 Subject: [PATCH] MonitorConfig: Use new UPower API The "changed" signal was removed. Use "notify" instead to track just the lid-is-closed state. --- configure.ac | 2 +- src/core/monitor-config.c | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index d90d3569d..75b382969 100644 --- a/configure.ac +++ b/configure.ac @@ -76,7 +76,7 @@ MUTTER_PC_MODULES=" xcomposite >= 0.2 xfixes xrender xdamage xi >= 1.6.0 $CLUTTER_PACKAGE >= 1.15.90 cogl-1.0 >= 1.15.6 - upower-glib > 0.9.11 + upower-glib >= 0.99.0 gnome-desktop-3.0 " diff --git a/src/core/monitor-config.c b/src/core/monitor-config.c index 82ea0b1a3..62c4042ef 100644 --- a/src/core/monitor-config.c +++ b/src/core/monitor-config.c @@ -99,8 +99,9 @@ static gboolean meta_monitor_config_assign_crtcs (MetaConfiguration *config, GPtrArray *crtcs, GPtrArray *outputs); -static void power_client_changed_cb (UpClient *client, - gpointer user_data); +static void power_client_changed_cb (UpClient *client, + GParamSpec *pspec, + gpointer user_data); static void free_output_key (MetaOutputKey *key) @@ -232,7 +233,7 @@ meta_monitor_config_init (MetaMonitorConfig *self) self->up_client = up_client_new (); self->lid_is_closed = up_client_get_lid_is_closed (self->up_client); - g_signal_connect_object (self->up_client, "changed", + g_signal_connect_object (self->up_client, "notify::lid-is-closed", G_CALLBACK (power_client_changed_cb), self, 0); } @@ -1344,8 +1345,9 @@ turn_off_laptop_display (MetaMonitorConfig *self, } static void -power_client_changed_cb (UpClient *client, - gpointer user_data) +power_client_changed_cb (UpClient *client, + GParamSpec *pspec, + gpointer user_data) { MetaMonitorManager *manager = meta_monitor_manager_get (); MetaMonitorConfig *self = user_data;