summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjinwoo.shin <jw0227.shin@samsung.com>2015-10-08 14:09:46 +0900
committerjinwoo.shin <jw0227.shin@samsung.com>2015-10-08 14:13:34 +0900
commit9f553872614b030b0737b6be0668500e62d584f5 (patch)
tree2d1dd51f50490c8482abaa6213a7bc0308b9bce0
parent49abb267df73757346e238deb4165d0591a8fe2d (diff)
downloadair_livetv-9f553872614b030b0737b6be0668500e62d584f5.tar.gz
air_livetv-9f553872614b030b0737b6be0668500e62d584f5.tar.bz2
air_livetv-9f553872614b030b0737b6be0668500e62d584f5.zip
Delete unnecessary inputmgr_remove_callback
Change-Id: I90454330f519125d3d1a8d9a2b4bc5f57c64b044 Signed-off-by: jinwoo.shin <jw0227.shin@samsung.com>
-rw-r--r--src/layout_channelinfo.c1
-rw-r--r--src/layout_channelinfo_list.c1
-rw-r--r--src/layout_channelinfo_search.c20
-rw-r--r--src/view_action_menu.c7
-rw-r--r--src/view_channelnumber.c21
5 files changed, 0 insertions, 50 deletions
diff --git a/src/layout_channelinfo.c b/src/layout_channelinfo.c
index 1f28e94..83ef39e 100644
--- a/src/layout_channelinfo.c
+++ b/src/layout_channelinfo.c
@@ -154,7 +154,6 @@ static void _destroy(void *layout_data)
priv->channel_info = NULL;
}
- inputmgr_remove_callback(priv->base, &key_handler);
elm_layout_signal_callback_del(priv->base, SIGNAL_HIDE_FINISHED,
SOURCE_ELM, _hide_finished_cb);
diff --git a/src/layout_channelinfo_list.c b/src/layout_channelinfo_list.c
index 8f5e7c6..e2b3187 100644
--- a/src/layout_channelinfo_list.c
+++ b/src/layout_channelinfo_list.c
@@ -359,7 +359,6 @@ static void _destroy(void *layout_data)
if (priv->tune_timer)
ecore_timer_del(priv->tune_timer);
- inputmgr_remove_callback(priv->base, &key_handler);
elm_layout_signal_callback_del(priv->base, SIGNAL_HIDE_FINISHED,
SOURCE_ELM, _hide_finished_cb);
elm_layout_signal_callback_del(priv->base, SIGNAL_ANIM_FINISHED,
diff --git a/src/layout_channelinfo_search.c b/src/layout_channelinfo_search.c
index bd89866..579c063 100644
--- a/src/layout_channelinfo_search.c
+++ b/src/layout_channelinfo_search.c
@@ -106,23 +106,6 @@ static input_handler channel_handler = {
.mouse_move = _mouse_move_cb,
};
-static void _release_channel_handler(Evas_Object *obj)
-{
- Eina_List *child, *l;
- Evas_Object *ly;
-
- if (!obj)
- return;
-
- child = elm_box_children_get(obj);
-
- EINA_LIST_FOREACH(child, l, ly)
- inputmgr_remove_callback(ly, &channel_handler);
-
- if (child)
- eina_list_free(child);
-}
-
static void _load_channel_list(struct _priv *priv, Eina_List *channel_list)
{
Evas_Object *ly, *divider, *first;
@@ -145,7 +128,6 @@ static void _load_channel_list(struct _priv *priv, Eina_List *channel_list)
DIVIDER_WIDTH, DIVIDER_HEIGHT);
evas_object_show(divider);
- _release_channel_handler(priv->box);
elm_box_clear(priv->box);
first = NULL;
@@ -271,8 +253,6 @@ static void _destroy(void *layout_data)
priv = layout_data;
- _release_channel_handler(priv->box);
-
evas_object_del(priv->base);
free(priv);
}
diff --git a/src/view_action_menu.c b/src/view_action_menu.c
index c42aaba..f9ab06e 100644
--- a/src/view_action_menu.c
+++ b/src/view_action_menu.c
@@ -34,7 +34,6 @@
#define FAVORITE_MAX 10
#define SCROLLER_STEP_SIZE 334
-#define TAG_FAVORITE "TAG_FAVORITE"
#define KEY_BUTTON "KEY_BUTTON"
#define STYLE_LIVETV_BTN "style.livetv.button"
@@ -479,7 +478,6 @@ static void _update_favorite(struct _priv *priv)
channel_list = tv_channel_get_favorite_list();
- inputmgr_remove_all_by_tag(TAG_FAVORITE);
elm_box_clear(priv->favorite);
if (!channel_list) {
@@ -519,7 +517,6 @@ static void _update_favorite(struct _priv *priv)
inputmgr_add_callback(btn, channel_info->service_id,
&favorite_handler, NULL);
- inputmgr_set_tags(btn, VIEW_ACTION_MENU, TAG_FAVORITE, NULL);
elm_box_pack_end(priv->favorite, btn);
@@ -604,7 +601,6 @@ static bool _draw_action_area(struct _priv *priv)
evas_object_data_set(btn, KEY_BUTTON, &buttons[i]);
inputmgr_add_callback(btn, buttons[i].id,
&button_handler, priv);
- inputmgr_set_tags(btn, VIEW_ACTION_MENU);
col = i % ITEMS_IN_ROW;
row = i / ITEMS_IN_ROW;
@@ -698,7 +694,6 @@ static bool _draw_bottom_area(struct _priv *priv)
}
inputmgr_add_callback(btn, BUTTON_MORE,
&button_handler, priv);
- inputmgr_set_tags(btn, VIEW_ACTION_MENU);
return true;
}
@@ -779,7 +774,6 @@ static Evas_Object *_create(Evas_Object *win, void *data)
viewmgr_set_view_data(VIEW_ACTION_MENU, priv);
inputmgr_add_callback(priv->base, 0, &key_handler, priv);
- inputmgr_set_tags(priv->base, VIEW_ACTION_MENU);
elm_layout_signal_callback_add(priv->base, SIGNAL_HIDE_FINISHED,
SOURCE_ELM, _hide_finished_cb, priv);
@@ -832,7 +826,6 @@ static void _destroy(void *data)
elm_layout_signal_callback_del(priv->base, SIGNAL_HIDE_FINISHED,
SOURCE_ELM, _hide_finished_cb);
- inputmgr_remove_all_by_tag(VIEW_ACTION_MENU);
evas_object_del(priv->base);
diff --git a/src/view_channelnumber.c b/src/view_channelnumber.c
index 310ed2a..6404c0e 100644
--- a/src/view_channelnumber.c
+++ b/src/view_channelnumber.c
@@ -138,23 +138,6 @@ static input_handler channel_handler = {
.focused = _channel_focused_cb,
};
-static void _release_channel_handler(Evas_Object *obj)
-{
- Eina_List *child, *l;
- Evas_Object *ly;
-
- if (!obj)
- return;
-
- child = elm_box_children_get(obj);
-
- EINA_LIST_FOREACH(child, l, ly)
- inputmgr_remove_callback(ly, &channel_handler);
-
- if (child)
- eina_list_free(child);
-}
-
static void _update_channel_list(struct _priv *priv)
{
Evas_Object *ly, *first;
@@ -164,7 +147,6 @@ static void _update_channel_list(struct _priv *priv)
channel_list = tv_channel_search_by_number(priv->major, priv->minor);
- _release_channel_handler(priv->list);
elm_box_clear(priv->list);
if (!channel_list) {
@@ -271,7 +253,6 @@ static void _number_reset(struct _priv *priv)
priv->major = 0;
priv->minor = 0;
- _release_channel_handler(priv->list);
elm_box_clear(priv->list);
}
@@ -406,8 +387,6 @@ static void _destroy(void *view_data)
priv = view_data;
- inputmgr_remove_callback(priv->base, &key_handler);
-
evas_object_del(priv->base);
free(priv);