[4.0] Fix callback manager issue

[platform/core/uifw/dali-adaptor.git] / adaptors / common / event-loop / ecore / ecore-callback-manager.cpp

diff --git a/adaptors/common/event-loop/ecore/ecore-callback-manager.cpp b/adaptors/common/event-loop/ecore/ecore-callback-manager.cpp
old mode 100644 (file)
new mode 100755 (executable)
index b6e5f3c..96ea7d4
--- a/adaptors/common/event-loop/ecore/ecore-callback-manager.cpp
+++ b/adaptors/common/event-loop/ecore/ecore-callback-manager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,9 @@
 #include "ecore-callback-manager.h"
 
 // EXTERNAL INCLUDES
+// Ecore is littered with C style cast
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wold-style-cast"
 #include <Ecore.h>
 
 #include <dali/integration-api/debug.h>
@@ -120,7 +123,7 @@ bool EcoreCallbackManager::AddIdleCallback( CallbackBase* callback )
     return false;
   }
 
-  CallbackData *callbackData = new CallbackData( callback );
+  CallbackData* callbackData = new CallbackData( callback );
 
   callbackData->mRemoveFromContainerFunction =  MakeCallback( this, &EcoreCallbackManager::RemoveCallbackFromContainer );
 
@@ -135,6 +138,29 @@ bool EcoreCallbackManager::AddIdleCallback( CallbackBase* callback )
   return true;
 }
 
+void EcoreCallbackManager::RemoveIdleCallback( CallbackBase* callback )
+{
+  CallbackList::iterator it = mCallbackContainer.begin();
+
+  while( mCallbackContainer.end() != it )
+  {
+    CallbackData* data = *it;
+
+    if( data->mCallback == callback )
+    {
+      it = mCallbackContainer.erase( it );
+      ecore_idler_del( data->mIdler );
+
+      // delete our data
+      delete data;
+    }
+    else
+    {
+      it++;
+    }
+  }
+}
+
 void EcoreCallbackManager::RemoveCallbackFromContainer(CallbackData *callbackData)
 {
   mCallbackContainer.remove(callbackData);
@@ -166,3 +192,5 @@ CallbackManager* CallbackManager::New()
 } // namespace Internal
 
 } // namespace Dali
+
+#pragma GCC diagnostic pop