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 afc67eb2e067073015b0a004621e249d4fadc269..6c72ccd74fb3293521cd849d6b5c8e2f61a472b9 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 86b5736b8930248320f65525a52638d3fca35e36..ff8ef29fcc89368c46fcaae01b10cd4f1b4ea773 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 3e66a0961963bae7201ac97abcc85c5319b42552..d3fd24850f9bf2ec32b67e076d43eaceccd37107 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 74f5df2d85bec23b60c8f3c407d68bb1b9b0baf0..d2126dfc815e0262ac11402882e86f3fe80d14dc 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 83c0ad80341ad6fed59f010d5ca897c2ccb112ef..e7a4c39b8dc90889217f857d7f0675c492e8dd4f 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 5407f39e9802123569a700ab0298c5a942562eea..242d81eeeb67443ca2760a484049b9ea1171fc4f 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 162ec19d52ae858fe391693b5bad02214c5b7611..f526fa14f24b31373bcbc7322833241534306773 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 02cb563349c5698e9a7437e8310021f7499998b5..78cb05d1db8e156cb30444ae3fec7720a8c77b76 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 5e85ccd275fe11b3b4d15b46be92ff306b871eea..6c931ca1e994cb4e1962726b6d42b792c3e8c947 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 f007ef46e3aca978dd1a38818bd06422290bf347..04fd53d0755ac50a1a812d9bc2e27be31846809b 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 8d9f72df9d6f6a22957239023182732972c27e11..e396fc1872d99bd057ca9e30b68ad3088b81348c 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 c6f6b0750b72b267320052593559bcdc714750d2..a59da077fc1d0697ef2599145286c2c2c0e6b51b 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 a26e97a4a6902a62b6e09848ff8cc63a5cc7637b..04cb99efa3dc9a22b93f2e5603bad2ec78695e28 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 12a2909ec11fd5954d51b0855f2698cb23c8c9fa..8656d98668aed5dc9162116971b21bbff7913222 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 8588259f64f32d229bf67024dd504d82de2e2e52..d0fc9bdad957ff51288223721c7e0bdce5aaadd4 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 24bfdeb4b992d275043239b4e1206bafd35a17c3..6f949a3bbe51597a4cad4712ca979a058bca5d68 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 18c3c35093d7a4ff64d24df9aba7d61e1b08185b..d6224e5805d7133820e68df1f5c59565791f30a0 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 5352b5f9b533295c59f30106cc62e5b69ce6275f..d5986daea75af22b7fec98e106ba961da641c8b0 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.