Fix

1. build error and warning
2. intro comments in files

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

diff --git a/src/battery/battery-mobile.c b/src/battery/battery-mobile.c
index afc67eb..6c72ccd 100755 (executable)
--- a/src/battery/battery-mobile.c
+++ b/src/battery/battery-mobile.c
@@ -1,7 +1,7 @@
 /*
  *  system-popup
  *
- * Copyright (c) 2014 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/battery/battery-wearable.c b/src/battery/battery-wearable.c
index 86b5736..ff8ef29 100755 (executable)
--- a/src/battery/battery-wearable.c
+++ b/src/battery/battery-wearable.c
@@ -1,7 +1,7 @@
 /*
  *  system-popup
  *
- * Copyright (c) 2014 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,9 +30,9 @@ static const struct popup_ops charge_error_low_ops;
 static const struct popup_ops charge_error_high_ops;
 static const struct popup_ops battery_disconnected_ops;
 
-static void lowbattery_launch(bundle *b, const struct popup_ops *ops);
+static int lowbattery_launch(bundle *b, const struct popup_ops *ops);
 
-static void remove_other_lowbattery_popups(const struct popup_ops *ops)
+static int remove_other_lowbattery_popups(const struct popup_ops *ops)
 {
        if (ops != &lowbattery_warning_ops)
                unload_simple_popup(&lowbattery_warning_ops);
@@ -42,9 +42,11 @@ static void remove_other_lowbattery_popups(const struct popup_ops *ops)
 
        if (ops != &lowbattery_poweroff_ops)
                unload_simple_popup(&lowbattery_poweroff_ops);
+
+       return 0;
 }
 
-static void remove_other_charge_popups(bundle *b, const struct popup_ops *ops)
+static int remove_other_charge_popups(bundle *b, const struct popup_ops *ops)
 {
        if (ops != &charge_error_low_ops)
                unload_simple_popup(&charge_error_low_ops);
@@ -54,6 +56,8 @@ static void remove_other_charge_popups(bundle *b, const struct popup_ops *ops)
 
        if (ops != &battery_disconnected_ops)
                unload_simple_popup(&battery_disconnected_ops);
+
+       return 0;
 }
 
 static void charger_status_changed(keynode_t *key, void *data)
@@ -87,11 +91,13 @@ static void register_charger_status_handler(const struct popup_ops *ops)
                _E("Failed to register vconf key handler");
 }
 
-static void lowbattery_launch(bundle *b, const struct popup_ops *ops)
+static int lowbattery_launch(bundle *b, const struct popup_ops *ops)
 {
        unregister_charger_status_handler();
        remove_other_lowbattery_popups(ops);
        register_charger_status_handler(ops);
+
+       return 0;
 }
 
 static void lowbattery_terminate(const struct popup_ops *ops)

diff --git a/src/common/core.c b/src/common/core.c
index 3e66a09..d3fd248 100644 (file)
--- a/src/common/core.c
+++ b/src/common/core.c
@@ -1,6 +1,6 @@
 /*
  * system-popup
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/common/popup-ui-circle.c b/src/common/popup-ui-circle.c
index 74f5df2..d2126df 100755 (executable)
--- a/src/common/popup-ui-circle.c
+++ b/src/common/popup-ui-circle.c
@@ -1,7 +1,7 @@
 /*
  *  system-popup
  *
- * Copyright (c) 2015 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/common/popup-ui-normal.c b/src/common/popup-ui-normal.c
index 83c0ad8..e7a4c39 100755 (executable)
--- a/src/common/popup-ui-normal.c
+++ b/src/common/popup-ui-normal.c
@@ -1,7 +1,7 @@
 /*
  *  system-popup
  *
- * Copyright (c) 2015 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/common/popup-ui.c b/src/common/popup-ui.c
index 5407f39..242d81e 100755 (executable)
--- a/src/common/popup-ui.c
+++ b/src/common/popup-ui.c
@@ -1,7 +1,7 @@
 /*
  *  system-popup
  *
- * Copyright (c) 2014 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/cooldown/cooldown-wearable.c b/src/cooldown/cooldown-wearable.c
index 162ec19..f526fa1 100755 (executable)
--- a/src/cooldown/cooldown-wearable.c
+++ b/src/cooldown/cooldown-wearable.c
@@ -217,7 +217,7 @@ static Eina_Bool beep_time_expired(void *data)
        return ECORE_CALLBACK_CANCEL;
 }
 
-static void cooldown_warning_timer(const struct popup_ops *ops)
+static int cooldown_warning_timer(bundle *b, const struct popup_ops *ops)
 {
        int ret;
 
@@ -233,6 +233,7 @@ static void cooldown_warning_timer(const struct popup_ops *ops)
        if (ret < 0)
                _E("Failed to add dbus handler(%d)", ret);
 
+       return 0;
 }
 
 static Eina_Bool poweroff_time_expired(void *data)
@@ -244,7 +245,7 @@ static Eina_Bool poweroff_time_expired(void *data)
        return ECORE_CALLBACK_CANCEL;
 }
 
-static void cooldown_poweroff_timer(const struct popup_ops *ops)
+static int cooldown_poweroff_timer(bundle *b, const struct popup_ops *ops)
 {
        remove_other_popups(ops);
 
@@ -253,6 +254,8 @@ static void cooldown_poweroff_timer(const struct popup_ops *ops)
        timer = ecore_timer_add(TIMEOUT_POWEROFF, poweroff_time_expired, ops);
        if (!timer)
                _E("Failed to add timer");
+
+       return 0;
 }
 
 static int cooldown_poweroff_content(const struct popup_ops *ops, char *content, unsigned int len)
@@ -273,7 +276,7 @@ static const struct popup_ops cooldown_poweroff_ops = {
        .get_content = cooldown_poweroff_content,
        .left_text      = "IDS_COM_SK_OK",
        .left           = cooldown_poweroff,
-       .launch         = cooldown_poweroff_timer,
+       .show           = cooldown_poweroff_timer,
        .terminate      = cooldown_poweroff,
 };
 
@@ -290,7 +293,7 @@ static const struct popup_ops cooldown_warning_ops = {
        .get_content = cooldown_warning_content,
        .left_text      = "IDS_COM_SK_OK",
        .left           = cooldown_warning,
-       .launch         = cooldown_warning_timer,
+       .show           = cooldown_warning_timer,
        .terminate      = cooldown_warning,
 };
 

diff --git a/src/crash/crash.c b/src/crash/crash.c
index 02cb563..78cb05d 100755 (executable)
--- a/src/crash/crash.c
+++ b/src/crash/crash.c
@@ -1,7 +1,7 @@
 /*
  *  system-popup
  *
- * Copyright (c) 2014 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/launcher/launcher.c b/src/launcher/launcher.c
index 5e85ccd..6c931ca 100755 (executable)
--- a/src/launcher/launcher.c
+++ b/src/launcher/launcher.c
@@ -1,7 +1,7 @@
 /*
  * popup-launcher
  *
- * Copyright (c) 2013 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/launcher/noti.c b/src/launcher/noti.c
index f007ef4..04fd53d 100755 (executable)
--- a/src/launcher/noti.c
+++ b/src/launcher/noti.c
@@ -1,7 +1,7 @@
 /*
  * popup-launcher
  *
- * Copyright (c) 2013 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/launcher/popup.c b/src/launcher/popup.c
index 8d9f72d..e396fc1 100755 (executable)
--- a/src/launcher/popup.c
+++ b/src/launcher/popup.c
@@ -1,7 +1,7 @@
 /*
  * popup-launcher
  *
- * Copyright (c) 2013 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/mmc/mmc-mobile.c b/src/mmc/mmc-mobile.c
index c6f6b07..a59da07 100755 (executable)
--- a/src/mmc/mmc-mobile.c
+++ b/src/mmc/mmc-mobile.c
@@ -1,7 +1,7 @@
 /*
  *  system-popup
  *
- * Copyright (c) 2014 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/powerkey/powerkey.c b/src/powerkey/powerkey.c
index a26e97a..04cb99e 100755 (executable)
--- a/src/powerkey/powerkey.c
+++ b/src/powerkey/powerkey.c
@@ -107,15 +107,19 @@ static char* gl_text_get_cb(void *data, Evas_Object *obj, const char *part)
 
        switch (index) {
        case 0:
-               if (!strncmp("elm.text", part, sizeof("elm.text"))) return strdup(_(items[index]));
+               if (!strncmp("elm.text", part, sizeof("elm.text")))
+                       return strdup(_(items[index]));
                else
                        return NULL;
 
        case 1:
-               if (!strncmp("elm.text", part, sizeof("elm.text"))) return strdup(_(items[index]));
+               if (!strncmp("elm.text", part, sizeof("elm.text")))
+                       return strdup(_(items[index]));
                else
                        return NULL;
        }
+
+       return NULL;
 }
 
 static void gl_sel_cb(void *data, Evas_Object *obj, void *event_info)

diff --git a/src/storage/lowstorage-wearable.c b/src/storage/lowstorage-wearable.c
index 12a2909..8656d98 100755 (executable)
--- a/src/storage/lowstorage-wearable.c
+++ b/src/storage/lowstorage-wearable.c
@@ -1,7 +1,7 @@
 /*
  *  system-popup
  *
- * Copyright (c) 2014 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@ static const struct popup_ops lowstorage_warning_ops;
 static const struct popup_ops lowstorage_critical_ops;
 static const struct popup_ops lowstorage_full_ops;
 
-static int remove_other_lowstorage_popups(const struct popup_ops *ops)
+static int remove_other_lowstorage_popups(bundle *b, const struct popup_ops *ops)
 {
        if (ops != &lowstorage_warning_ops)
                unload_simple_popup(&lowstorage_warning_ops);

diff --git a/src/usb/usb-device.c b/src/usb/usb-device.c
index 8588259..d0fc9bd 100755 (executable)
--- a/src/usb/usb-device.c
+++ b/src/usb/usb-device.c
@@ -1,7 +1,7 @@
 /*
  *  system-popup
  *
- * Copyright (c) 2015 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/usb/usb-mobile.c b/src/usb/usb-mobile.c
index 24bfdeb..6f949a3 100755 (executable)
--- a/src/usb/usb-mobile.c
+++ b/src/usb/usb-mobile.c
@@ -1,7 +1,7 @@
 /*
  *  system-popup
  *
- * Copyright (c) 2014 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/usb/usbotg-mobile.c b/src/usb/usbotg-mobile.c
index 18c3c35..d6224e5 100755 (executable)
--- a/src/usb/usbotg-mobile.c
+++ b/src/usb/usbotg-mobile.c
@@ -1,7 +1,7 @@
 /*
  *  system-popup
  *
- * Copyright (c) 2014 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/watchdog/watchdog.c b/src/watchdog/watchdog.c
index 5352b5f..d5986da 100755 (executable)
--- a/src/watchdog/watchdog.c
+++ b/src/watchdog/watchdog.c
@@ -1,7 +1,7 @@
 /*
  *  system-popup
  *
- * Copyright (c) 2014 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.