X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=AFBClient.cpp;h=cee49ad205501940b39adf4846fbc220b7969eb2;hb=0ffdfa88ee21c533e2b3f3627c088ca12fc661d2;hp=5fadc35085ca78423f3398aa9d60de1e428577e1;hpb=839032bb4aa57418289d829dd57f66b094ceb700;p=staging%2Fwindowmanager.git

diff --git a/AFBClient.cpp b/AFBClient.cpp
index 5fadc35..cee49ad 100644
--- a/AFBClient.cpp
+++ b/AFBClient.cpp
@@ -44,8 +44,7 @@ class AFBClient::Impl {
     int deactivateSurface(const char *label);
     int endDraw(const char *label);
 
-    void set_event_handler(enum EventType et,
-                           std::function<void(char const *label)> f);
+    void set_event_handler(enum EventType et, handler_fun f);
 
     Impl();
     ~Impl();
@@ -358,8 +357,6 @@ int AFBClient::Impl::endDraw(const char *label) {
 
 void AFBClient::Impl::set_event_handler(
     enum EventType et, std::function<void(char const *)> func) {
-    UNUSED(et);
-    UNUSED(func);
     TRACE();
 
     if (et >= 1 && et <= 6) {  // Yeah ... just go with it!
@@ -406,7 +403,9 @@ void AFBClient::Impl::event(char const *et, char const *label) {
 
     auto i = this->handlers.find(oet.second);
     if (i != this->handlers.end()) {
-        i->second(label);
+        if (this->labels.find(label) != this->labels.end()) {
+            i->second(label);
+        }
     }
 }