From a25c32124ea1e59dcb50b1c4408fe435a82c4234 Mon Sep 17 00:00:00 2001 From: "jaduk.koo" Date: Fri, 24 Aug 2012 13:31:41 +0900 Subject: [PATCH] Remove auto reject list Change-Id: I471a3e7a94d993b5b95f390025b47d2e0dd2a67b --- CMakeLists.txt | 3 - include/cst-autoreject-ime.h | 26 -- include/cst-autoreject.h | 32 --- include/cst-common.h | 11 - include/cst-util.h | 2 - packaging/call-setting.spec | 3 +- src/cst-autoreject-ime.c | 305 ----------------------- src/cst-autoreject.c | 581 ------------------------------------------- src/cst-call-setting.c | 3 - src/cst-delete-list.c | 48 +--- src/cst-main.c | 19 +- src/cst-util.c | 27 -- src/cst-widget.c | 15 -- 13 files changed, 9 insertions(+), 1066 deletions(-) delete mode 100755 include/cst-autoreject-ime.h delete mode 100755 include/cst-autoreject.h delete mode 100755 src/cst-autoreject-ime.c delete mode 100755 src/cst-autoreject.c diff --git a/CMakeLists.txt b/CMakeLists.txt index ff05be4..d3a1170 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,7 +24,6 @@ pkg_check_modules(pkgs REQUIRED db-util ui-gadget-1 contacts-service - phone-misc msg-service capi-appfw-application capi-appfw-app-manager @@ -60,8 +59,6 @@ ADD_LIBRARY(${SETTING_CISS_UG} SHARED ./src/cst-prefix-dial.c ./src/cst-prefix-dial-ime.c ./src/cst-delete-list.c - ./src/cst-autoreject.c - ./src/cst-autoreject-ime.c ./src/cst-waiting.c ./src/cst-util.c ./src/cst-more-call-setting.c diff --git a/include/cst-autoreject-ime.h b/include/cst-autoreject-ime.h deleted file mode 100755 index 14205c8..0000000 --- a/include/cst-autoreject-ime.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright 2012 Samsung Electronics Co., Ltd - * - * Licensed under the Flora License, Version 1.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.tizenopensource.org/license - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef _CST_AUTOREJECT_IME_H_ -#define _CST_AUTOREJECT_IME_H_ - -#include - -Evas_Object *_cst_create_autoreject_ime(Evas_Object *parent, char *edit_srting, void *data); -int _cst_get_reject_number(char *buffer, void *data); - -#endif - diff --git a/include/cst-autoreject.h b/include/cst-autoreject.h deleted file mode 100755 index 04114e1..0000000 --- a/include/cst-autoreject.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2012 Samsung Electronics Co., Ltd - * - * Licensed under the Flora License, Version 1.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.tizenopensource.org/license - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef _CST_AUTOREJECT_H_ -#define _CST_AUTOREJECT_H_ - -#include - -void _cst_genlist_append_auto_reject_list_item(CstUgData_t *ugd, Evas_Object *genlist); -int _cst_get_num_of_reject_list(CstUgData_t *ugd); -char *_cst_get_reject_list_text(Eina_List *list, int index); -int _cst_get_reject_list_id(Eina_List *list, int index); -void _cst_set_num_of_reject_list(int i); -void _cst_on_click_reject_list(void *data, Evas *evas, Evas_Object *obj, void *event_info); -void _cst_auto_reject_input_panel_event_callback(void *data, Ecore_IMF_Context *imf_context, int value); -void _cst_create_auto_reject_ug(void *data); - -#endif - diff --git a/include/cst-common.h b/include/cst-common.h index 4f7d8ab..bc47a3b 100755 --- a/include/cst-common.h +++ b/include/cst-common.h @@ -20,7 +20,6 @@ #include #include #include -#include #include #include @@ -190,7 +189,6 @@ enum { }; enum { - CST_DL_AUTO_REJECT, CST_DL_REJECT_CALL_WITH_MSG, CST_DL_NONE, @@ -199,7 +197,6 @@ enum { enum { CST_UG_REQ_NONE = 0, - CST_UG_REQ_AUTO_REJECT, CST_UG_REQ_REJECT_MSG, CST_UG_REQ_CALL_ANSWER_END, CST_UG_REQ_CALL_FORWARD, @@ -213,7 +210,6 @@ enum { }; typedef enum { - CST_IME_AUTO_REJECT, CST_IME_PREFIX_DIAL, CST_IME_REJECT_MSG, CST_IME_CALL_FORWARD, @@ -270,12 +266,6 @@ typedef struct { Evas_Object *rdg_outgoing_call_type; - Eina_List *reject_list; - Eina_List *load_list; - phone_misc_h *reject_handle; - ph_misc_block_rules reject_rule; - Evas_Object *rdg_reject_rule; - Elm_Object_Item *prefix_gl_list_item; int cf_state[4]; @@ -311,7 +301,6 @@ typedef struct { typedef struct _Item_Data { int index; int reject_id; - int reject_rule; int str_id; Elm_Object_Item *gl_item; Elm_Object_Item *parent_gl_item; diff --git a/include/cst-util.h b/include/cst-util.h index a474ba1..f991858 100755 --- a/include/cst-util.h +++ b/include/cst-util.h @@ -33,8 +33,6 @@ Eina_Bool _cst_check_flight_mode(void); Eina_Bool _cst_check_sim_status(void); int _cst_parse_bundle(service_h service); void _cst_on_click_ime_contact_btn(void *data, Evas_Object *obj, void *event_info); -void _cst_connect_reject_list_handle(CstUgData_t *ugd); -void _cst_disconnect_reject_list_handle(CstUgData_t *ugd); #endif diff --git a/packaging/call-setting.spec b/packaging/call-setting.spec index 5c3fc5b..4570756 100755 --- a/packaging/call-setting.spec +++ b/packaging/call-setting.spec @@ -1,6 +1,6 @@ Name: call-setting Summary: Call Settings -Version: 0.2.104 +Version: 0.2.105 Release: 1 Group: TBD License: Flora Software License @@ -19,7 +19,6 @@ BuildRequires: pkgconfig(dlog) BuildRequires: pkgconfig(aul) BuildRequires: pkgconfig(db-util) BuildRequires: pkgconfig(contacts-service) -BuildRequires: pkgconfig(phone-misc) BuildRequires: pkgconfig(msg-service) BuildRequires: pkgconfig(capi-appfw-application) BuildRequires: pkgconfig(capi-appfw-app-manager) diff --git a/src/cst-autoreject-ime.c b/src/cst-autoreject-ime.c deleted file mode 100755 index e714f04..0000000 --- a/src/cst-autoreject-ime.c +++ /dev/null @@ -1,305 +0,0 @@ -/* - * Copyright 2012 Samsung Electronics Co., Ltd - * - * Licensed under the Flora License, Version 1.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.tizenopensource.org/license - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include - -#include "cst-common.h" -#include "cst-common-string.h" -#include "cst-widget.h" -#include "cst-util.h" - -static Elm_Genlist_Item_Class *itc = NULL; -static Elm_Genlist_Item_Class *itc_2text_expand = NULL; -static Elm_Genlist_Item_Class *itc_sub_expand = NULL; - -static void __cst_on_click_reject_rule_exp(void *data, Evas *evas, Evas_Object *obj, void *event_info); -static CstGlItemDisplayInfo_t list_dep1_rule[] = { - {1, CST_STR_MATCH_CRITERIA, ELM_GENLIST_ITEM_TREE, CST_GL_ITEM_EXPANDABLE, __cst_on_click_reject_rule_exp}, - {1, -1, ELM_GENLIST_ITEM_NONE, CST_GL_ITEM_NONE, NULL}, -}; - -static CstGlItemDisplayInfo_t list_dep2_rule[] = { - {2, CST_STR_EXACTLY_THE_SAME_AS, ELM_GENLIST_ITEM_NONE, CST_GL_ITEM_RADIO_1TEXT, (void *)PH_MISC_BLOCK_RULE_EXACTLY}, - {2, CST_STR_START_WITH, ELM_GENLIST_ITEM_NONE, CST_GL_ITEM_RADIO_1TEXT, (void *)PH_MISC_BLOCK_RULE_START}, - {2, CST_STR_INCLUDE, ELM_GENLIST_ITEM_NONE, CST_GL_ITEM_RADIO_1TEXT, (void *)PH_MISC_BLOCK_RULE_INCLUDE}, - {2, -1, ELM_GENLIST_ITEM_NONE, CST_GL_ITEM_NONE, NULL}, -}; - -int _cst_get_reject_number(char *buffer, void *data) -{ - ENTER(_cst_get_reject_number); - retv_if(NULL == data, 0); - CstUgData_t *ugd = (CstUgData_t *)data; - const char *entry_input; - Evas_Object *error; - Ecore_IMF_Context *imf_ctx; - - entry_input = elm_entry_entry_get(ugd->dg_entry); - retv_if(NULL == entry_input, -1); - if (strlen(entry_input) == 0) { - imf_ctx = elm_entry_imf_context_get(ugd->dg_entry); - if (imf_ctx) { - ecore_imf_context_input_panel_hide(imf_ctx); - } - error = _cst_create_error_popup(ugd->nf, CST_ERROR_ENTER_NUMBER); - ugd->popup = error; - evas_object_show(error); - return -1; - } - - DBG("IME input string = %s length=%d", entry_input, strlen(entry_input)); - - snprintf(buffer, CST_MAX_PHONE_NUMBER_LEN, "%s", entry_input); - return strlen(entry_input); -} - -static Evas_Object *__cst_gl_icon_get_autoreject_ime(void *data, Evas_Object *obj, const char *part) -{ - ENTER(__cst_gl_icon_get_autoreject_ime); - retv_if(NULL == data, NULL); - CstUgData_t *ugd = (CstUgData_t *)data; - - if (!strcmp(part, "elm.icon")) { - Evas_Object *ef = _cst_create_ime_editfield(ugd, obj, CST_IME_AUTO_REJECT, NULL); - retv_if(ef == NULL, NULL); - - return _cst_create_ime_btn_layout(obj, ef, - _cst_on_click_ime_contact_btn, (void *)ugd); - } - return NULL; -} - -static void __cst_gl_reject_cst_del(void *data, Evas_Object *obj) -{ - CstGlItemData_t *item_data = (CstGlItemData_t *)data; - if (item_data) - free(item_data); - return; -} - -static char *__cst_gl_label_get_reject_expand(void *data, Evas_Object *obj, const char *part) -{ - retv_if(NULL == data, NULL); - CstGlItemData_t *item_data = (CstGlItemData_t *)data; - if (!strcmp(part, "elm.text.1")) { - if (list_dep1_rule[item_data->index].str_id != -1) - return strdup(T_(list_dep1_rule[item_data->index].str_id)); - } else if (!strcmp(part, "elm.text.2")) { - CstUgData_t *ugd = (CstUgData_t *)item_data->ugd; - retv_if(NULL == ugd, NULL); - - int index; - for (index = 0; list_dep2_rule[index].style != CST_GL_ITEM_NONE; ++index) { - DBG("index :%d", index); - if (ugd->reject_rule == (ph_misc_block_rules)list_dep2_rule[index].func) { - if (list_dep2_rule[index].str_id != -1) - return strdup(T_(list_dep2_rule[index].str_id)); - } - } - - DBG("Rejection rule is not exist : %d", ugd->reject_rule); - } - return NULL; -} - -static void __cst_gl_reject_rule_sel(void *data, Evas_Object *obj, void *event_info) -{ - ret_if(NULL == data); - CstGlItemData_t *item_data = (CstGlItemData_t *)data; - CstUgData_t *ugd = item_data->ugd; - elm_genlist_item_selected_set((Elm_Object_Item *)event_info, EINA_FALSE); - - if (list_dep1_rule[item_data->index].func) { - if (list_dep1_rule[item_data->index].style == CST_GL_ITEM_EXPANDABLE) - list_dep1_rule[item_data->index].func((void *)ugd, NULL, obj, event_info); - } - return; -} - -static char *__cst_gl_2nd_reject_rule_label_get(void *data, Evas_Object *obj, const char *part) -{ - retv_if(NULL == data, NULL); - CstGlItemData_t *item_data = (CstGlItemData_t *)data; - if (!strcmp(part, "elm.text")) { - if (list_dep2_rule[item_data->index].str_id != -1) - return strdup(T_(list_dep2_rule[item_data->index].str_id)); - } - return NULL; -} - -static Evas_Object *__cst_gl_2nd_reject_rule_icon_get(void *data, Evas_Object *obj, const char *part) -{ - retv_if(NULL == data, NULL); - CstGlItemData_t *item_data = (CstGlItemData_t *)data; - CstUgData_t *ugd = (CstUgData_t *)item_data->ugd; - - retv_if(NULL == ugd, NULL); - if (!strcmp(part, "elm.icon")) { - if (ugd->rdg_reject_rule == NULL) { - ugd->rdg_reject_rule = elm_radio_add(obj); - elm_radio_value_set(ugd->rdg_reject_rule, -1); - } - Evas_Object *radio = _cst_create_radio_icon(obj, - ugd->rdg_reject_rule, (int)list_dep2_rule[item_data->index].func, - ugd->reject_rule, NULL); - return radio; - } - return NULL; -} - -static void __cst_gl_2nd_reject_rule_sel(void *data, Evas_Object *obj, void *event_info) -{ - ret_if(data == NULL); - CstGlItemData_t *item_data = (CstGlItemData_t *)data; - CstUgData_t *ugd = item_data->ugd; - - elm_genlist_item_selected_set((Elm_Object_Item *)event_info, EINA_FALSE); - ugd->reject_rule = (ph_misc_block_rules)list_dep2_rule[item_data->index].func; - if (ugd->rdg_reject_rule) { - elm_radio_value_set(ugd->rdg_reject_rule, ugd->reject_rule); - elm_genlist_item_update(item_data->parent_gl_item); - } - return; -} - -static void __cst_gl_reject_rule_exp(void *data, Evas_Object *obj, void *event_info) -{ - ENTER(__cst_gl_reject_rule_exp); - ret_if(NULL == data); - CstUgData_t *ugd = (CstUgData_t *)data; - Elm_Object_Item *item = (Elm_Object_Item *)event_info; - ret_if(NULL == item); - Evas_Object *genlist = elm_object_item_widget_get(item); - ret_if(NULL == genlist); - ugd->rdg_reject_rule = NULL; - - CstGlItemData_t *item_data2; - int i = 0; - - itc_sub_expand->item_style = "dialogue/1text.1icon/expandable2"; - itc_sub_expand->func.text_get = __cst_gl_2nd_reject_rule_label_get; - itc_sub_expand->func.content_get = __cst_gl_2nd_reject_rule_icon_get; - itc_sub_expand->func.state_get = NULL; - itc_sub_expand->func.del = __cst_gl_reject_cst_del; - - ugd->rdg_reject_rule = elm_radio_add(genlist); - elm_radio_value_set(ugd->rdg_reject_rule, -1); - for (i = 0; list_dep2_rule[i].style != CST_GL_ITEM_NONE; i++) { - item_data2 = (CstGlItemData_t *)calloc(1, sizeof(CstGlItemData_t)); - ret_if(item_data2 == NULL); - item_data2->index = i; - item_data2->ugd = ugd; - item_data2->parent_gl_item = item; - - elm_genlist_item_append(genlist, itc_sub_expand, - (void *)item_data2, item, list_dep2_rule[i].flags, - __cst_gl_2nd_reject_rule_sel, item_data2); - } -} - -static void __cst_gl_reject_rule_con(void *data, Evas_Object *obj, void *event_info) -{ - - Elm_Object_Item *item = event_info; - elm_genlist_item_subitems_clear(item); -} - -static void __cst_gl_reject_rule_exp_req(void *data, Evas_Object *obj, void *event_info) -{ - if (data != NULL) { /*Close IME*/ - CstUgData_t *ugd = (CstUgData_t *)data; - elm_object_focus_set(ugd->dg_entry, EINA_FALSE); - } - - Elm_Object_Item *item = event_info; - elm_genlist_item_expanded_set(item, EINA_TRUE); -} - -static void __cst_gl_reject_rule_con_req(void *data, Evas_Object *obj, void *event_info) -{ - Elm_Object_Item *item = event_info; - elm_genlist_item_expanded_set(item, EINA_FALSE); -} - -static void __cst_on_click_reject_rule_exp(void *data, Evas *evas, Evas_Object *obj, void *event_info) -{ - ENTER(__cst_on_click_reject_rule_exp); - Elm_Object_Item *item = event_info; - ret_if(NULL == data); - if (elm_genlist_item_expanded_get(item)) { - __cst_gl_reject_rule_con_req(data, obj, event_info); - __cst_gl_reject_rule_con(data, obj, event_info); - } else { - elm_genlist_tree_effect_enabled_set(elm_object_item_widget_get(item), EINA_TRUE); - __cst_gl_reject_rule_exp_req(data, obj, event_info); - __cst_gl_reject_rule_exp(data, obj, event_info); - } -} - -static Evas_Object *__cst_create_autoreject_ime_genlist(CstUgData_t *ugd) -{ - ENTER(__cst_create_autoreject_ime_genlist); - Elm_Object_Item *item = NULL; - Evas_Object *genlist; - retv_if(NULL == ugd, NULL); - genlist = elm_genlist_add(ugd->nf); - - if (!itc) - itc = elm_genlist_item_class_new(); - - if (!itc_2text_expand) - itc_2text_expand = elm_genlist_item_class_new(); - - if (!itc_sub_expand) - itc_sub_expand = elm_genlist_item_class_new(); - - itc->item_style = "1icon"; - itc->func.text_get = NULL; - itc->func.content_get = __cst_gl_icon_get_autoreject_ime; - itc->func.state_get = NULL; - itc->func.del = NULL; - - itc_2text_expand->item_style = "dialogue/2text.3/expandable"; - itc_2text_expand->func.text_get = __cst_gl_label_get_reject_expand; - itc_2text_expand->func.content_get = NULL; - itc_2text_expand->func.state_get = NULL; - itc_2text_expand->func.del = __cst_gl_reject_cst_del; - - item = elm_genlist_item_append(genlist, itc, - (void *)ugd, NULL, ELM_GENLIST_ITEM_NONE, - NULL, NULL); - - CstGlItemData_t *item_data = (CstGlItemData_t *)calloc(1, sizeof(CstGlItemData_t)); - retv_if(NULL == item_data, NULL); - - item_data->ugd = ugd; - item = elm_genlist_item_append(genlist, itc_2text_expand, - (void *)item_data, NULL, ELM_GENLIST_ITEM_TREE, - __cst_gl_reject_rule_sel, item_data); - - return genlist; -} - -Evas_Object *_cst_create_autoreject_ime(Evas_Object *parent, char *edit_string, void *data) -{ - ENTER(_cst_create_autoreject_ime); - CstUgData_t *ugd = (CstUgData_t *)data; - - Evas_Object *genlist = __cst_create_autoreject_ime_genlist(ugd); - return genlist; -} - diff --git a/src/cst-autoreject.c b/src/cst-autoreject.c deleted file mode 100755 index e9a7f83..0000000 --- a/src/cst-autoreject.c +++ /dev/null @@ -1,581 +0,0 @@ -/* - * Copyright 2012 Samsung Electronics Co., Ltd - * - * Licensed under the Flora License, Version 1.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.tizenopensource.org/license - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include -#include -#include -#include "cst-common.h" -#include "cst-common-string.h" -#include "cst-widget.h" -#include "cst-call-setting.h" -#include "cst-delete-list.h" -#include "cst-autoreject.h" -#include "cst-autoreject-ime.h" -#include "cst-util.h" - -static Elm_Genlist_Item_Class *itc_list = NULL; -static Elm_Genlist_Item_Class *itc_2text_1icon = NULL; -Elm_Object_Item *ec_item[3]; - -static void __cst_auto_reject_back_to_prev(CstUgData_t *ugd); - -static void __cst_update_reject_active(const int reject_id, int reject_active, CstUgData_t *ugd) -{ - ret_if(ugd == NULL); - int ret = phone_misc_block_update(ugd->reject_handle, reject_id, PH_MISC_BLOCK_ROW_ACTIVATE, - reject_active, PH_MISC_BLOCK_ROW_NONE); - if (ret < 0) { - DBG("phone_misc_block_update() Failed(%d)", ret); - } -} - -static int __cst_get_list_cb(const ph_misc_block_info *row_data, void *user_data) -{ - retv_if(user_data == NULL, -1); - CstUgData_t *ugd = (CstUgData_t *)user_data; - CstRejectInfo_t *reject_item = NULL; - - reject_item = calloc(1, sizeof(CstRejectInfo_t)); - reject_item->reject_id = phone_misc_block_info_get_id(row_data); - snprintf(reject_item->reject_number, sizeof(reject_item->reject_number), - "%s", phone_misc_block_info_get_number(row_data)); - reject_item->is_activate = phone_misc_block_info_get_activate(row_data); - reject_item->rule = phone_misc_block_info_get_matching_rule(row_data); - ugd->load_list = eina_list_append(ugd->load_list, reject_item); - DBG("number : %s, act : %d, rule : %d", reject_item->reject_number, reject_item->is_activate, reject_item->rule); - return 0; -} - -static int __cst_load_reject_list(CstUgData_t *ugd) -{ - retv_if(ugd == NULL, -1); - int ret = phone_misc_block_get_list(ugd->reject_handle, __cst_get_list_cb, ugd); - if (ret < 0) { - DBG("phone_misc_block_get_list() Failed(%d)", ret); - } - return ret; -} - -static void __cst_back_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) -{ - ENTER(__cst_back_btn_clicked_cb); - CstUgData_t *ugd = (CstUgData_t *)data; - ret_if(ugd == NULL); - - if (ugd->reject_list) { - ugd->reject_list = eina_list_free(ugd->reject_list); - ugd->reject_list = NULL; - } - - if (ugd->backup_genlist) - ugd->backup_genlist = NULL; - - if (ugd->backup_layout) - ugd->backup_layout = NULL; - _cst_del_selectinfo(ugd); - - if (ugd->ug_req_type == CST_UG_REQ_AUTO_REJECT) - ug_destroy_me(ugd->ug); -} - -int _cst_get_num_of_reject_list(CstUgData_t *ugd) -{ - retv_if(ugd == NULL, 0); - - int list_cnt = eina_list_count(ugd->reject_list); - return list_cnt; -} - -char *_cst_get_reject_list_text(Eina_List *list, int index) -{ - ENTER(_cst_get_reject_list_text); - - CstGlItemData_t *item; - item = (CstGlItemData_t *)eina_list_nth(list, index); - - return item->text; -} - -int _cst_get_reject_list_id(Eina_List *list, int index) -{ - ENTER(_cst_get_reject_list_id); - - CstGlItemData_t *item; - item = (CstGlItemData_t *)eina_list_nth(list, index); - - return item->reject_id; -} - -void _cst_set_num_of_reject_list(int i) -{ - if (ec_item[1] != NULL) { - if (i == 0) { - elm_object_item_disabled_set(ec_item[1], EINA_TRUE); - } else { - elm_object_item_disabled_set(ec_item[1], EINA_FALSE); - } - } - if (ec_item[0] != NULL) { - if (i == 30) { - elm_object_item_disabled_set(ec_item[0], EINA_TRUE); - } else { - elm_object_item_disabled_set(ec_item[0], EINA_FALSE); - } - } -} - -static void __cst_on_click_reject_entry(void *data) -{ - ret_if(!data); - - CstGlItemData_t *item_data = (CstGlItemData_t *)data; - CstUgData_t *ugd = (CstUgData_t *)item_data->ugd; - Eina_Bool is_activated; - - is_activated = elm_check_state_get(item_data->eo_check); - __cst_update_reject_active(item_data->reject_id, !is_activated, ugd); - - item_data->is_activated = !is_activated; - elm_genlist_item_update(item_data->gl_item); -} - -static void __cst_on_click_unknown_entry(void *data) -{ - ret_if(!data); - - CstGlItemData_t *item_data = (CstGlItemData_t *)data; - Eina_Bool state; - - state = elm_check_state_get(item_data->eo_check); - _cst_vconf_set_bool(VCONFKEY_CISSAPPL_AUTO_REJECT_UNKNOWN_BOOL, !state); - elm_genlist_item_update(item_data->gl_item); -} - -static void __cst_on_changed_reject_entry_chk(void *data, Evas_Object *obj, void *event_info) -{ - ret_if(!data); - - CstGlItemData_t *item = (CstGlItemData_t *)data; - CstUgData_t *ugd = (CstUgData_t *)item->ugd; - Eina_Bool is_activated; - - is_activated = elm_check_state_get(obj); - __cst_update_reject_active(item->reject_id, is_activated, ugd); - - item->is_activated = is_activated; -} - -static void __cst_on_changed_unknown_entry_chk(void *data, Evas_Object *obj, void *event_info) -{ - Eina_Bool is_reject_unknown; - - is_reject_unknown = elm_check_state_get(obj); - _cst_vconf_set_bool(VCONFKEY_CISSAPPL_AUTO_REJECT_UNKNOWN_BOOL, is_reject_unknown); -} - -static char *__cst_gl_label_get_reject_list(void *data, Evas_Object *obj, const char *part) -{ - retv_if(NULL == data, NULL); - - CstGlItemData_t *item_data = (CstGlItemData_t *)data; - - if (!strcmp(part, "elm.text") || - !strcmp(part, "elm.text.1")) { - return strdup(item_data->text); - } else if (strcmp(part, "elm.text.2") == 0) { - int str_id = CST_SYS_STRING; - - switch (item_data->reject_rule) { - case PH_MISC_BLOCK_RULE_EXACTLY: - str_id = CST_STR_EXACTLY_THE_SAME_AS; - break; - case PH_MISC_BLOCK_RULE_START: - str_id = CST_STR_START_WITH; - break; - case PH_MISC_BLOCK_RULE_INCLUDE: - str_id = CST_STR_INCLUDE; - break; - default: - DBG("Rule is not exist : %d", item_data->reject_rule); - break; - } - return strdup(T_(str_id)); - } - - return NULL; -} - -static void __cst_gl_sel_reject_list(void *data, Evas_Object *obj, void *event_info) -{ - ENTER(__cst_gl_sel_reject_list); - retm_if(event_info == NULL, "Invalid argument: event info is NULL"); - Elm_Object_Item *it = (Elm_Object_Item *)event_info; - CstGlItemData_t *item_data = (CstGlItemData_t *)elm_object_item_data_get(it); - - elm_genlist_item_selected_set(it, 0); - - if (item_data->is_unknown == EINA_TRUE) { - __cst_on_click_unknown_entry(item_data); - } else { - __cst_on_click_reject_entry(item_data); - } - - return; -} - -static Evas_Object *__cst_gl_icon_get_list_onoff(void *data, Evas_Object *obj, const char *part) -{ - retv_if(NULL == data, NULL); - CstGlItemData_t *item_data = (CstGlItemData_t *)data; - CstUgData_t *ugd = (CstUgData_t *)item_data->ugd; - - if (!strcmp(part, "elm.icon")) { - int value = 0; - if (item_data->is_unknown == EINA_TRUE) { - _cst_vconf_get_bool(VCONFKEY_CISSAPPL_AUTO_REJECT_UNKNOWN_BOOL, &value); - item_data->eo_check = _cst_create_onoff_button(obj, value, - __cst_on_changed_unknown_entry_chk, ugd); - } else { - item_data->eo_check = _cst_create_onoff_button(obj, item_data->is_activated, - __cst_on_changed_reject_entry_chk, item_data); - } - return item_data->eo_check; - } - return NULL; -} - -static void __cst_gl_del_reject_list(void *data, Evas_Object *obj) -{ - ENTER(__cst_gl_del_reject_list); - - CstGlItemData_t *item_data = (CstGlItemData_t *)data; - if (item_data) { - free(item_data); - } -} - -static void __cst_add_reject_number(const char *number, void *data) -{ - ENTER(__cst_add_reject_number); - ret_if(!data); - - CstUgData_t *ugd = (CstUgData_t *) data; - - int log_ret = phone_misc_block_insert(ugd->reject_handle, ugd->reject_rule, number); - if (log_ret < 0) { - DBG("phone_misc_block_insert() Failed(%d)", log_ret); - return; - } - - elm_genlist_clear(ugd->backup_genlist); - ugd->reject_list = eina_list_free(ugd->reject_list); - ugd->reject_list = NULL; - _cst_genlist_append_auto_reject_list_item(ugd, ugd->backup_genlist); -} - -static void __cst_click_autoreject_create_done(void *data, Evas_Object *obj, void *event_info) -{ - ENTER(__cst_click_autoreject_create_done); - ret_if(!data); - - CstUgData_t *ugd = (CstUgData_t *)data; - char buffer[CST_MAX_PHONE_NUMBER_LEN + 1]; - - if (_cst_get_reject_number(buffer, ugd) > 0) { - - DBG(" Add a reject number, %s", buffer); - __cst_add_reject_number(buffer, ugd); - - memset(ugd->c_item, 0, sizeof(ugd->c_item)); - __cst_auto_reject_back_to_prev(ugd); - ugd->back_button = _cst_get_navifr_prev_btn(ugd->nf); - } -} - -static void __cst_click_autoreject_create_cancel(void *data, Evas_Object *obj, void *event_info) -{ - ENTER(__cst_click_autoreject_create_cancel); - ret_if(!data); - - CstUgData_t *ugd = (CstUgData_t *)data; - - memset(ugd->c_item, 0, sizeof(ugd->c_item)); - __cst_auto_reject_back_to_prev(ugd); -} - -static void __cst_on_click_autoreject_add_button(void *data, Evas_Object *obj, void *event_info) -{ - ENTER(__cst_on_click_autoreject_add_button); - ret_if(!data); - - CstUgData_t *ugd = (CstUgData_t *)data; - Evas_Object *eo; - Elm_Object_Item *navi_it; - Evas_Object *btn; - - ugd->popup = NULL; - ugd->reject_rule = PH_MISC_BLOCK_RULE_EXACTLY; - eo = _cst_create_autoreject_ime(ugd->nf, NULL, ugd); - evas_object_show(eo); - - _cst_remove_naviframe(ugd->nf); - navi_it = elm_naviframe_item_push(ugd->nf, T_(CST_STR_ENTER_NUMBER_TO_REJECT), - NULL, NULL, eo, "1line"); - - btn = _cst_create_title_btn(ugd->nf, (char *)T_(CST_STR_CANCEL), - __cst_click_autoreject_create_cancel, (void *)ugd); - elm_object_item_part_content_set(navi_it, "title_right_btn", btn); - - btn = _cst_create_title_btn(ugd->nf, (char *)T_(CST_STR_SAVE), - __cst_click_autoreject_create_done, (void *)ugd); - elm_object_item_part_content_set(navi_it, "title_left_btn", btn); - elm_object_disabled_set(btn, EINA_TRUE); -} - -void _cst_genlist_append_auto_reject_list_item(CstUgData_t *ugd, Evas_Object *genlist) -{ - int ret_value; - int list_cnt = -1; - int index; - Elm_Object_Item *gl_item; - - CstGlItemData_t *item = NULL; - - _cst_create_genlist_separator(genlist, EINA_TRUE); - - /* Create Unknown list */ - item = (CstGlItemData_t *)malloc(sizeof(CstGlItemData_t)); - ret_if(item == NULL); - memset(item, 0, sizeof(CstGlItemData_t)); - item->is_unknown = EINA_TRUE; - snprintf(item->text, CST_MAX_ITEM_TEXT_BUFFER_LEN, "%s", T_(CST_STR_UNKNOWN)); - - item->ugd = ugd; - gl_item = elm_genlist_item_append(genlist, itc_list, - item, NULL, ELM_GENLIST_ITEM_NONE, - __cst_gl_sel_reject_list, ugd); - item->gl_item = gl_item; - - ret_value = __cst_load_reject_list(ugd); - list_cnt = eina_list_count(ugd->load_list); - DBG("list_cnt : %d\n", list_cnt); - - for (index = 0; index < list_cnt; index++) { - CstRejectInfo_t *reject_item = (CstRejectInfo_t *)eina_list_nth(ugd->load_list, index); - if (reject_item) { - DBG("reject list i=%d number=%s active=%d", - index, reject_item->reject_number, reject_item->is_activate); - item = (CstGlItemData_t *)malloc(sizeof(CstGlItemData_t)); - ret_if(item == NULL); - memset(item, 0, sizeof(CstGlItemData_t)); - item->is_unknown = EINA_FALSE; - item->index = index; - item->reject_rule = reject_item->rule; - item->reject_id = reject_item->reject_id; - snprintf(item->text, CST_MAX_ITEM_TEXT_BUFFER_LEN + 1, "%s", reject_item->reject_number); - - item->is_activated = reject_item->is_activate; - item->ugd = ugd; - ugd->reject_list = eina_list_append(ugd->reject_list, item); - - gl_item = elm_genlist_item_append(genlist, itc_2text_1icon, - item, NULL, ELM_GENLIST_ITEM_NONE, - __cst_gl_sel_reject_list, ugd); - item->gl_item = gl_item; - } else { - DBG("reject_item is null\n"); - } - } - _cst_create_genlist_separator_no_line(genlist); - - edje_object_signal_emit(_EDJ(ugd->backup_layout), "show,content1", "code"); - ugd->load_list = eina_list_free(ugd->load_list); -} - -static void __cst_set_genlist_item_styles_reject_list(void) -{ - if (!itc_list) - itc_list = elm_genlist_item_class_new(); - - if (!itc_2text_1icon) - itc_2text_1icon = elm_genlist_item_class_new(); - - itc_list->item_style = "dialogue/1text.1icon"; - itc_list->func.text_get = __cst_gl_label_get_reject_list; - itc_list->func.content_get = __cst_gl_icon_get_list_onoff; - itc_list->func.state_get = NULL; - itc_list->func.del = __cst_gl_del_reject_list; - - itc_2text_1icon->item_style = "dialogue/2text.1icon.6"; - itc_2text_1icon->func.text_get = __cst_gl_label_get_reject_list; - itc_2text_1icon->func.content_get = __cst_gl_icon_get_list_onoff; - itc_2text_1icon->func.state_get = NULL; - itc_2text_1icon->func.del = __cst_gl_del_reject_list; - - return; -} - -static Evas_Object *__cst_create_genlist_reject_list(CstUgData_t *ugd) -{ - ENTER(__cst_create_genlist_reject_list); - - Evas_Object *genlist; - genlist = elm_genlist_add(ugd->nf); - - retv_if(NULL == genlist, NULL); - elm_object_style_set(genlist, "dialogue"); - - elm_genlist_tree_effect_enabled_set(genlist, EINA_TRUE); - evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL); - - _cst_genlist_append_auto_reject_list_item(ugd, genlist); - - return genlist; -} - -static void __cst_create_reject_list(Evas_Object *parent, void *data) -{ - ENTER(__cst_create_reject_list); - - Evas_Object *layout, *back_btn, *cbar; - CstUgData_t *ugd = (CstUgData_t *)data; - Elm_Object_Item *navi_it; - - ret_if(ugd == NULL); - - __cst_set_genlist_item_styles_reject_list(); - ugd->backup_genlist = __cst_create_genlist_reject_list(ugd); - ugd->kind_of_delete_list = CST_DL_AUTO_REJECT; - - layout = elm_layout_add(ugd->nf); - ugd->backup_layout = layout; - elm_layout_file_set(layout, EDJ_NAME, "toolbar"); - evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL); - elm_object_part_content_set(layout, "elm.swallow.contents", ugd->backup_genlist); - - if (ugd->ug_req_type == CST_UG_REQ_AUTO_REJECT) { - back_btn = elm_button_add(ugd->nf); - navi_it = elm_naviframe_item_push(ugd->nf, T_(CST_STR_AUTO_REJECT_LIST), - back_btn, NULL, layout, "1line"); - elm_object_style_set(back_btn, "naviframe/back_btn/default"); - - } else { - navi_it = elm_naviframe_item_push(ugd->nf, T_(CST_STR_AUTO_REJECT_LIST), - NULL, NULL, layout, "1line"); - back_btn = elm_object_item_part_content_get(navi_it, "prev_btn"); - } - evas_object_smart_callback_add(back_btn, "clicked", - __cst_back_btn_clicked_cb, ugd); - - cbar = _cst_create_navi_control_bar(ugd->nf, - (char *)T_(CST_STR_ADD), CST_CTRL_ICON_CREATE, - __cst_on_click_autoreject_add_button, - (char *)T_(CST_STR_DELETE), CST_CTRL_ICON_EDIT, - _cst_create_delete_list, - (void *)ugd, navi_it, - ec_item); - ret_if(NULL == cbar); - _cst_set_num_of_reject_list(_cst_get_num_of_reject_list(ugd)); -} - -void _cst_on_click_reject_list(void *data, Evas *evas, Evas_Object *obj, void *event_info) -{ - ENTER(_cst_on_click_reject_list); - ret_if(NULL == data); - CstUgData_t *ugd = (CstUgData_t *)data; - Evas_Event_Mouse_Up *ev = (Evas_Event_Mouse_Up *)event_info; - - if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) { - return; - } - - __cst_create_reject_list(ugd->nf, ugd); -} - -void _cst_create_auto_reject_ug(void *data) -{ - ENTER(_cst_create_auto_reject_ug); - - ret_if(NULL == data); - CstUgData_t *ugd = (CstUgData_t *)data; - - __cst_create_reject_list(ugd->nf, ugd); -} - -void _cst_auto_reject_input_panel_event_callback(void *data, Ecore_IMF_Context *imf_context, int value) -{ - ENTER(_cst_auto_reject_input_panel_event_callback); - ret_if(!data); - CstUgData_t *ugd = (CstUgData_t *)data; - Evas_Object *btn; - - Elm_Object_Item *top_it = elm_naviframe_top_item_get(ugd->nf); - - if(value == ECORE_IMF_INPUT_PANEL_STATE_SHOW) { - - DBG("ECORE_IMF_INPUT_PANEL_STATE_SHOW"); - btn = _cst_create_title_btn(ugd->nf, (char *)T_(CST_STR_CANCEL), - __cst_click_autoreject_create_cancel, (void *)ugd); - elm_object_item_part_content_set(top_it, "title_right_btn", btn); - - btn = _cst_create_title_btn(ugd->nf, (char *)T_(CST_STR_SAVE), - __cst_click_autoreject_create_done, (void *)ugd); - elm_object_item_part_content_set(top_it, "title_left_btn", btn); - - - } else if(value == ECORE_IMF_INPUT_PANEL_STATE_HIDE) { - Evas_Object *cbar; - DBG("ECORE_IMF_INPUT_PANEL_STATE_HIDE"); - elm_object_item_part_content_set(top_it, "title_right_btn", NULL); - elm_object_item_part_content_set(top_it, "title_left_btn", NULL); - cbar = _cst_create_navi_control_bar(ugd->nf, - (char *)T_(CST_STR_SAVE), NULL, - __cst_click_autoreject_create_done, - (char *)T_(CST_STR_CANCEL), NULL, - __cst_click_autoreject_create_cancel, - (void *)ugd, top_it, - ec_item); - } -} - -static void __cst_auto_reject_back_to_prev(CstUgData_t *ugd) -{ - ret_if(!ugd); - Evas_Object *cbar; - Ecore_IMF_Context *imf_context = elm_entry_imf_context_get(ugd->dg_entry); - Elm_Object_Item *top_it = NULL; - - elm_naviframe_item_pop(ugd->nf); - - top_it = elm_naviframe_top_item_get(ugd->nf); - - if (imf_context) { - ecore_imf_context_input_panel_event_callback_del (imf_context, ECORE_IMF_INPUT_PANEL_STATE_EVENT, _cst_auto_reject_input_panel_event_callback); - } - - cbar = _cst_create_navi_control_bar(ugd->nf, - (char *)T_(CST_STR_ADD), CST_CTRL_ICON_CREATE, - __cst_on_click_autoreject_add_button, - (char *)T_(CST_STR_DELETE), CST_CTRL_ICON_EDIT, - _cst_create_delete_list, - (void *)ugd, top_it, - ec_item); - _cst_set_num_of_reject_list(_cst_get_num_of_reject_list(ugd)); -} - diff --git a/src/cst-call-setting.c b/src/cst-call-setting.c index edd970d..f005e18 100755 --- a/src/cst-call-setting.c +++ b/src/cst-call-setting.c @@ -22,7 +22,6 @@ #include "cst-answering.h" #include "cst-forwarding.h" #include "cst-reject-msg.h" -#include "cst-autoreject.h" #include "cst-util.h" #include "cst-more-call-setting.h" #include @@ -38,8 +37,6 @@ static Elm_Genlist_Item_Class *itc_2text = NULL; static void __cst_on_click_speed_dial(void *data, Evas *evas, Evas_Object *obj, void *event_info); static CstGlItemDisplayInfo_t list_dep1[] = { - {1, CST_STR_CALL_REJECTION, ELM_GENLIST_ITEM_NONE, CST_GL_ITEM_TEXT, _cst_on_click_reject_list}, - {1, CST_STR_MANAGE_AUTO_REJECT_MODE, ELM_GENLIST_ITEM_NONE, CST_GL_ITEM_HELP_TEXT, NULL}, {1, CST_STR_SET_REJECT_MESSAGES, ELM_GENLIST_ITEM_NONE, CST_GL_ITEM_TEXT, _cst_on_click_reject_message}, {1, CST_STR_EDIT_REJECT_MESSAGE, ELM_GENLIST_ITEM_NONE, CST_GL_ITEM_HELP_TEXT, NULL}, {1, CST_STR_SPEED_DIAL, ELM_GENLIST_ITEM_NONE, CST_GL_ITEM_TEXT, __cst_on_click_speed_dial}, diff --git a/src/cst-delete-list.c b/src/cst-delete-list.c index 93e2220..5578a03 100755 --- a/src/cst-delete-list.c +++ b/src/cst-delete-list.c @@ -24,7 +24,6 @@ #include "cst-common-string.h" #include "cst-reject-msg.h" -#include "cst-autoreject.h" #include "cst-tapi-request.h" static Elm_Genlist_Item_Class *itc_1text_2text1icon = NULL; @@ -84,23 +83,6 @@ static void __cst_on_click_delete_button(void *data, Evas_Object *obj, void *eve del_list_it = elm_genlist_first_item_get(vd->genlist); switch (ugd->kind_of_delete_list) { - case CST_DL_AUTO_REJECT: - while (prev_it != NULL && del_list_it != NULL) { - del_item_data = (CstGlItemData_t *)elm_object_item_data_get(del_list_it); - if (del_item_data->check == EINA_TRUE) { - int ret = phone_misc_block_delete(ugd->reject_handle, del_item_data->reject_id); - if (ret < 0) { - DBG("phone_misc_block_delete() Failed"); - } - } - del_list_it = elm_genlist_item_next_get(del_list_it); - } - elm_genlist_clear(ugd->backup_genlist); - ugd->reject_list = eina_list_free(ugd->reject_list); - ugd->reject_list = NULL; - _cst_genlist_append_auto_reject_list_item(ugd, ugd->backup_genlist); - _cst_set_num_of_reject_list(_cst_get_num_of_reject_list(ugd)); - break; case CST_DL_REJECT_CALL_WITH_MSG: while (prev_it != NULL && del_list_it != NULL) { prev_item_data = (CstGlItemData_t *)elm_object_item_data_get(prev_it); @@ -223,17 +205,13 @@ static char *__cst_gl_label_get_delete_list(void *data, Evas_Object *obj, const CstGlItemData_t *item_data = (CstGlItemData_t *)data; if (!strcmp(part, "elm.text")) { - if (kind_of_delete_list == CST_DL_AUTO_REJECT) { - return strdup(item_data->text); - } else { - char *entry_label = elm_entry_markup_to_utf8(item_data->label); - retv_if(NULL == entry_label, NULL); - DBG("Label : %s", entry_label); - char *buf = strdup(entry_label); - free(entry_label); - entry_label = NULL; - return buf; - } + char *entry_label = elm_entry_markup_to_utf8(item_data->label); + retv_if(NULL == entry_label, NULL); + DBG("Label : %s", entry_label); + char *buf = strdup(entry_label); + free(entry_label); + entry_label = NULL; + return buf; } return NULL; } @@ -326,11 +304,6 @@ static Evas_Object *__cst_create_delete_list_genlist(Delete_List_View_Data *vd) item_data = calloc(1, sizeof(CstGlItemData_t)); retv_if(item_data == NULL, NULL); switch (ugd->kind_of_delete_list) { - case CST_DL_AUTO_REJECT: - snprintf(item_data->text, CST_MAX_ITEM_TEXT_BUFFER_LEN, - "%s", _cst_get_reject_list_text(ugd->reject_list, index)); - item_data->reject_id = _cst_get_reject_list_id(ugd->reject_list, index); - break; case CST_DL_REJECT_CALL_WITH_MSG: item_data->label = _cst_get_reject_message(index); break; @@ -422,9 +395,6 @@ void _cst_create_delete_list(void *data, Evas_Object *obj, void *event_info) DBG("Request list : %d", kind_of_delete_list); switch (kind_of_delete_list) { - case CST_DL_AUTO_REJECT: - delete_list_view->total_count = _cst_get_num_of_reject_list(ugd); - break; case CST_DL_REJECT_CALL_WITH_MSG: delete_list_view->total_count = _cst_get_num_of_reject_message(); break; @@ -454,10 +424,6 @@ void _cst_create_delete_list(void *data, Evas_Object *obj, void *event_info) navi_it = elm_naviframe_item_push(ugd->nf, header, NULL, NULL, delete_list_view->main_layout, "1line"); - } else if (kind_of_delete_list == CST_DL_AUTO_REJECT) { - navi_it = elm_naviframe_item_push(ugd->nf, - T_(CST_STR_SELECT_NUMBER), NULL, NULL, - delete_list_view->main_layout, "1line"); } Evas_Object *back_btn = elm_object_item_part_content_get(navi_it, diff --git a/src/cst-main.c b/src/cst-main.c index 31594d8..8b93f39 100755 --- a/src/cst-main.c +++ b/src/cst-main.c @@ -29,7 +29,6 @@ #include "cst-common-string.h" #include "cst-tapi-request.h" #include "cst-call-setting.h" -#include "cst-autoreject.h" #include "cst-util.h" static Evas_Object *__cst_create_content(Evas_Object *parent, CstUgData_t *ugd) @@ -45,14 +44,7 @@ static Evas_Object *__cst_create_content(Evas_Object *parent, CstUgData_t *ugd) elm_object_part_content_set(ugd->base, "elm.swallow.content", nf); - switch(ugd->ug_req_type) { - case CST_UG_REQ_AUTO_REJECT: - _cst_create_auto_reject_ug(ugd); - break; - default: - _cst_create_call_setting(ugd); - break; - } + _cst_create_call_setting(ugd); LEAVE(); @@ -125,9 +117,6 @@ static void *__cst_on_create(ui_gadget_h ug, enum ug_mode mode, service_h servic /* Register the telephony ss events */ _cst_ciss_register_tel_event(ugd); - /* Get reject list handle */ - _cst_connect_reject_list_handle(ugd); - elm_theme_extension_add(NULL, THEME_NAME); ugd->bg = __cst_create_bg(parent); @@ -174,12 +163,6 @@ static void __cst_on_destroy(ui_gadget_h ug, service_h service, void *priv) ugd = priv; - _cst_disconnect_reject_list_handle(ugd); - - if (ugd->reject_list) { - ugd->reject_list = eina_list_free(ugd->reject_list); - } - if (ugd->req_queue) { Eina_List *l; CallSettingSSReq_t *req; diff --git a/src/cst-util.c b/src/cst-util.c index 5ede3dd..2d1b086 100755 --- a/src/cst-util.c +++ b/src/cst-util.c @@ -170,8 +170,6 @@ static void __cst_contact_list_view_ug_result_cb(ui_gadget_h ug, service_h servi if (contact_index >= 0 && contacts_svc_get_contact(contact_index, &contact) == CTS_SUCCESS) { contacts_svc_struct_get_value(contact, CTS_CF_NAME_VALUE, &name); DBG("after contacts_svc_struct_get_value\n"); - display_name = contacts_svc_value_get_str(name, CTS_NAME_VAL_DISPLAY_STR); - DBG("display name: %s\n", return_name); first = contacts_svc_value_get_str(name, CTS_NAME_VAL_FIRST_STR); DBG("first name: %s\n", return_name); last = contacts_svc_value_get_str(name, CTS_NAME_VAL_LAST_STR); @@ -259,28 +257,3 @@ void _cst_on_click_ime_contact_btn(void *data, Evas_Object *obj, void *event_inf __cst_invoke_contact_uigadget(ugd); } - -void _cst_connect_reject_list_handle(CstUgData_t *ugd) -{ - ENTER(_cst_connect_reject_list_handle); - ret_if(NULL == ugd); - - ugd->reject_handle = phone_misc_connect(); - if (NULL == ugd->reject_handle) { - DBG("phone_misc_connect Failed"); - return; - } -} - -void _cst_disconnect_reject_list_handle(CstUgData_t *ugd) -{ - ENTER(_cst_connect_reject_list_handle); - ret_if(NULL == ugd); - - int phone_misc_ret = phone_misc_disconnect(ugd->reject_handle); - if (phone_misc_ret < 0) { - DBG("phone_misc_disconnect() Failed(%d)", phone_misc_ret); - return; - } -} - diff --git a/src/cst-widget.c b/src/cst-widget.c index 7b2b687..9ceeaa7 100755 --- a/src/cst-widget.c +++ b/src/cst-widget.c @@ -25,7 +25,6 @@ #include "cst-common-string.h" #include "cst-debug.h" #include "cst-reject-msg.h" -#include "cst-autoreject.h" #include "cst-prefix-dial.h" #include "cst-forwarding.h" #include "cst-util.h" @@ -530,20 +529,6 @@ Evas_Object *_cst_create_ime_editfield(CstUgData_t *ugd, elm_object_signal_callback_add(layout, "elm,eraser,clicked", "elm", _eraser_clicked_cb, ugd->dg_entry); switch (ime_type) { - case CST_IME_AUTO_REJECT: - elm_entry_single_line_set(ugd->dg_entry, EINA_TRUE); - elm_entry_scrollable_set(ugd->dg_entry, EINA_TRUE); - elm_object_part_text_set(layout, "elm.text", T_(CST_STR_ENTER_NUMBER)); - panel_layout = ECORE_IMF_INPUT_PANEL_LAYOUT_PHONENUMBER; - elm_entry_input_panel_layout_set(ugd->dg_entry, panel_layout); - limit_filter_data.max_char_count = 0; - limit_filter_data.max_byte_count = CST_MAX_PHONE_NUMBER_LEN; - digits_filter_data.accepted = "0123456789+*#"; - digits_filter_data.rejected = NULL; - elm_entry_markup_filter_append(ugd->dg_entry, - elm_entry_filter_accept_set, &digits_filter_data); - input_panel_cb = _cst_auto_reject_input_panel_event_callback; - break; case CST_IME_PREFIX_DIAL: elm_entry_single_line_set(ugd->dg_entry, EINA_TRUE); elm_entry_scrollable_set(ugd->dg_entry, EINA_TRUE); -- 2.7.4