summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSunggoo Kim <sung.goo.kim@samsung.com>2013-04-02 11:51:42 (GMT)
committerSunggoo Kim <sung.goo.kim@samsung.com>2013-04-02 11:58:19 (GMT)
commit6488cc4fa4fec33a7bafa79c234ff2aa87588f0c (patch)
tree4fda29f46f23b89dab98c3542b4846e56b2de905
parent568c09651ccbdc576bc7662af3d9328728370262 (diff)
downloadphone-contacts-6488cc4fa4fec33a7bafa79c234ff2aa87588f0c.zip
phone-contacts-6488cc4fa4fec33a7bafa79c234ff2aa87588f0c.tar.gz
phone-contacts-6488cc4fa4fec33a7bafa79c234ff2aa87588f0c.tar.bz2
Apply IME rule
Change-Id: I0b6dcf23bc35c1756a6e26428c79808200a87f2c
-rwxr-xr-xCMakeLists.txt2
-rwxr-xr-xlib/common/ct-group-input-view.c40
-rwxr-xr-xlib/details/ct-input-view.c36
-rwxr-xr-xpackaging/phone.spec2
4 files changed, 2 insertions, 78 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c85e681..770d6f7 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,7 @@ SET(EDC_SRC_DIR "${CMAKE_SOURCE_DIR}/lib/edc")
SET(EDJDIR "/usr/ug/res/edje/ug-${PACKAGE}")
SET(IMGDIR "/usr/ug/res/images/ug-${PACKAGE}")
SET(VERSION_MAJOR 0)
-SET(VERSION "${VERSION_MAJOR}.6.63.21")
+SET(VERSION "${VERSION_MAJOR}.6.63.22")
SET(CMAKE_SKIP_BUILD_RPATH FALSE)
SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
diff --git a/lib/common/ct-group-input-view.c b/lib/common/ct-group-input-view.c
index 82bf015..7bb0665 100755
--- a/lib/common/ct-group-input-view.c
+++ b/lib/common/ct-group-input-view.c
@@ -933,45 +933,6 @@ static void group_input_view_delete_cb(void *data, Evas *e, Evas_Object *obj, vo
free(cgroup_input_d);
}
-static Eina_Bool group_input_win_prop_change(void *data, int type, void *event)
-{
- ct_group_input_data *cgroup_input_d = data;
- Evas_Object *l_btn, *r_btn;
- char *text;
- Ecore_X_Event_Window_Property *ev = event;
- Ecore_X_Virtual_Keyboard_State state = ecore_x_e_virtual_keyboard_state_get(ev->win);
-
- p_retvm_if(NULL == cgroup_input_d, ECORE_CALLBACK_CANCEL, "parameter(clist_d) is NULL");
- p_retvm_if(NULL == cgroup_input_d->navi_it, ECORE_CALLBACK_CANCEL, "parameter(clist_d->navi_it) is NULL");
- if (ECORE_X_VIRTUAL_KEYBOARD_STATE_ON == state &&
- NULL == elm_object_item_part_content_get(cgroup_input_d->navi_it, "title_left_btn")) {
- l_btn = phone_create_navi_btn(cgroup_input_d->navi, "plus");
- evas_object_smart_callback_add(l_btn, "clicked", group_input_save_btn_cb, cgroup_input_d);
- evas_object_show(l_btn);
- elm_object_item_part_content_set(cgroup_input_d->navi_it, "title_left_btn", l_btn);
- text = ctui_entry_markup_to_utf8(elm_entry_entry_get(cgroup_input_d->entry));
- p_retvm_if(NULL == text, ECORE_CALLBACK_PASS_ON, "ctui_entry_markup_to_utf8() return NULL");
- if (*text)
- elm_object_disabled_set(l_btn, EINA_FALSE);
- else
- elm_object_disabled_set(l_btn, EINA_TRUE);
-
- r_btn = phone_create_navi_btn(cgroup_input_d->navi, "naviframe/prev_btn/default");
- evas_object_smart_callback_add(r_btn, "clicked", phone_view_back_btn_cb, cgroup_input_d->navi);
- evas_object_show(r_btn);
- elm_object_item_part_content_set(cgroup_input_d->navi_it, "title_right_btn", r_btn);
-
- free(text);
- }
- else if (ECORE_X_VIRTUAL_KEYBOARD_STATE_OFF == state &&
- NULL != elm_object_item_part_content_get(cgroup_input_d->navi_it, "title_left_btn")) {
-
- elm_object_item_part_content_set(cgroup_input_d->navi_it, "title_left_btn", NULL);
- elm_object_item_part_content_set(cgroup_input_d->navi_it, "title_right_btn", NULL);
- }
- return ECORE_CALLBACK_PASS_ON;
-}
-
static void group_input_get_data(ct_group_input_data *cgroup_input_d)
{
PH_FN_CALL;
@@ -1059,7 +1020,6 @@ void ctui_create_group_input_view(Evas_Object *win, Evas_Object *navi, ct_group_
}
elm_win_conformant_set(cgroup_input_d->win, EINA_TRUE);
- cgroup_input_d->win_prop_change = ecore_event_handler_add(ECORE_X_EVENT_WINDOW_PROPERTY, group_input_win_prop_change, cgroup_input_d);
cgroup_input_d->genlist = elm_genlist_add(layout);
elm_object_style_set(cgroup_input_d->genlist, "dialogue");
elm_object_style_set(cgroup_input_d->genlist, "no_effect");
diff --git a/lib/details/ct-input-view.c b/lib/details/ct-input-view.c
index 2e88641..eb44755 100755
--- a/lib/details/ct-input-view.c
+++ b/lib/details/ct-input-view.c
@@ -3004,41 +3004,6 @@ static void input_cancel_cb(void *data, Evas_Object *obj, void *event_info)
elm_naviframe_item_pop(cdetail_d->navi);
}
-static Eina_Bool input_win_prop_change(void *data, int type, void *event)
-{
- Evas_Object *l_btn, *r_btn;
- Ecore_X_Event_Window_Property *ev = event;
- Ecore_X_Virtual_Keyboard_State state = ecore_x_e_virtual_keyboard_state_get(ev->win);
- ct_input_data *cinput_d = (ct_input_data *)data;
-
- p_retvm_if(NULL == cinput_d, ECORE_CALLBACK_PASS_ON, "data is NULL");
-
- if (ECORE_X_VIRTUAL_KEYBOARD_STATE_ON == state &&
- NULL == elm_object_item_part_content_get(cinput_d->navi_item, "title_left_btn")) {
- r_btn = phone_create_navi_btn(cinput_d->cdetail_d->navi, "naviframe/prev_btn/default");
- if (cinput_d->cdetail_d->ug && NULL == cinput_d->pre_item)
- evas_object_smart_callback_add(r_btn, "clicked", phone_ug_destroy_me_cb, cinput_d->cdetail_d->ug);
- else
- evas_object_smart_callback_add(r_btn, "clicked", input_cancel_cb, cinput_d);
- elm_object_item_part_content_set(cinput_d->navi_item, "title_right_btn",r_btn);
-
- l_btn = phone_create_navi_btn(cinput_d->cdetail_d->navi, "plus");
- evas_object_smart_callback_add(l_btn, "clicked", ct_input_save_cb, cinput_d);
- elm_object_item_part_content_set(cinput_d->navi_item, "title_left_btn", l_btn);
-
- ct_input_save_button_update(cinput_d);
- cinput_d->keypad_on = true;
- }
- else if (ECORE_X_VIRTUAL_KEYBOARD_STATE_OFF == state &&
- NULL != elm_object_item_part_content_get(cinput_d->navi_item, "title_left_btn")) {
- elm_object_item_part_content_set(cinput_d->navi_item, "title_left_btn", NULL);
- elm_object_item_part_content_set(cinput_d->navi_item, "title_right_btn", NULL);
- cinput_d->keypad_on = false;
- }
- return ECORE_CALLBACK_PASS_ON;
-}
-
-
static Evas_Object* input_create_layout(ct_input_data *cinput_d)
{
char temp[PH_TEXT_MAX_LEN];
@@ -3052,7 +3017,6 @@ static Evas_Object* input_create_layout(ct_input_data *cinput_d)
layout = phone_create_base_layout(cdetail_d->navi, false);
p_retvm_if(NULL == layout, NULL, "elm_layout_add() return NULL");
evas_object_data_set(layout, KEY_INPUT_DATA, cinput_d);
- cinput_d->win_prop_change = ecore_event_handler_add(ECORE_X_EVENT_WINDOW_PROPERTY, input_win_prop_change, cinput_d);
evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_show(layout);
diff --git a/packaging/phone.spec b/packaging/phone.spec
index fce595b..7071bf7 100755
--- a/packaging/phone.spec
+++ b/packaging/phone.spec
@@ -1,6 +1,6 @@
Name: phone
Summary: Phone Application and gadgets
-Version: 0.6.63.21
+Version: 0.6.63.22
Release: 1
Group: devel
License: Flora Software License