Merge tizen_2.3 branch 07/22307/1
authorLi Zhang <li2012.zhang@samsung.com>
Sat, 31 May 2014 09:44:34 +0000 (17:44 +0800)
committerLi Zhang <li2012.zhang@samsung.com>
Sat, 31 May 2014 09:47:46 +0000 (17:47 +0800)
commitfc17f2238651bff9e3c334557d95112ed58728de
treea22cefbf76a7853cd3acf4f7ba0f3f39c3438217
parent8d42aef2cab627ea4fece062574809a070a9956d
Merge tizen_2.3 branch

Change-Id: I0e30048d9eb3497ec3038cdeb1472715b0bb5200
Signed-off-by: Li Zhang <li2012.zhang@samsung.com>
239 files changed:
Makefile.am
bootstrap
configure.ac
ism/configs/config
ism/data/icons/01_header_icon_cancel.png [deleted file]
ism/data/icons/01_header_icon_done.png [deleted file]
ism/data/icons/Makefile.am
ism/data/icons/pop_play.png [new file with mode: 0755]
ism/data/pixmaps/B09_predictive_bg.png
ism/data/pixmaps/B09_predictive_icon_arrow_down.png
ism/data/pixmaps/B09_predictive_icon_arrow_up.png
ism/data/pixmaps/B09_predictive_on_bg.png
ism/data/pixmaps/B09_predictive_vertical_line.png
ism/data/pixmaps/Makefile.am
ism/data/pixmaps/edc_image_macro.edc [new file with mode: 0644]
ism/data/pixmaps/isf_candidate.edc
ism/data/pixmaps/isf_candidate_theme1.edc
ism/data/pixmaps/isf_minicontrol.edc [new file with mode: 0644]
ism/data/pixmaps/isfsetting.edc [deleted file]
ism/data/pixmaps/keyboardicon.png [new file with mode: 0755]
ism/data/pixmaps/noti_icon_keyboard_connected.png [new file with mode: 0755]
ism/demos/Makefile.am
ism/demos/include/isf_demo_efl.h
ism/demos/include/isf_ondemand_efl.h [moved from ism/extras/efl_setting/include/isf_setting_efl.h with 52% similarity]
ism/demos/isf_demo_efl.cpp
ism/demos/isf_ondemand_efl.cpp [new file with mode: 0644]
ism/extras/Makefile.am
ism/extras/efl_immodule/Makefile.am
ism/extras/efl_immodule/isf_imf_context.cpp
ism/extras/efl_immodule/isf_imf_context.h
ism/extras/efl_immodule/isf_imf_control_ui.cpp
ism/extras/efl_immodule/isf_imf_control_ui.h
ism/extras/efl_immodule/isf_imf_module.cpp
ism/extras/efl_panel/Makefile.am
ism/extras/efl_panel/center_popup.cpp [new file with mode: 0644]
ism/extras/efl_panel/center_popup.h [new file with mode: 0644]
ism/extras/efl_panel/isf_panel_efl.cpp
ism/extras/efl_panel/isf_panel_utility.cpp
ism/extras/efl_panel/isf_panel_utility.h
ism/extras/efl_panel/minicontrol.cpp [new file with mode: 0644]
ism/extras/efl_panel/minicontrol.h [new file with mode: 0644]
ism/extras/efl_setting/Makefile.am [deleted file]
ism/extras/efl_setting/isf_setting_efl.cpp [deleted file]
ism/m4/ChangeLog [deleted file]
ism/m4/Makefile.am [deleted file]
ism/m4/codeset.m4 [deleted file]
ism/m4/gettext.m4 [deleted file]
ism/m4/glibc21.m4 [deleted file]
ism/m4/iconv.m4 [deleted file]
ism/m4/intdiv0.m4 [deleted file]
ism/m4/intltool.m4 [deleted file]
ism/m4/intmax.m4 [deleted file]
ism/m4/inttypes-pri.m4 [deleted file]
ism/m4/inttypes.m4 [deleted file]
ism/m4/inttypes_h.m4 [deleted file]
ism/m4/isc-posix.m4 [deleted file]
ism/m4/lcmessage.m4 [deleted file]
ism/m4/lib-ld.m4 [deleted file]
ism/m4/lib-link.m4 [deleted file]
ism/m4/lib-prefix.m4 [deleted file]
ism/m4/longdouble.m4 [deleted file]
ism/m4/longlong.m4 [deleted file]
ism/m4/nls.m4 [deleted file]
ism/m4/po.m4 [deleted file]
ism/m4/printf-posix.m4 [deleted file]
ism/m4/progtest.m4 [deleted file]
ism/m4/signed.m4 [deleted file]
ism/m4/size_max.m4 [deleted file]
ism/m4/stdint_h.m4 [deleted file]
ism/m4/uintmax_t.m4 [deleted file]
ism/m4/ulonglong.m4 [deleted file]
ism/m4/wchar_t.m4 [deleted file]
ism/m4/wint_t.m4 [deleted file]
ism/m4/xsize.m4 [deleted file]
ism/modules/config/scim_socket_config.cpp
ism/modules/frontend/imdkit/i18nMethod.c
ism/modules/frontend/scim_socket_frontend.cpp
ism/modules/frontend/scim_socket_frontend.h
ism/modules/frontend/scim_x11_frontend.cpp
ism/modules/frontend/scim_x11_frontend.h
ism/modules/imengine/scim_socket_imengine.cpp
ism/src/Makefile.am
ism/src/ise_preexec.cpp
ism/src/ise_preexec.h
ism/src/isf_control.cpp
ism/src/isf_control.h
ism/src/isf_imcontrol_client.cpp
ism/src/isf_imcontrol_client.h
ism/src/isf_query_engines.cpp
ism/src/isf_query_utility.cpp
ism/src/scim.cpp
ism/src/scim_backend.cpp
ism/src/scim_config_path.h
ism/src/scim_filter.cpp
ism/src/scim_filter.h
ism/src/scim_frontend.cpp
ism/src/scim_frontend.h
ism/src/scim_helper.cpp
ism/src/scim_helper.h
ism/src/scim_helper_launcher.cpp
ism/src/scim_helper_manager.cpp
ism/src/scim_imengine.cpp
ism/src/scim_imengine.h
ism/src/scim_imengine_module.h
ism/src/scim_keyevent_data.h
ism/src/scim_launcher.cpp
ism/src/scim_panel_agent.cpp
ism/src/scim_panel_agent.h
ism/src/scim_panel_client.cpp
ism/src/scim_panel_client.h
ism/src/scim_setup_module_efl.cpp [moved from ism/extras/efl_setting/scim_setup_module_efl.cpp with 100% similarity]
ism/src/scim_setup_module_efl.h [moved from ism/extras/efl_setting/include/scim_setup_module_efl.h with 96% similarity]
ism/src/scim_socket.cpp
ism/src/scim_trans_commands.h
ism/src/scim_transaction.cpp [changed mode: 0644->0755]
ism/src/scim_transaction.h
ism/src/scim_utility.cpp
ism/src/scim_utility.h
packaging/isf.spec
packaging/scim.service [new file with mode: 0644]
po/isfsetting_efl/Makefile.in.in [deleted file]
po/isfsetting_efl/POTFILES.in [deleted file]
po/isfsetting_efl/ar.po [deleted file]
po/isfsetting_efl/az.po [deleted file]
po/isfsetting_efl/bg.po [deleted file]
po/isfsetting_efl/ca.po [deleted file]
po/isfsetting_efl/cs.po [deleted file]
po/isfsetting_efl/da.po [deleted file]
po/isfsetting_efl/de_DE.po [deleted file]
po/isfsetting_efl/el_GR.po [deleted file]
po/isfsetting_efl/en.po [deleted file]
po/isfsetting_efl/en_PH.po [deleted file]
po/isfsetting_efl/en_US.po [deleted file]
po/isfsetting_efl/es_ES.po [deleted file]
po/isfsetting_efl/es_MX.po [deleted file]
po/isfsetting_efl/es_US.po [deleted file]
po/isfsetting_efl/et.po [deleted file]
po/isfsetting_efl/eu.po [deleted file]
po/isfsetting_efl/fa.po [deleted file]
po/isfsetting_efl/fi.po [deleted file]
po/isfsetting_efl/fr_CA.po [deleted file]
po/isfsetting_efl/fr_FR.po [deleted file]
po/isfsetting_efl/ga.po [deleted file]
po/isfsetting_efl/gl.po [deleted file]
po/isfsetting_efl/hi.po [deleted file]
po/isfsetting_efl/hr.po [deleted file]
po/isfsetting_efl/hu.po [deleted file]
po/isfsetting_efl/hy.po [deleted file]
po/isfsetting_efl/is.po [deleted file]
po/isfsetting_efl/isfsetting-efl.pot [deleted file]
po/isfsetting_efl/it_IT.po [deleted file]
po/isfsetting_efl/ja_JP.po [deleted file]
po/isfsetting_efl/ka.po [deleted file]
po/isfsetting_efl/kk.po [deleted file]
po/isfsetting_efl/ko_KR.po [deleted file]
po/isfsetting_efl/lt.po [deleted file]
po/isfsetting_efl/lv.po [deleted file]
po/isfsetting_efl/mk.po [deleted file]
po/isfsetting_efl/nb.po [deleted file]
po/isfsetting_efl/nl_NL.po [deleted file]
po/isfsetting_efl/pl.po [deleted file]
po/isfsetting_efl/pt_BR.po [deleted file]
po/isfsetting_efl/pt_PT.po [deleted file]
po/isfsetting_efl/ro.po [deleted file]
po/isfsetting_efl/ru_RU.po [deleted file]
po/isfsetting_efl/sk.po [deleted file]
po/isfsetting_efl/sl.po [deleted file]
po/isfsetting_efl/sr.po [deleted file]
po/isfsetting_efl/sv.po [deleted file]
po/isfsetting_efl/th.po [deleted file]
po/isfsetting_efl/tr_TR.po [deleted file]
po/isfsetting_efl/uk.po [deleted file]
po/isfsetting_efl/update-po.sh [deleted file]
po/isfsetting_efl/ur.po [deleted file]
po/isfsetting_efl/uz.po [deleted file]
po/isfsetting_efl/zh_CN.po [deleted file]
po/isfsetting_efl/zh_HK.po [deleted file]
po/isfsetting_efl/zh_SG.po [deleted file]
po/isfsetting_efl/zh_TW.po [deleted file]
po/scim/POTFILES.in
po/scim/ar.po
po/scim/az.po
po/scim/bg.po
po/scim/ca.po
po/scim/cs.po
po/scim/da.po
po/scim/de_DE.po
po/scim/el_GR.po
po/scim/en.po
po/scim/en_PH.po
po/scim/en_US.po
po/scim/es_ES.po
po/scim/es_MX.po
po/scim/es_US.po
po/scim/et.po
po/scim/eu.po
po/scim/fa.po
po/scim/fi.po
po/scim/fr_CA.po
po/scim/fr_FR.po
po/scim/ga.po
po/scim/gl.po
po/scim/hi.po
po/scim/hr.po
po/scim/hu.po
po/scim/hy.po
po/scim/is.po
po/scim/it_IT.po
po/scim/ja_JP.po
po/scim/ka.po
po/scim/kk.po
po/scim/ko_KR.po
po/scim/lt.po
po/scim/lv.po
po/scim/mk.po
po/scim/nb.po
po/scim/nl_NL.po
po/scim/pl.po
po/scim/pt_BR.po
po/scim/pt_PT.po
po/scim/ro.po
po/scim/ru_RU.po
po/scim/scim.pot
po/scim/sk.po
po/scim/sl.po
po/scim/sr.po
po/scim/sv.po
po/scim/th.po
po/scim/tr_TR.po
po/scim/uk.po
po/scim/ur.po
po/scim/uz.po
po/scim/zh_CN.po
po/scim/zh_HK.po
po/scim/zh_SG.po
po/scim/zh_TW.po
releasenote.txt
scim.service
ug-isfsetting-efl.xml [deleted file]