Fix TizenRefApp-8848 App Shortcuts widget isn't added

Change-Id: I19e4a5205546b8fd30836df451d33eff32079764

diff --git a/apptray-widget/src/apptray_widget.c b/apptray-widget/src/apptray_widget.c
index 68e4b0bd34d5c1941c4279c1c0376354c99c581f..55eaaa52a19cc8b3b7e04f95f63d6a07db68c7d1 100755 (executable)
--- a/apptray-widget/src/apptray_widget.c
+++ b/apptray-widget/src/apptray_widget.c
@@ -166,7 +166,8 @@ static void _check_slots_on_package_remove_callback(const char *package)
 
        EINA_LIST_FOREACH(s_list, l, item) {
                for (i = 0 ; i < ATW_SLOTS_MAX_COUNT ; i++) {
-                       if (!item->slot[i].appid || !strcmp(item->slot[i].appid, "empty")) {
+                       if (IS_STRING_EMPTY(item->slot[i].appid)
+                                       || !strcmp(item->slot[i].appid, "empty")) {
                                continue;
                        }
                        if (!strcmp(item->slot[i].pkgid, package)) {
@@ -270,7 +271,8 @@ static void _badge_changed_cb(unsigned int action, const char *appid, unsigned i
 
        EINA_LIST_FOREACH(s_list, l, item) {
                for(i = 0 ; i < ATW_SLOTS_MAX_COUNT ; i++) {
-                       if (!strcmp(item->slot[i].appid, appid)) {
+                       if (!IS_STRING_EMPTY(item->slot[i].appid)
+                                       && !strcmp(item->slot[i].appid, appid)) {
                                item->slot[i].badge_count = count;
                                _update_slot_ly_badge(&item->slot[i]);
                                _update_slot_access_object_info(&item->slot[i]);
@@ -1107,7 +1109,8 @@ static void _process_widget_instance_lang_change_event(struct info *item)
        int i;
 
        for (i = 0; i < ATW_SLOTS_MAX_COUNT; i++) {
-               if (!IS_STRING_EMPTY(item->slot[i].appid) && strcmp(item->slot[i].appid, "empty")) {
+               if (!IS_STRING_EMPTY(item->slot[i].appid)
+                               && strcmp(item->slot[i].appid, "empty")) {
                        ret = 0;
                        app_info = NULL;
                        label = NULL;

diff --git a/apptray-widget/tizen-manifest.xml b/apptray-widget/tizen-manifest.xml
index 6ce05e9725f854ef3976718a7e0fd8ae3df4cd97..dfaf9f3dbe367264075df8969cdc38de5d4a2adc 100644 (file)
--- a/apptray-widget/tizen-manifest.xml
+++ b/apptray-widget/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" package="org.tizen.apptray-widget" version="1.0.0">
     <profile name="wearable"/>
-    <widget-application appid="org.tizen.apptray-widget" exec="apptray-widget" hw-acceleration="on" main="true" update-period="0">
+    <widget-application appid="org.tizen.apptray-widget" exec="apptray-widget" hw-acceleration="on" main="true" setup-appid="org.tizen.apptray-widget-app" update-period="0">
         <label>App shortcuts</label>
         <label xml:lang="ar-ae">اختصارات التطبيقات</label>
         <label xml:lang="az-az">Proqrm qısayl</label>