Change popup_ops name for cooldown_done and cooldown_warning

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

diff --git a/src/cooldown/cooldown-mobile.c b/src/cooldown/cooldown-mobile.c
index aabc427..2b23e93 100644 (file)
--- a/src/cooldown/cooldown-mobile.c
+++ b/src/cooldown/cooldown-mobile.c
@@ -20,15 +20,15 @@
 #include "popup-common.h"
 
 static const struct popup_ops cooldown_poweroff_ops;
-static const struct popup_ops cooldown_ops;
-static const struct popup_ops cooled_down_ops;
+static const struct popup_ops cooldown_warning_ops;
+static const struct popup_ops cooldown_done_ops;
 static const struct popup_ops cooldown_remove_ops;
 
 static int remove_cooldown_popups(bundle *b, const struct popup_ops *ops)
 {
        unload_simple_popup(&cooldown_poweroff_ops);
-       unload_simple_popup(&cooldown_ops);
-       unload_simple_popup(&cooled_down_ops);
+       unload_simple_popup(&cooldown_warning_ops);
+       unload_simple_popup(&cooldown_done_ops);
        terminate_if_no_popup();
 
        return 0;
@@ -44,11 +44,11 @@ static int remove_other_cooldown_popups(bundle *b, const struct popup_ops *ops)
        if (ops != &cooldown_poweroff_ops)
                unload_simple_popup(&cooldown_poweroff_ops);
 
-       if (ops != &cooldown_ops)
-               unload_simple_popup(&cooldown_ops);
+       if (ops != &cooldown_warning_ops)
+               unload_simple_popup(&cooldown_warning_ops);
 
-       if (ops != &cooled_down_ops)
-               unload_simple_popup(&cooled_down_ops);
+       if (ops != &cooldown_done_ops)
+               unload_simple_popup(&cooldown_done_ops);
 
        return 0;
 }
@@ -63,7 +63,7 @@ static const struct popup_ops cooldown_poweroff_ops = {
        .pre            = remove_other_cooldown_popups,
 };
 
-static const struct popup_ops cooldown_ops = {
+static const struct popup_ops cooldown_warning_ops = {
        .name           = "cooldown_warning",
        .pattern        = FEEDBACK_PATTERN_LOWBATT,
        .show           = load_simple_popup,
@@ -73,7 +73,7 @@ static const struct popup_ops cooldown_ops = {
        .pre            = remove_other_cooldown_popups,
 };
 
-static const struct popup_ops cooled_down_ops = {
+static const struct popup_ops cooldown_done_ops = {
        .name           = "cooldown_done",
        .pattern        = FEEDBACK_PATTERN_LOWBATT,
        .show           = load_simple_popup,
@@ -92,7 +92,7 @@ static const struct popup_ops cooldown_remove_ops = {
 static __attribute__ ((constructor)) void cooldown_register_popup(void)
 {
        register_popup(&cooldown_poweroff_ops);
-       register_popup(&cooldown_ops);
-       register_popup(&cooled_down_ops);
+       register_popup(&cooldown_warning_ops);
+       register_popup(&cooldown_done_ops);
        register_popup(&cooldown_remove_ops);
 }

diff --git a/src/cooldown/cooldown-wearable.c b/src/cooldown/cooldown-wearable.c
index 1de66f0..e975522 100644 (file)
--- a/src/cooldown/cooldown-wearable.c
+++ b/src/cooldown/cooldown-wearable.c
@@ -474,7 +474,7 @@ static const struct popup_ops cooldown_warning_ops = {
        .terminate      = cooldown_warning_terminate,
 };
 
-static const struct popup_ops cooled_down_ops = {
+static const struct popup_ops cooldown_done_ops = {
        .name           = "cooldown_done",
        .pattern        = FEEDBACK_PATTERN_LOWBATT,
        .show           = load_simple_popup,
@@ -489,5 +489,5 @@ static __attribute__ ((constructor)) void cooldown_register_popup(void)
        register_popup(&cooldown_poweron_ops);
        register_popup(&cooldown_poweroff_ops);
        register_popup(&cooldown_warning_ops);
-       register_popup(&cooled_down_ops);
+       register_popup(&cooldown_done_ops);
 }