From 7dc8303f2eb5380aaf143b824e7a1130c0be9ff2 Mon Sep 17 00:00:00 2001
From: "minho.sun" <minho.sun@samsung.com>
Date: Tue, 1 Aug 2017 10:17:28 +0900
Subject: [PATCH] Revert "[Tizen]Update ImfManager and fix
 Resized&LanguageChanged event"

This reverts commit eca280a473665e46cd93e729a237a284de1dfb4c.

Change-Id: I1d5e14672f920891cfa0a5f7964da1d181df14ce
---
 src/Tizen.NUI/src/public/ImfManager.cs | 51 ++++++++++++----------------------
 1 file changed, 17 insertions(+), 34 deletions(-)

diff --git a/src/Tizen.NUI/src/public/ImfManager.cs b/src/Tizen.NUI/src/public/ImfManager.cs
index 16f5728..1706bab 100755
--- a/src/Tizen.NUI/src/public/ImfManager.cs
+++ b/src/Tizen.NUI/src/public/ImfManager.cs
@@ -860,6 +860,13 @@ namespace Tizen.NUI
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
 
+        internal static ImfManager GetImfManagerFromPtr(IntPtr cPtr)
+        {
+            ImfManager ret = new ImfManager(cPtr, false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
         /// <summary>
         /// ImfManager activated event arguments.
         /// </summary>
@@ -909,10 +916,7 @@ namespace Tizen.NUI
         {
             ImfManagerActivatedEventArgs e = new ImfManagerActivatedEventArgs();
 
-            if (data != null)
-            {
-                e.ImfManager = Registry.GetManagedBaseHandleFromNativePtr(data) as ImfManager;
-            }
+            e.ImfManager = ImfManager.GetImfManagerFromPtr(data);
 
             if (_imfManagerActivatedEventHandler != null)
             {
@@ -967,10 +971,7 @@ namespace Tizen.NUI
         {
             ActivatedEventArgs e = new ActivatedEventArgs();
 
-            if (data != null)
-            {
-                e.ImfManager = Registry.GetManagedBaseHandleFromNativePtr(data) as ImfManager;
-            }
+            e.ImfManager = ImfManager.GetImfManagerFromPtr(data);
 
             if (_activatedEventHandler != null)
             {
@@ -1037,10 +1038,7 @@ namespace Tizen.NUI
         {
             ImfManagerEventReceivedEventArgs e = new ImfManagerEventReceivedEventArgs();
 
-            if (data != null)
-            {
-                e.ImfManager = Registry.GetManagedBaseHandleFromNativePtr(data) as ImfManager;
-            }
+            e.ImfManager = ImfManager.GetImfManagerFromPtr(data);
 
             if (_imfManagerEventReceivedEventHandler != null)
             {
@@ -1102,14 +1100,8 @@ namespace Tizen.NUI
 
             EventReceivedEventArgs e = new EventReceivedEventArgs();
 
-            if (imfManager != null)
-            {
-                e.ImfManager = Registry.GetManagedBaseHandleFromNativePtr(imfManager) as ImfManager;
-            }
-            if (imfEventData != null)
-            {
-                e.ImfEventData = ImfEventData.GetImfEventDataFromPtr(imfEventData);
-            }
+            e.ImfManager = ImfManager.GetImfManagerFromPtr(imfManager);
+            e.ImfEventData = ImfEventData.GetImfEventDataFromPtr(imfEventData);
 
             if (_eventReceivedEventHandler != null)
             {
@@ -1184,10 +1176,7 @@ namespace Tizen.NUI
         {
             ImfManagerStatusChangedEventArgs e = new ImfManagerStatusChangedEventArgs();
 
-            if (data != null)
-            {
-                e.ImfManager = Registry.GetManagedBaseHandleFromNativePtr(data) as ImfManager;
-            }
+            e.ImfManager = ImfManager.GetImfManagerFromPtr(data);
 
             if (_imfManagerStatusChangedEventHandler != null)
             {
@@ -1308,10 +1297,7 @@ namespace Tizen.NUI
         {
             ImfManagerResizedEventArgs e = new ImfManagerResizedEventArgs();
 
-            if (data != null)
-            {
-                e.ImfManager = Registry.GetManagedBaseHandleFromNativePtr(data) as ImfManager;
-            }
+            e.ImfManager = ImfManager.GetImfManagerFromPtr(data);
 
             if (_imfManagerResizedEventHandler != null)
             {
@@ -1363,7 +1349,7 @@ namespace Tizen.NUI
         [Obsolete("Please do not use! this will be internal")]
         public ImfVoidSignalType ResizedSignal()
         {
-            ImfVoidSignalType ret = new ImfVoidSignalType(NDalicManualPINVOKE.ImfManager_ResizedSignal(swigCPtr), false);
+            ImfVoidSignalType ret = new ImfVoidSignalType(NDalicManualPINVOKE.ImfManager_ResizedSignal(swigCPtr), true);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             return ret;
         }
@@ -1416,10 +1402,7 @@ namespace Tizen.NUI
         {
             ImfManagerLanguageChangedEventArgs e = new ImfManagerLanguageChangedEventArgs();
 
-            if (data != null)
-            {
-                e.ImfManager = Registry.GetManagedBaseHandleFromNativePtr(data) as ImfManager;
-            }
+            e.ImfManager = ImfManager.GetImfManagerFromPtr(data);
 
             if (_imfManagerLanguageChangedEventHandler != null)
             {
@@ -1471,7 +1454,7 @@ namespace Tizen.NUI
         [Obsolete("Please do not use! this will be internal")]
         public ImfVoidSignalType LanguageChangedSignal()
         {
-            ImfVoidSignalType ret = new ImfVoidSignalType(NDalicManualPINVOKE.ImfManager_LanguageChangedSignal(swigCPtr), false);
+            ImfVoidSignalType ret = new ImfVoidSignalType(NDalicManualPINVOKE.ImfManager_LanguageChangedSignal(swigCPtr), true);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             return ret;
         }
-- 
2.7.4