discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=d2fce4ce27362809d038d44196613c2bc6e62fb6

commit d2fce4ce27362809d038d44196613c2bc6e62fb6
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Tue Jul 21 14:25:41 2015 -0400

    do not add x11 compositor desklock hooks in non-x11 compositor
---
 src/bin/e_comp_x.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c
index 6041b0b..556cc07 100644
--- a/src/bin/e_comp_x.c
+++ b/src/bin/e_comp_x.c
@@ -5354,8 +5354,11 @@ e_comp_x_init(void)
    e_client_hook_add(E_CLIENT_HOOK_FOCUS_UNSET, 
_e_comp_x_hook_client_focus_unset, NULL);
    e_client_hook_add(E_CLIENT_HOOK_EVAL_END, _e_comp_x_hook_client_eval_end, 
NULL);
 
-   e_desklock_show_hook_add(_e_comp_x_desklock_show);
-   e_desklock_hide_hook_add(_e_comp_x_desklock_hide);
+   if (e_comp->comp_type != E_PIXMAP_TYPE_WL)
+     {
+        e_desklock_show_hook_add(_e_comp_x_desklock_show);
+        e_desklock_hide_hook_add(_e_comp_x_desklock_hide);
+     }
 
    if (!e_atoms_init()) return 0;
    if (!_e_comp_x_screens_setup()) return EINA_FALSE;

-- 


Reply via email to