powerkey popup : remove main popup, when sub poup is activated

Change-Id: I5a316a2b1ece801dbba653c79c70debbbd2bdd8b
Signed-off-by: changjoo.lee <changjoo.lee@samsung.com>

diff --git a/src/powerkey/powerkey-mobile.c b/src/powerkey/powerkey-mobile.c
index 8f116de..411d38f 100755 (executable)
--- a/src/powerkey/powerkey-mobile.c
+++ b/src/powerkey/powerkey-mobile.c
@@ -52,8 +52,21 @@ static char *items[] = {
        "IDS_COM_SK_RESTART_ABB"
 };
 
+static void remove_other_powerkey_popups(const struct popup_ops *ops)
+{
+       if (ops != &powerkey_ops)
+               unload_simple_popup(&powerkey_ops);
+
+       if (ops != &poweroff_ops)
+               unload_simple_popup(&poweroff_ops);
+
+       if (ops != &restart_ops)
+               unload_simple_popup(&restart_ops);
+}
+
 static int restart_launch(bundle *b, const struct popup_ops *ops)
 {
+       remove_other_powerkey_popups(ops);
        return 0;
 }
 
@@ -272,12 +285,15 @@ static void unregister_handlers(const struct popup_ops *ops)
 
 static int powerkey_list_launch(bundle *b, const struct popup_ops *ops)
 {
+       unregister_handlers(ops);
+       remove_other_powerkey_popups(ops);
        register_handlers(ops);
        return 0;
 }
 
 static int poweroff_launch(bundle *b, const struct popup_ops *ops)
 {
+       remove_other_powerkey_popups(ops);
        register_handlers(ops);
        return 0;
 }