X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=adaptors%2Fcommon%2Fclipboard-event-notifier-impl.cpp;h=ffd6a1400fdaf2c3a6f84d844c35fe0d7e453c41;hb=f9f2fa4353e48c8320d7d36c6a2b8789bbbaa505;hp=981ac46ba06933c6721ab2c04e26a8a92a787d31;hpb=3393e7c31ca79563614a59d44d6e2e79f637fba0;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

diff --git a/adaptors/common/clipboard-event-notifier-impl.cpp b/adaptors/common/clipboard-event-notifier-impl.cpp
index 981ac46..ffd6a14 100644
--- a/adaptors/common/clipboard-event-notifier-impl.cpp
+++ b/adaptors/common/clipboard-event-notifier-impl.cpp
@@ -33,29 +33,6 @@ namespace Internal
 namespace Adaptor
 {
 
-namespace
-{
-BaseHandle Create()
-{
-  BaseHandle handle( ClipboardEventNotifier::Get() );
-
-  if ( !handle )
-  {
-    Dali::SingletonService service( SingletonService::Get() );
-    if ( service )
-    {
-      Dali::ClipboardEventNotifier notifier( ClipboardEventNotifier::New() );
-      service.Register( typeid( notifier ), notifier );
-      handle = notifier;
-    }
-  }
-
-  return handle;
-}
-TypeRegistration CLIPBOARD_EVENT_NOTIFIER_TYPE( typeid(Dali::ClipboardEventNotifier), typeid(Dali::BaseHandle), Create, true /* Create Instance At Startup */ );
-
-} // unnamed namespace
-
 Dali::ClipboardEventNotifier ClipboardEventNotifier::New()
 {
   Dali::ClipboardEventNotifier notifier = Dali::ClipboardEventNotifier(new ClipboardEventNotifier());
@@ -77,6 +54,11 @@ Dali::ClipboardEventNotifier ClipboardEventNotifier::Get()
       // If so, downcast the handle
       notifier = Dali::ClipboardEventNotifier( dynamic_cast< ClipboardEventNotifier* >( handle.GetObjectPtr() ) );
     }
+    else
+    {
+      notifier = Dali::ClipboardEventNotifier( ClipboardEventNotifier::New() );
+      service.Register( typeid( notifier ), notifier );
+    }
   }
 
   return notifier;