X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=dali%2Finternal%2Finput%2Ftizen-wayland%2Fautofill-manager-impl-ecore-wl.cpp;h=79e0613679d298bc50806a6be362cf9af36c994a;hb=8d9a1dab15669410f14a7626300452e61b885c25;hp=a00e3e2d928edb3415b57934668b03afa00d93e7;hpb=fc1479271986116df6a3c4ce143f3d0fe485adb0;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

diff --git a/dali/internal/input/tizen-wayland/autofill-manager-impl-ecore-wl.cpp b/dali/internal/input/tizen-wayland/autofill-manager-impl-ecore-wl.cpp
index a00e3e2..79e0613 100755
--- a/dali/internal/input/tizen-wayland/autofill-manager-impl-ecore-wl.cpp
+++ b/dali/internal/input/tizen-wayland/autofill-manager-impl-ecore-wl.cpp
@@ -20,11 +20,11 @@
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/object/type-registry.h>
+#include <dali/devel-api/common/singleton-service.h>
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
 #include <dali/internal/adaptor/common/adaptor-impl.h>
-#include <dali/internal/system/common/singleton-service-impl.h>
 
 
 namespace Dali
@@ -336,26 +336,27 @@ void AutofillManagerEcoreWl::ReceiveAuthInfo( autofill_auth_info_h authInfoHandl
                                                 serviceName, serviceLogoImagePath, serviceMessage );
 
     // Sets the authentication service information in order to use in other components.
-    if( serviceName )
-    {
-      mAuthenticationServiceName = serviceName;
-      free( serviceName );
-    }
+    mAuthenticationServiceName = serviceName;
+    mAuthenticationServiceMessage = serviceMessage;
+    mAuthenticationServiceImagePath = serviceLogoImagePath;
+
+    // Emits the signal to receive the authentication information.
+    mAuthReceivedSignal.Emit();
 
     if( serviceMessage )
     {
-      mAuthenticationServiceMessage = serviceMessage;
       free( serviceMessage );
     }
 
+    if( serviceName )
+    {
+      free( serviceName );
+    }
+
     if( serviceLogoImagePath )
     {
-      mAuthenticationServiceImagePath = serviceLogoImagePath;
       free( serviceLogoImagePath );
     }
-
-    // Emits the signal to receive the authentication information.
-    mAuthReceivedSignal.Emit();
   }
   else
   {
@@ -380,31 +381,32 @@ void AutofillManagerEcoreWl::FillGroupItem( autofill_fill_response_item_h itemHa
                                               id, value, presentationText );
 
   // Sets the fill response information in order to use in other components.
+  mFillItemId = id;
+  mFillItemPresentationText = presentationText;
+  mFillItemValue = value;
+
+  Dali::AutofillItem item = mAutofillGroup.GetAutofillItem( id );
+  Internal::Adaptor::AutofillItem& itemImpl = Internal::Adaptor::GetImplementation( item );
+  itemImpl.AddPresentationList( presentationText );
+  itemImpl.AddFillValueList( value );
+
+  // Emits the signal to fill the data in text input field.
+  mFillReceivedSignal.Emit( item );
+
   if( id )
   {
-    mFillItemId = id;
     free( id );
   }
 
-  if( presentationText )
-  {
-    mFillItemPresentationText = presentationText;
-    free( presentationText );
-  }
-
   if( value )
   {
-    mFillItemValue = value;
     free( value );
   }
 
-  Dali::AutofillItem item = mAutofillGroup.GetAutofillItem( mFillItemId );
-  Internal::Adaptor::AutofillItem& itemImpl = Internal::Adaptor::GetImplementation( item );
-  itemImpl.AddPresentationList( mFillItemPresentationText );
-  itemImpl.AddFillValueList( mFillItemValue );
-
-  // Emits the signal to fill the data in text input field.
-  mFillReceivedSignal.Emit( item );
+  if( presentationText )
+  {
+    free( presentationText );
+  }
 
 }
 
@@ -424,29 +426,29 @@ void AutofillManagerEcoreWl::FillMultipleGroupItem( autofill_fill_response_item_
                                               id, value, presentationText );
 
   // Sets the fill response information in order to use in other components.
+  mFillItemId = id;
+  mFillItemPresentationText = presentationText;
+  mFillItemValue = value;
+
+  Dali::AutofillItem item = mAutofillGroup.GetAutofillItem( id );
+  Internal::Adaptor::AutofillItem& itemImpl = Internal::Adaptor::GetImplementation( item );
+  itemImpl.AddPresentationList( presentationText );
+  itemImpl.AddFillValueList( value );
+
   if( id )
   {
-    mFillItemId = id;
     free( id );
   }
 
-  if( presentationText )
-  {
-    mFillItemPresentationText = presentationText;
-    free( presentationText );
-  }
-
   if( value )
   {
-    mFillItemValue = value;
     free( value );
   }
 
-  Dali::AutofillItem item = mAutofillGroup.GetAutofillItem( mFillItemId );
-  Internal::Adaptor::AutofillItem& itemImpl = Internal::Adaptor::GetImplementation( item );
-  itemImpl.AddPresentationList( mFillItemPresentationText );
-  itemImpl.AddFillValueList( mFillItemValue );
-
+  if( presentationText )
+  {
+    free( presentationText );
+  }
 }
 #endif // CAPI_AUTOFILL_SUPPORT