summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasper St. Pierre <jstpierre@mecheye.net>2014-03-11 17:38:03 -0400
committerJasper St. Pierre <jstpierre@mecheye.net>2014-03-11 18:01:29 -0400
commit283dec74c1323e4a9b6309ca15ac986bf1111111 (patch)
tree14b4d44c22b381c8cd2b51cb2d38f428198d7ba5
parent4fec9e4ebaa5644391e1cc411bb4139d02b0dac3 (diff)
downloadmutter-283dec74c1323e4a9b6309ca15ac986bf1111111.tar.gz
hack to get things working for demowip/login1
have to figure out something better to put here
-rw-r--r--src/wayland/meta-login1.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/wayland/meta-login1.c b/src/wayland/meta-login1.c
index 024fd0050..067cc022f 100644
--- a/src/wayland/meta-login1.c
+++ b/src/wayland/meta-login1.c
@@ -171,7 +171,7 @@ session_unpause (void)
cogl_kms_display_queue_modes_reset (cogl_display);
clutter_set_paused (FALSE);
- clutter_evdev_reclaim_devices ();
+ /* clutter_evdev_reclaim_devices (); */
{
MetaWaylandCompositor *compositor = meta_wayland_compositor_get_default ();
@@ -189,7 +189,7 @@ static void
session_pause (void)
{
clutter_set_paused (TRUE);
- clutter_evdev_release_devices ();
+ /* clutter_evdev_release_devices (); */
}
static void
@@ -399,6 +399,7 @@ meta_login1_new (void)
self->session_proxy = session_proxy;
self->seat_proxy = get_seat_proxy (NULL);
+ /* Clutter/Cogl start out in a state that assumes the session is active */
self->session_active = TRUE;
clutter_egl_native_set_kms_fd (kms_fd);
@@ -407,6 +408,7 @@ meta_login1_new (void)
self);
g_signal_connect (self->session_proxy, "notify::active", G_CALLBACK (on_active_changed), self);
+ sync_active (self);
return self;
}