TizenRefApp-8553 IDS displayed for Apps when selecting application in App Tray

Change-Id: I3f9b99539d9f74b6306860a493c0989b86914678

diff --git a/apptray-widget-app/.cproject b/apptray-widget-app/.cproject
index 50e09976af945cfd7d853027c2695a9676fcb27c..eb803fde89df75824aceb9690e090afe6a9f08f9 100644 (file)
--- a/apptray-widget-app/.cproject
+++ b/apptray-widget-app/.cproject
@@ -27,20 +27,22 @@
                                                                <option defaultValue="gnu.cpp.compiler.debugging.level.max" id="sbi.gnu.cpp.compiler.option.debugging.level.core.1189805525" name="Debug level" superClass="sbi.gnu.cpp.compiler.option.debugging.level.core" valueType="enumerated"/>
                                                                <option defaultValue="false" id="sbi.gnu.cpp.compiler.option.misc.pic.core.1155074146" name="-fPIC option" superClass="sbi.gnu.cpp.compiler.option.misc.pic.core" valueType="boolean"/>
                                                                <option id="sbi.gnu.cpp.compiler.option.1514468710" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs">
-                                                                       <listOptionValue builtIn="false" value="wearable-4.0-emulator.core_llvm37.i386.core.app"/>
+                                                                       <listOptionValue builtIn="false" value="wearable-4.0-emulator.core.private.20170524_4_llvm37.i386.core.app"/>
                                                                </option>
                                                                <option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.1171195576" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.cpp.compiler.option.frameworks_inc.core" valueType="includePath">
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore/&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-agent&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-watch&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appfw&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/asp/&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/aul/&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/badge&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/base&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/cairo&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/calendar-service2&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/call-manager&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/chromium-ewk&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ckm&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/contacts-svc&quot;"/>
@@ -96,16 +98,23 @@
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/messaging&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/metadata-editor&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/minizip&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/msg-service&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/network&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/notification&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/nsd/&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/phonenumber-utils&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/pkgmgr&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/rua/&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/sensor&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/storage&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/system&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/telephony&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/telephony-client&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/tzsh&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ug-1&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ui&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/vconf&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/vulkan&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/widget_service&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/widget_viewer_dali&quot;"/>
@@ -133,20 +142,22 @@
                                                                <option defaultValue="gnu.c.debugging.level.max" id="sbi.gnu.c.compiler.option.debugging.level.core.1000503352" name="Debug level" superClass="sbi.gnu.c.compiler.option.debugging.level.core" valueType="enumerated"/>
                                                                <option defaultValue="false" id="sbi.gnu.c.compiler.option.misc.pic.core.737956580" name="-fPIC option" superClass="sbi.gnu.c.compiler.option.misc.pic.core" valueType="boolean"/>
                                                                <option id="sbi.gnu.c.compiler.option.1562232630" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs">
-                                                                       <listOptionValue builtIn="false" value="wearable-4.0-emulator.core_llvm37.i386.core.app"/>
+                                                                       <listOptionValue builtIn="false" value="wearable-4.0-emulator.core.private.20170524_4_llvm37.i386.core.app"/>
                                                                </option>
                                                                <option id="sbi.gnu.c.compiler.option.frameworks_inc.core.2131491148" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.c.compiler.option.frameworks_inc.core" valueType="includePath">
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore/&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-agent&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-watch&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appfw&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/asp/&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/aul/&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/badge&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/base&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/cairo&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/calendar-service2&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/call-manager&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/chromium-ewk&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ckm&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/contacts-svc&quot;"/>
@@ -202,16 +213,23 @@
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/messaging&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/metadata-editor&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/minizip&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/msg-service&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/network&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/notification&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/nsd/&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/phonenumber-utils&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/pkgmgr&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/rua/&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/sensor&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/storage&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/system&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/telephony&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/telephony-client&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/tzsh&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ug-1&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ui&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/vconf&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/vulkan&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/widget_service&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/widget_viewer_dali&quot;"/>

diff --git a/apptray-widget-app/inc/apptray_wgt_app_common_def.h b/apptray-widget-app/inc/apptray_wgt_app_common_def.h
index 057a97082e1330faa7ef2af6c0529a44a8165495..2e2939c7ff42e9fd917242e29f3e965c3d6b66ae 100644 (file)
--- a/apptray-widget-app/inc/apptray_wgt_app_common_def.h
+++ b/apptray-widget-app/inc/apptray_wgt_app_common_def.h
@@ -32,10 +32,6 @@
 
 #define ATW_DOMAIN "apptray-widget-app"
 
-#if !defined(_)
-#define _(str) gettext(str)
-#endif
-
 #undef IS_STRING_EMPTY
 #define IS_STRING_EMPTY(x) !(x && x[0] != '\0')
 

diff --git a/apptray-widget-app/src/apptray_wgt_app.c b/apptray-widget-app/src/apptray_wgt_app.c
index a0ce68a15aea71f82f28bd2af32a226ccc946277..2d92744060feefcd3fae5020c44834073a09dff7 100755 (executable)
--- a/apptray-widget-app/src/apptray_wgt_app.c
+++ b/apptray-widget-app/src/apptray_wgt_app.c
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-#include <app.h>
 #include <Elementary.h>
 #include <widget_service.h>
 #include <widget_errno.h>
@@ -22,6 +21,7 @@
 #include <bundle.h>
 #include <efl_extension.h>
 #include <system_settings.h>
+#include <app.h>
 #include <app_info.h>
 #include <app_manager.h>
 
@@ -2213,12 +2213,13 @@ static void _app_control(app_control_h service, void *data)
        }
 
        app_control_get_operation(service, &operation);
-       if (!strcmp(operation, APP_CONTROL_OPERATION_PICK)) {
-               info->launch_type = APPTRAY_WGT_APP_LAUNCH_TYPE_PICK;
-               res = _app_process_pick_operation(info);
-       } else if (!strcmp(operation, APP_CONTROL_OPERATION_MAIN)) {
+       _D("Operation [%s]", operation);
+       if (!operation || !strcmp(operation, APP_CONTROL_OPERATION_MAIN)) {
                info->launch_type = APPTRAY_WGT_APP_LAUNCH_TYPE_MAIN;
                res = _app_process_main_operation(info, app_list);
+       } else if (!strcmp(operation, APP_CONTROL_OPERATION_PICK)) {
+               info->launch_type = APPTRAY_WGT_APP_LAUNCH_TYPE_PICK;
+               res = _app_process_pick_operation(info);
        }
 
        free(app_list);
@@ -2317,7 +2318,7 @@ static void _app_lang_changed(app_event_info_h event_info, void *user_data)
        elm_language_set(locale);
        free(locale);
 
-       ret_if(info);
+       ret_if(!info);
 
        _update_win_title(info->win, _("WDS_HS_BODY_APP_SHORTCUTS_ABB"));
 

diff --git a/apptray-widget-app/src/apptray_wgt_app_item_info.c b/apptray-widget-app/src/apptray_wgt_app_item_info.c
index 5e5eba8f399d3a02500c4b6cb19772ded567fdca..377c9a4cf86ba6863446b998a30472ea1c6ffcaa 100644 (file)
--- a/apptray-widget-app/src/apptray_wgt_app_item_info.c
+++ b/apptray-widget-app/src/apptray_wgt_app_item_info.c
@@ -17,6 +17,7 @@
 #include "apptray_wgt_app_item_info.h"
 
 #include <stdlib.h>
+#include <app.h>
 #include <app_info.h>
 #include <app_manager.h>
 

diff --git a/apptray-widget/inc/apptray_widget_common_defines.h b/apptray-widget/inc/apptray_widget_common_defines.h
index 95ae9389a9ba08c9a681d2ebb294b35eaecc4cd9..e1e96fe344a8978214a2157a3cafe09f3419efa7 100644 (file)
--- a/apptray-widget/inc/apptray_widget_common_defines.h
+++ b/apptray-widget/inc/apptray_widget_common_defines.h
@@ -43,10 +43,6 @@
 
 #define ATW_DOMAIN   "apptray-widget-app"
 
-#if !defined(_)
-#define _(str) gettext(str)
-#endif
-
 #define ARRAY_ITEMS_COUNT(x) sizeof(x)/sizeof(x[0])
 
 #undef IS_STRING_EMPTY

diff --git a/apptray-widget/src/apptray_widget.c b/apptray-widget/src/apptray_widget.c
index f5f46fff5835053c9a46afb91a8bb4d92e8a0479..68e4b0bd34d5c1941c4279c1c0376354c99c581f 100755 (executable)
--- a/apptray-widget/src/apptray_widget.c
+++ b/apptray-widget/src/apptray_widget.c
@@ -19,6 +19,7 @@
 #include <app_control.h>
 #include <badge.h>
 #include <package_manager.h>
+#include <app.h>
 #include <app_info.h>
 #include <app_manager.h>
 
@@ -99,6 +100,9 @@ static bool _create_win(struct info *info);
 
 static void _update_widget_content_app_list(struct info *info);
 
+static struct info * _create_widget_instance_info(widget_context_h context, bundle *content, int w, int h);
+static void _destroy_widget_instance_info(struct info **instance_info);
+
 static widget_class_h _widget_app_create(void *user_data);
 static void _widget_app_terminate(void *user_data);
 static void _widget_app_lang_changed(app_event_info_h event_info, void *user_data);
@@ -856,6 +860,16 @@ static struct info * _create_widget_instance_info(widget_context_h context, bund
        return instance_info;
 }
 
+static void _destroy_widget_instance_info(struct info **instance_info)
+{
+       DEL_EVAS_OBJECT((*instance_info)->win);
+       free((*instance_info)->id);
+    _free_content_list((*instance_info));
+       bundle_free((*instance_info)->content);
+
+       FREE((*instance_info));
+}
+
 static bool _create_ui_content(struct info *info)
 {
        retv_if(!_create_win(info), false);
@@ -899,9 +913,13 @@ static int _widget_instance_create(widget_context_h context, bundle *content, in
 
        struct info *instance_info = _create_widget_instance_info(context, content, w, h);
        retv_if(!instance_info, WIDGET_ERROR_FAULT);
-       s_list = eina_list_append(s_list, instance_info);
 
-       retv_if(!_create_ui_content(instance_info), WIDGET_ERROR_FAULT);
+       if (!_create_ui_content(instance_info)) {
+               _E("_create_ui_content() failed!");
+               _destroy_widget_instance_info(&instance_info);
+               return WIDGET_ERROR_FAULT;
+       }
+       s_list = eina_list_append(s_list, instance_info);
 
        _init_slots_data(instance_info);
 
@@ -925,12 +943,7 @@ static int _widget_instance_destroy(widget_context_h context, widget_app_destroy
 
        s_list = eina_list_remove(s_list, instance_info);
 
-       DEL_EVAS_OBJECT(instance_info->win);
-       free(instance_info->id);
-    _free_content_list(instance_info);
-       bundle_free(instance_info->content);
-
-       free(instance_info);
+       _destroy_widget_instance_info(&instance_info);
 
        return WIDGET_ERROR_NONE;
 }