Revert "Test patch to resolve crash"

This reverts commit 3f319748e55dfe7e870f1a6c2db5685b14208caf.

Change-Id: I5199eca86fcc706df612b2de5cd1c29e2def1e7a

diff --git a/src/settings/modules/bluetooth.c b/src/settings/modules/bluetooth.c
index 14912af18f7b3c527777e229bb3a37a981c6a2f2..81e18b97b6285a5a06978ff60a5d3bf030d0c1ac 100755 (executable)
--- a/src/settings/modules/bluetooth.c
+++ b/src/settings/modules/bluetooth.c
@@ -76,9 +76,9 @@ static void _view_update(Evas_Object *view, int state, int flag_extra_1, int fla
 {
        Evas_Object *image = NULL;
        const char *icon_path = NULL;
-       ERR("AMRIT bluetooth _view_update Before");
+
        quickpanel_setting_icon_state_set(view, state);
-       ERR("AMRIT bluetooth _view_update After");
+
        if (state == ICON_VIEW_STATE_ON) {
 #ifdef BUTTON_ICON_HIGHLIGHT
                icon_path = BUTTON_ICON_HIGHLIGHT;

diff --git a/src/settings/modules/dnd.c b/src/settings/modules/dnd.c
index 489dab27fe7b99139be898399295d55423c2478e..6fe17574aac14e294e0ae6d5ddbc13bb940922d0 100755 (executable)
--- a/src/settings/modules/dnd.c
+++ b/src/settings/modules/dnd.c
@@ -133,9 +133,9 @@ static void _view_update(Evas_Object *view, int state, int flag_extra_1, int fla
 {
        Evas_Object *image = NULL;
        const char *icon_path = NULL;
-       ERR("AMRIT dnd _view_update Before");
+
        quickpanel_setting_icon_state_set(view, state);
-       ERR("AMRIT dnd _view_update After");
+
        if (state == ICON_VIEW_STATE_ON) {
 #ifdef BUTTON_ICON_HIGHLIGHT
                icon_path = BUTTON_ICON_HIGHLIGHT;

diff --git a/src/settings/modules/more-settings.c b/src/settings/modules/more-settings.c
index ba010b5cfcf23d540985c4fe65cfb3644931797e..f912ad046701e4c93e46209cda5fb6d34272f320 100755 (executable)
--- a/src/settings/modules/more-settings.c
+++ b/src/settings/modules/more-settings.c
@@ -71,9 +71,9 @@ static void _view_update(Evas_Object *view, int state, int flag_extra_1, int fla
 {
        Evas_Object *image = NULL;
        const char *icon_path = NULL;
-       ERR("AMRIT more-setting softkey _view_update Before");
+
        quickpanel_setting_icon_state_set(view, state);
-       ERR("AMRIT more-setting _view_update After");
+
        if (state == ICON_VIEW_STATE_ON) {
 #ifdef BUTTON_ICON_HIGHLIGHT
                icon_path = BUTTON_ICON_HIGHLIGHT;

diff --git a/src/settings/modules/softkey.c b/src/settings/modules/softkey.c
index 3a862cbd0f796d5ce941e33efb71fc60339d395f..6c0edc7f00c8f2420fe44f0d2aca7bcfc2eee661 100755 (executable)
--- a/src/settings/modules/softkey.c
+++ b/src/settings/modules/softkey.c
@@ -31,19 +31,16 @@
 #define BUTTON_ICON_NORMAL "icon_softkey_off.png"\r
 #define BUTTON_ICON_HIGHLIGHT "icon_softkey_on.png"\r
 #define BUTTON_ICON_DIM "icon_softkey_disabled.png"\r
-//#define VCONFKEY_SETAPPL_SOFT_KEY  "db/setting/soft_key"\r
 \r
 static void _mouse_clicked_cb(void *data, Evas_Object *obj, const char *emission, const char *source);\r
 \r
 static const char *_label_get(void)\r
 {\r
-       ERR("AMRIT inside softkey _label_get Before leaving");\r
        return BUTTON_LABEL;\r
 }\r
 \r
 static const char *_icon_get(qp_setting_icon_image_type type)\r
 {\r
-       ERR("AMRIT inside softkey _icon_get");\r
        if (type == QP_SETTING_ICON_NORMAL) {\r
                return BUTTON_ICON_NORMAL;\r
        } else if (type == QP_SETTING_ICON_HIGHLIGHT) {\r
@@ -53,20 +50,18 @@ static const char *_icon_get(qp_setting_icon_image_type type)
                return BUTTON_ICON_DIM;\r
 #endif\r
        }\r
-       ERR("AMRIT inside softkey _icon_get Before leaving");\r
+\r
        return NULL;\r
 }\r
 \r
 static void _long_press_cb(void *data)\r
 {\r
-       ERR("AMRIT inside softkey _long_press_cb");\r
        QP_Module_Setting *module = (QP_Module_Setting *)data;\r
 \r
        if (quickpanel_setting_module_is_immediate_actionable(module, QP_SETTING_ICON_LONGPRESSED) == false)\r
                return;\r
 \r
        quickpanel_setting_icon_handler_longpress(module->setting_pkgname, NULL, NULL);\r
-       ERR("AMRIT inside softkey _long_press_cb Before leaving");\r
 }\r
 \r
 static void _view_update(Evas_Object *view, int state, int flag_extra_1, int flag_extra_2)\r
@@ -75,10 +70,8 @@ static void _view_update(Evas_Object *view, int state, int flag_extra_1, int fla
        Evas_Object *image = NULL;\r
        const char *icon_path = NULL;\r
 \r
-       ERR("AMRIT inside softkey _view_update Before");\r
        quickpanel_setting_icon_state_set(view, state);\r
-       ERR("AMRIT inside softkey _view_update After");\r
-       \r
+\r
        if (state == ICON_VIEW_STATE_ON) {\r
 #ifdef BUTTON_ICON_HIGHLIGHT\r
                icon_path = BUTTON_ICON_HIGHLIGHT;\r
@@ -97,7 +90,6 @@ static void _view_update(Evas_Object *view, int state, int flag_extra_1, int fla
        image = quickpanel_setting_icon_image_new(view, icon_path);\r
        quickpanel_setting_icon_content_set(view, image);\r
        quickpanel_setting_icon_text_set(view, BUTTON_LABEL, state);\r
-       ERR("AMRIT inside softkey _view_update Before leaving");\r
 }\r
 \r
 static void _status_update(QP_Module_Setting *module, int flag_extra_1, int flag_extra_2)\r
@@ -121,7 +113,6 @@ static void _status_update(QP_Module_Setting *module, int flag_extra_1, int flag
        quickpanel_setting_module_icon_view_update(module,\r
                        quickpanel_setting_module_icon_state_get(module),\r
                        FLAG_VALUE_VOID);\r
-       ERR("AMRIT inside softkey _status_update Before leaving");\r
 }\r
 \r
 static void _state_change(QP_Module_Setting *module)\r
@@ -147,20 +138,17 @@ static void _mouse_clicked_cb(void *data, Evas_Object *obj, const char *emission
        DBG(">>> calling state_change <<<");\r
        _state_change(module);\r
        _status_update(data, FLAG_VALUE_VOID, FLAG_VALUE_VOID);\r
-       ERR("AMRIT inside softkey _mouse_clicked_cb Before leaving");\r
 }\r
 \r
 static int _register_module_event_handler(void *data)\r
 {\r
        int ret = 0;\r
-       ERR("AMRIT inside softkey _register_module_event_handler Before leaving");\r
        return QP_OK;\r
 }\r
 \r
 static int _unregister_module_event_handler(void *data)\r
 {\r
        int ret = 0;\r
-       ERR("AMRIT inside softkey _unregister_module_event_handler Before leaving");\r
        return QP_OK;\r
 }\r
 \r
@@ -172,18 +160,18 @@ static int _unregister_module_event_handler(void *data)
 static int _init(void *data)\r
 {\r
        int ret = QP_OK;\r
-       ERR("AMRIT inside softkey _init");\r
+\r
        ret = _register_module_event_handler(data);\r
-       ERR("AMRIT inside softkey _init Before leaving");\r
+\r
        return ret;\r
 }\r
 \r
 static int _fini(void *data)\r
 {\r
        int ret = QP_OK;\r
-       ERR("AMRIT inside softkey _fin");\r
+\r
        ret = _unregister_module_event_handler(data);\r
-       ERR("AMRIT inside softkey _fini Before leaving");\r
+\r
        return ret;\r
 }\r
 \r
@@ -191,7 +179,7 @@ static void _lang_changed(void *data)
 {\r
        QP_Module_Setting *module = (QP_Module_Setting *)data;\r
        retif(module == NULL, , "Invalid parameter!");\r
-       ERR("AMRIT inside softkey _lang_changed");\r
+\r
        quickpanel_setting_module_icon_view_update_text(module);\r
 }\r
 \r
@@ -199,24 +187,20 @@ static void _refresh(void *data)
 {\r
        QP_Module_Setting *module = (QP_Module_Setting *)data;\r
        retif(module == NULL, , "Invalid parameter!");\r
-       ERR("AMRIT inside softkey _refresh");\r
+\r
        quickpanel_setting_module_icon_view_update_text(module);\r
-       ERR("AMRIT inside softkey _refresh Before leaving");\r
 }\r
 \r
 static void _reset_icon(QP_Module_Setting *module)\r
 {\r
-       ERR("AMRIT inside softkey _reset_icon");\r
        retif(module == NULL, , "Invalid parameter!");\r
 \r
        quickpanel_setting_module_progress_mode_set(module, FLAG_DISABLE, FLAG_VALUE_VOID);\r
        _status_update(module, FLAG_VALUE_VOID, FLAG_VALUE_VOID);\r
-       ERR("AMRIT inside softkey _reset_icon Before leaving");\r
 }\r
 \r
 static void _handler_on(void *data)\r
 {\r
-       ERR("AMRIT inside softkey _handler_on");\r
        QP_Module_Setting *module = (QP_Module_Setting *)data;\r
        retif(module == NULL, , "Invalid parameter!");\r
 \r
@@ -230,12 +214,10 @@ static void _handler_on(void *data)
                ERR("the button is already turned on");\r
                _reset_icon(module);\r
        }\r
-       ERR("AMRIT inside softkey _handler_on Before leaving");\r
 }\r
 \r
 static void _handler_off(void *data)\r
 {\r
-       ERR("AMRIT inside softkey _handler_off");\r
        QP_Module_Setting *module = (QP_Module_Setting *)data;\r
        retif(module == NULL, , "Invalid parameter!");\r
 \r
@@ -249,32 +231,26 @@ static void _handler_off(void *data)
                ERR("the button is already turned off");\r
                _reset_icon(module);\r
        }\r
-       ERR("AMRIT inside softkey _handler_off Before leaving");\r
 }\r
 \r
 static void _handler_progress_on(void *data)\r
 {\r
-       ERR("AMRIT inside softkey _handler_progress_on");\r
        QP_Module_Setting *module = (QP_Module_Setting *)data;\r
        retif(module == NULL, , "Invalid parameter!");\r
 \r
        quickpanel_setting_module_progress_mode_set(module, FLAG_ENABLE, FLAG_VALUE_VOID);\r
-       ERR("AMRIT inside softkey _handler_progress_on Before leaving");\r
 }\r
 \r
 static void _handler_progress_off(void *data)\r
 {\r
-       ERR("AMRIT inside softkey _handler_progress_off");\r
        QP_Module_Setting *module = (QP_Module_Setting *)data;\r
        retif(module == NULL, , "Invalid parameter!");\r
 \r
        _reset_icon(module);\r
-       ERR("AMRIT inside softkey _handler_progress_off Before leaving");\r
 }\r
 \r
 static int _handler_ipc(const char *command, void *data)\r
 {\r
-       ERR("AMRIT inside softkey _handler_ipc");\r
        int i = 0;\r
        retif(data == NULL, EINA_FALSE, "item data is NULL");\r
        retif(command == NULL, EINA_FALSE, "command is NULL");\r
@@ -313,7 +289,7 @@ static int _handler_ipc(const char *command, void *data)
                }\r
                break;\r
        }\r
-       ERR("AMRIT inside softkey _handler_ipc Before leaving");\r
+\r
        return EINA_TRUE;\r
 }\r
 \r

diff --git a/src/settings/modules/sound-profile.c b/src/settings/modules/sound-profile.c
index 7e33574476feb8c0ecedf164e643f2fb2b9b9fed..e005e89fecfd1ca2348c3e407d9665f89bf6dd47 100755 (executable)
--- a/src/settings/modules/sound-profile.c
+++ b/src/settings/modules/sound-profile.c
@@ -191,9 +191,8 @@ static void _view_update(Evas_Object *view, int state, int flag_extra_1, int fla
                img_path = BUTTON_ICON_SND_HIGHLIGHT;
        break;
        }
-       ERR("AMRIT sound _view_update Before");
+
        quickpanel_setting_icon_state_set(view, icon_state);
-       ERR("AMRIT sound _view_update After");
        quickpanel_setting_icon_text_set(view, text, icon_state);
        image = quickpanel_setting_icon_image_new(view, img_path);
        quickpanel_setting_icon_content_set(view, image);

diff --git a/src/settings/modules/wifi.c b/src/settings/modules/wifi.c
index 05790d85ceca3c8b43f3e53619f51893b877b74c..652f221c14b4b8c28804bcec74ab140898d8bb09 100755 (executable)
--- a/src/settings/modules/wifi.c
+++ b/src/settings/modules/wifi.c
@@ -86,9 +86,9 @@ static void _view_update(Evas_Object *view, int state, int flag_extra_1, int fla
 {
        Evas_Object *image = NULL;
        const char *icon_path = NULL;
-       ERR("AMRIT inside wifi _view_update Before");
+
        quickpanel_setting_icon_state_set(view, state);
-       ERR("AMRIT inside wifi _view_update After");
+
        if (state == ICON_VIEW_STATE_ON) {
 #ifdef BUTTON_ICON_HIGHLIGHT
                icon_path = BUTTON_ICON_HIGHLIGHT;

diff --git a/src/settings/setting_module_api.c b/src/settings/setting_module_api.c
index 67d57efffbc4e0040947f387761caefac9a8c1a4..f49f5b887a1359397099e901417fa7f502916a8a 100755 (executable)
--- a/src/settings/setting_module_api.c
+++ b/src/settings/setting_module_api.c
@@ -287,7 +287,6 @@ static void _progressbar_set(Evas_Object *view, int is_enable, int is_request_on
                quickpanel_setting_icon_content_set(view, content);
 
                quickpanel_setting_icon_state_progress_set(view);
-               ERR("AMRIT inside _progressbar_set");
                quickpanel_setting_icon_state_set(view, ICON_VIEW_STATE_DIM);
        }
 }

diff --git a/tizen-manifest.xml b/tizen-manifest.xml
index 7bb0275e925a587fdb465e559402088a4a9fd561..0adbbdf32f4e6bae124fc68a7f777498a521939e 100755 (executable)
--- a/tizen-manifest.xml
+++ b/tizen-manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="4.0" install-location="internal-only" package="org.tizen.quickpanel_common" version="1.0.0">
     <author email="jin0.kim@samsung.com" href="www.samsung.com">Jinyoung Kim</author>
-    <profile name="mobile"/>
+    <profile name="tizeniot"/>
     <ui-application appid="org.tizen.quickpanel" exec="quickpanel" hw-acceleration="on" launch_mode="single" multiple="false" nodisplay="true" process-pool="true" taskmanage="false" type="capp">
         <label>quickpanel</label>
         <icon>quickpanel.png</icon>