merge with master
authorJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:16:51 +0000 (01:16 +0900)
committerJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:16:51 +0000 (01:16 +0900)
commitd52aea1bfae18d132d6848bc2254fe8d24252170
tree562bf44d028bb42beea5080d3c040065b9956623
parentf2436633862e9487fb85b259db51d13010df6e88
merge with master
34 files changed:
CMakeLists.txt
inc/FUiIme.h
inc/FUiImeIInputMethodListener.h [moved from src/FUiImeIInputMethodListener.h with 93% similarity]
inc/FUiImeIInputMethodProvider.h [moved from src/FUiImeIInputMethodProvider.h with 88% similarity]
inc/FUiImeInputMethod.h [moved from src/FUiImeInputMethod.h with 91% similarity]
inc/FUiImeInputMethodInfo.h [changed mode: 0755->0644]
inc/FUiImeInputMethodManager.h [changed mode: 0755->0644]
packaging/osp-ime.spec
src/FUiImeInputMethod.cpp
src/FUiImeInputMethodInfo.cpp
src/FUiImeInputMethodManager.cpp
src/FUiIme_EcoreEventHandler.cpp [new file with mode: 0644]
src/FUiIme_EcoreEventHandler.h [new file with mode: 0644]
src/FUiIme_EcoreFdHandler.cpp
src/FUiIme_EcoreFdHandler.h
src/FUiIme_ImeInfo.cpp
src/FUiIme_ImeInfo.h
src/FUiIme_InputMethodImpl.cpp
src/FUiIme_InputMethodImpl.h
src/FUiIme_InputMethodInfoImpl.cpp
src/FUiIme_InputMethodInfoImpl.h
src/FUiIme_InputMethodManagerImpl.cpp
src/FUiIme_InputMethodManagerImpl.h
src/FUiIme_InputServiceBinder.cpp
src/FUiIme_InputServiceBinder.h
src/FUiIme_InputServiceSignalListener.cpp
src/FUiIme_InputServiceSignalListener.h
src/FUiIme_Key.cpp [new file with mode: 0644]
src/FUiIme_Key.h
src/FUiIme_ScimDataConverter.cpp
src/FUiIme_ScimDataConverter.h
src/FUiIme_TargetWindowAgent.cpp [new file with mode: 0644]
src/FUiIme_TargetWindowAgent.h [new file with mode: 0644]
src/app/FApp_ImeEntry.cpp