discomfitor pushed a commit to branch master.

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

commit aae280bfcdf2d434c8916ad80f478e8f2b128a50
Author: Derek Foreman <der...@osg.samsung.com>
Date:   Tue Jul 21 12:23:08 2015 -0400

    shot: Skip the wayland setup bits when running under X
    
    fix T2592
    
    Reviewers: zmike
    
    Subscribers: cedric
    
    Differential Revision: https://phab.enlightenment.org/D2851
---
 src/modules/shot/e_mod_main.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/modules/shot/e_mod_main.c b/src/modules/shot/e_mod_main.c
index 1cba5c7..7b2c798 100644
--- a/src/modules/shot/e_mod_main.c
+++ b/src/modules/shot/e_mod_main.c
@@ -1285,6 +1285,8 @@ e_modapi_init(E_Module *m)
      ("main/2",  _("Take Screenshot"), _e_mod_menu_add, NULL, NULL, NULL);
    border_hook = e_int_client_menu_hook_add(_bd_hook, NULL);
 
+   if (e_comp->comp_type == E_PIXMAP_TYPE_X) return m;
+
 #ifdef HAVE_WAYLAND
    Eina_Inlist *globals;
    Ecore_Wl_Global *global;

-- 


Reply via email to