Merge "Update deprecated libprivilege-control API functions." into tizen

[platform/framework/native/appfw.git] / src / app / FApp_ActiveWindowManager.cpp

diff --git a/src/app/FApp_ActiveWindowManager.cpp b/src/app/FApp_ActiveWindowManager.cpp
index 1088790..b0cf879 100644 (file)
--- a/src/app/FApp_ActiveWindowManager.cpp
+++ b/src/app/FApp_ActiveWindowManager.cpp
@@ -36,7 +36,6 @@
 
 using namespace Tizen::Base;
 using namespace Tizen::Base::Collection;
-//using namespace Tizen::Base::Utility;
 using namespace Tizen::Base::Runtime;
 
 namespace
@@ -239,7 +238,11 @@ _ActiveWindowManager::AddActiveAppEventListener(IActiveAppEventListener& listene
        bool alreadyExist = __activeAppEventListenerList.Contains(&listener);
        SysTryReturnResult(NID_APP, !alreadyExist, E_OBJ_ALREADY_EXIST, "The event listener already exist.");
        result r = __activeAppEventListenerList.Add(&listener);
-       SysTryReturn(NID_APP, !IsFailed(r), r, r, "[%s] Propagating.", GetErrorMessage(r));
+       if (IsFailed(r))
+       {
+               SysPropagate(NID_APP, r);
+               return r;
+       }
 
        if (!pWindowPropertyChanged)
        {
@@ -275,7 +278,11 @@ _ActiveWindowManager::RemoveActiveAppEventListener(IActiveAppEventListener& list
        }
 
        result r = __activeAppEventListenerList.Remove(&listener);
-       SysTryReturn(NID_APP, !IsFailed(r), r, r, "[%s] Propagating.", GetErrorMessage(r));
+       if (IsFailed(r))
+       {
+               SysPropagate(NID_APP, r);
+               return r;
+       }
 
        if (__activeAppEventListenerList.GetCount() == 0)
        {