sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

MonitorConfig: Use new UPower API

Browse source 
The "changed" signal was removed. Use "notify" instead
to track just the lid-is-closed state.

Conflicts:
	configure.ac
This commit is contained in:
Bastien Nocera 2013-10-21 13:07:36 +02:00
parent 35f47b211d
commit 4d01eb3a23
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -79,7 +79,7 @@ MUTTER_PC_MODULES="
xcomposite >= 0.2 xfixes xrender xdamage xi >= 1.6.0 xcomposite >= 0.2 xfixes xrender xdamage xi >= 1.6.0
$CLUTTER_PACKAGE >= 1.15.94 $CLUTTER_PACKAGE >= 1.15.94
cogl-1.0 >= 1.13.3 cogl-1.0 >= 1.13.3
upower-glib > 0.9.11 upower-glib >= 0.99.0
gnome-desktop-3.0 gnome-desktop-3.0
" "

12
src/core/monitor-config.c
View file

@ -99,8 +99,9 @@ static gboolean meta_monitor_config_assign_crtcs (MetaConfiguration *config,
GPtrArray *crtcs, GPtrArray *crtcs,
GPtrArray *outputs); GPtrArray *outputs);
static void power_client_changed_cb (UpClient *client, static void power_client_changed_cb (UpClient *client,
gpointer user_data); GParamSpec *pspec,
gpointer user_data);
static void static void
free_output_key (MetaOutputKey *key) free_output_key (MetaOutputKey *key)
@ -232,7 +233,7 @@ meta_monitor_config_init (MetaMonitorConfig *self)
self->up_client = up_client_new (); self->up_client = up_client_new ();
self->lid_is_closed = up_client_get_lid_is_closed (self->up_client); 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); G_CALLBACK (power_client_changed_cb), self, 0);
} }
@ -1335,8 +1336,9 @@ turn_off_laptop_display (MetaMonitorConfig *self,
} }
static void static void
power_client_changed_cb (UpClient *client, power_client_changed_cb (UpClient *client,
gpointer user_data) GParamSpec *pspec,
gpointer user_data)
{ {
MetaMonitorManager *manager = meta_monitor_manager_get (); MetaMonitorManager *manager = meta_monitor_manager_get ();
MetaMonitorConfig *self = user_data; MetaMonitorConfig *self = user_data;