[mutter] MonitorConfig: Use new UPower API
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] MonitorConfig: Use new UPower API
- Date: Mon, 21 Oct 2013 12:05:13 +0000 (UTC)
commit a9a10aaa2070d726c255b035f4664079373f733a
Author: Bastien Nocera <hadess hadess net>
Date: Mon Oct 21 13:07:36 2013 +0200
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 d90d356..75b3829 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 82ea0b1..62c4042 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;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]