X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Fpublic-api%2Fcommon%2Fstage.cpp;h=13825ff12e931239b16f8cd4ffff99cd52f6ac5b;hb=a62dc57b01b08ebcfd0aed24afc8f156fbe7c619;hp=99d3c6635299c22054d5c576ad0fef3239e20526;hpb=4eae08ff442d3768ba2c688f5c543ebe701c2fea;p=platform%2Fcore%2Fuifw%2Fdali-core.git

diff --git a/dali/public-api/common/stage.cpp b/dali/public-api/common/stage.cpp
index 99d3c66..13825ff 100644
--- a/dali/public-api/common/stage.cpp
+++ b/dali/public-api/common/stage.cpp
@@ -122,8 +122,10 @@ Vector2 Stage::GetDpi() const
 
 ObjectRegistry Stage::GetObjectRegistry() const
 {
-  Internal::ObjectRegistry& internal = Internal::Stage::GetCurrent()->GetObjectRegistry();
+  Internal::Stage* stage = Internal::Stage::GetCurrent();
+  DALI_ASSERT_ALWAYS( stage && "GetObjectRegistry() : Stage is null" );
 
+  Internal::ObjectRegistry& internal = stage->GetObjectRegistry();
   return ObjectRegistry(&internal);
 }
 
@@ -144,9 +146,16 @@ Stage::EventProcessingFinishedSignalType& Stage::EventProcessingFinishedSignal()
 
 Stage::TouchedSignalType& Stage::TouchedSignal()
 {
+  DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: TouchedSignal() is deprecated and will be removed from next release. Use TouchSignal() instead.\n" );
+
   return GetImplementation(*this).TouchedSignal();
 }
 
+Stage::TouchSignalType& Stage::TouchSignal()
+{
+  return GetImplementation( *this ).TouchSignal();
+}
+
 Stage::WheelEventSignalType& Stage::WheelEventSignal()
 {
   return GetImplementation(*this).WheelEventSignal();