remove inputmgr_set_tags and inputmgr_remove_all_by_tag

Change-Id: I62dbb10e947456bbf27d6f4ba578871c1902f57a
Signed-off-by: Soohye Shin <soohye.shin@samsung.com>

diff --git a/include/defs.h b/include/defs.h
index 4611d42..f7752d0 100644 (file)
--- a/include/defs.h
+++ b/include/defs.h
@@ -239,9 +239,6 @@
 #define TRANSITION_DECEL DECEL 0.3
 #define TRANSITION_LINEAR LINEAR 0.2
 
-#define TAG_POPUP "popup"
-#define TAG_CTXPOPUP "ctxpopup"
-
 #define FONT_DEFAULT "BreezeSans"
 #define FONT_LIGHT "BreezeSans:style=Light"
 #define FONT_REGULAR "BreezeSans:style=Regular"

diff --git a/src/view/view_action_menu.c b/src/view/view_action_menu.c
index 750c4f1..4d74570 100644 (file)
--- a/src/view/view_action_menu.c
+++ b/src/view/view_action_menu.c
@@ -171,7 +171,6 @@ static void _add_popup(struct _priv *priv, char *title, char *message,
                return;
        }
        inputmgr_add_callback(first_btn, first_btn_id, &handler, priv);
-       inputmgr_set_tags(first_btn, TAG_POPUP, NULL);
 
        second_btn = utils_add_button(popup, second_btn_message,
                        PART_POPUP_BUTTON_2);
@@ -181,7 +180,6 @@ static void _add_popup(struct _priv *priv, char *title, char *message,
                return;
        }
        inputmgr_add_callback(second_btn, second_btn_id, &handler, priv);
-       inputmgr_set_tags(second_btn, TAG_POPUP, NULL);
 
        elm_object_focus_set(second_btn, EINA_TRUE);
 
@@ -193,7 +191,6 @@ static void _delete_popup(struct _priv *priv)
        if (!priv->popup)
                return;
 
-       inputmgr_remove_all_by_tag(TAG_POPUP);
        evas_object_del(priv->popup);
        priv->popup = NULL;
 }

diff --git a/src/view/view_photo.c b/src/view/view_photo.c
index f505acf..fa0e5da 100644 (file)
--- a/src/view/view_photo.c
+++ b/src/view/view_photo.c
@@ -88,7 +88,6 @@ static void _delete_popup(struct _priv *priv)
        if (!priv->popup)
                return;
 
-       inputmgr_remove_all_by_tag(TAG_POPUP);
        evas_object_del(priv->popup);
        priv->popup = NULL;
 }
@@ -326,7 +325,6 @@ static void _add_viewer_popup(struct _priv *priv, char *file)
        }
        inputmgr_add_callback(cancel_btn, INPUT_HANDLER_TYPE_CANCEL, &handler,
                        priv);
-       inputmgr_set_tags(cancel_btn, TAG_POPUP, NULL);
 
        done_btn = utils_add_button(ly, MESSAGE_DONE, PART_PHOTO_VIEWER_DONE);
        if (!done_btn) {
@@ -336,7 +334,6 @@ static void _add_viewer_popup(struct _priv *priv, char *file)
        }
        inputmgr_add_callback(done_btn, INPUT_HANDLER_TYPE_DONE, &handler,
                        priv);
-       inputmgr_set_tags(done_btn, TAG_POPUP, NULL);
 
        elm_object_focus_set(cancel_btn, EINA_TRUE);
 

diff --git a/src/view/view_user.c b/src/view/view_user.c
index 28c2f69..bfb17b1 100644 (file)
--- a/src/view/view_user.c
+++ b/src/view/view_user.c
@@ -150,7 +150,6 @@ static void _add_popup(struct _priv *priv)
                return;
        }
        inputmgr_add_callback(btn, INPUT_HANDLER_TYPE_BUTTON, &handler, priv);
-       inputmgr_set_tags(btn, TAG_POPUP, NULL);
        elm_object_focus_set(btn, EINA_TRUE);
 
        priv->popup = popup;
@@ -161,7 +160,6 @@ static void _delete_popup(struct _priv *priv)
        if (!priv->popup)
                return;
 
-       inputmgr_remove_all_by_tag(TAG_POPUP);
        evas_object_del(priv->popup);
        priv->popup = NULL;
 }

diff --git a/src/view/view_user_edit.c b/src/view/view_user_edit.c
index 26da142..9349b48 100644 (file)
--- a/src/view/view_user_edit.c
+++ b/src/view/view_user_edit.c
@@ -169,7 +169,6 @@ static void _delete_popup(struct _priv *priv)
        if (!priv->popup)
                return;
 
-       inputmgr_remove_all_by_tag(TAG_POPUP);
        evas_object_del(priv->popup);
        priv->popup = NULL;
 }
@@ -195,7 +194,6 @@ static void _add_discard_popup(struct _priv *priv)
        }
        inputmgr_add_callback(discard_btn, INPUT_HANDLER_TYPE_POPUP_BTN_DISCARD,
                        &handler, priv);
-       inputmgr_set_tags(discard_btn, TAG_POPUP, NULL);
 
        cancel_btn = utils_add_button(popup, MESSAGE_CANCEL,
                        PART_POPUP_BUTTON_2);
@@ -206,7 +204,6 @@ static void _add_discard_popup(struct _priv *priv)
        }
        inputmgr_add_callback(cancel_btn, INPUT_HANDLER_TYPE_POPUP_BTN_CANCEL,
                        &handler, priv);
-       inputmgr_set_tags(cancel_btn, TAG_POPUP, NULL);
 
        elm_object_focus_set(cancel_btn, EINA_TRUE);
 }
@@ -407,7 +404,6 @@ static void _add_icon_list(struct _priv *priv)
 
                inputmgr_add_callback(eo, INPUT_HANDLER_TYPE_EO, &handler,
                                priv);
-               inputmgr_set_tags(eo, TAG_CTXPOPUP, NULL);
                if (i == 0)
                        elm_object_focus_set(eo, EINA_TRUE);
        }
@@ -583,7 +579,6 @@ static void _delete_ctxpopup(struct _priv *priv)
        if (!priv->ctxpopup)
                return;
 
-       inputmgr_remove_all_by_tag(TAG_CTXPOPUP);
        evas_object_del(priv->ctxpopup);
        priv->ctxpopup = NULL;
        elm_object_focus_allow_set(priv->photo, EINA_TRUE);