From e1de9a1980f4c4674a783ea84314f8fadbb9519f Mon Sep 17 00:00:00 2001
From: ksamak <ksamak@riseup.net>
Date: Thu, 7 Sep 2017 16:06:42 +0200
Subject: [PATCH] ezoom: added hard dependancy to showmouse, since xml
 before/after aren't enough

---
 plugins/ezoom/CMakeLists.txt | 2 +-
 plugins/ezoom/ezoom.xml.in   | 1 +
 plugins/ezoom/src/ezoom.cpp  | 3 ++-
 plugins/ezoom/src/ezoom.h    | 1 +
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/plugins/ezoom/CMakeLists.txt b/plugins/ezoom/CMakeLists.txt
index 0d09cc8be..8b35605f8 100644
--- a/plugins/ezoom/CMakeLists.txt
+++ b/plugins/ezoom/CMakeLists.txt
@@ -2,4 +2,4 @@ find_package (Compiz REQUIRED)
 
 include (CompizPlugin)
 
-compiz_plugin (ezoom PLUGINDEPS composite opengl mousepoll focuspoll)
+compiz_plugin (ezoom PLUGINDEPS composite opengl mousepoll focuspoll showmouse)
diff --git a/plugins/ezoom/ezoom.xml.in b/plugins/ezoom/ezoom.xml.in
index d4e6ee32e..e562cccfd 100755
--- a/plugins/ezoom/ezoom.xml.in
+++ b/plugins/ezoom/ezoom.xml.in
@@ -18,6 +18,7 @@
 		<plugin>opengl</plugin>
 		<plugin>mousepoll</plugin>
 		<plugin>focuspoll</plugin>
+		<plugin>showmouse</plugin>
 	    </requirement>
 	</deps>
 	<_short>Enhanced Zoom Desktop</_short>
diff --git a/plugins/ezoom/src/ezoom.cpp b/plugins/ezoom/src/ezoom.cpp
index 56941bb1e..ea007f0cc 100755
--- a/plugins/ezoom/src/ezoom.cpp
+++ b/plugins/ezoom/src/ezoom.cpp
@@ -2112,7 +2112,8 @@ ZoomPluginVTable::init ()
 	CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI)	&&
 	CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI)	&&
 	CompPlugin::checkPluginABI ("mousepoll", COMPIZ_MOUSEPOLL_ABI) &&
-	CompPlugin::checkPluginABI ("focuspoll", COMPIZ_MOUSEPOLL_ABI))
+	CompPlugin::checkPluginABI ("focuspoll", COMPIZ_FOCUSPOLL_ABI) &&
+	CompPlugin::checkPluginABI ("showmouse", COMPIZ_SHOWMOUSE_ABI))
 	return true;
 
     return false;
diff --git a/plugins/ezoom/src/ezoom.h b/plugins/ezoom/src/ezoom.h
index ddcf080f9..e586bf95b 100755
--- a/plugins/ezoom/src/ezoom.h
+++ b/plugins/ezoom/src/ezoom.h
@@ -44,6 +44,7 @@
 #include <opengl/opengl.h>
 #include <mousepoll/mousepoll.h>
 #include <focuspoll/focuspoll.h>
+#include <showmouse/showmouse.h>
 
 #include "ezoom_options.h"
 
-- 
GitLab