merge wrt-plugins-tizen_0.2.0-3

[platform/framework/web/wrt-plugins-tizen.git] / src / standards / Tizen / Call / JSCallService.cpp

diff --git a/src/standards/Tizen/Call/JSCallService.cpp b/src/standards/Tizen/Call/JSCallService.cpp
index 039bb79..675002f 100755 (executable)
--- a/src/standards/Tizen/Call/JSCallService.cpp
+++ b/src/standards/Tizen/Call/JSCallService.cpp
@@ -20,6 +20,7 @@
 #include <CommonsJavaScript/JSCallbackManager.h>
 #include <CommonsJavaScript/Utils.h>
 #include <CommonsJavaScript/JSDOMExceptionFactory.h>
+#include <API/Call/CallDefine.h>
 #include <API/Call/CallFactory.h>
 #include <API/Call/ICallService.h>
 #include <API/Call/EventLaunchDialer.h>
@@ -68,7 +69,7 @@ JSClassDefinition JSCallService::m_classInfo =
 };
 
 JSStaticValue JSCallService::m_property[] = {
-       { "voicemailNumbers", getProperty, NULL, kJSPropertyAttributeReadOnly },
+       { STR_VOICEMAIL_NUMBERS, getProperty, NULL, kJSPropertyAttributeReadOnly },
        { 0, 0, 0, 0 }
 };
 
@@ -137,7 +138,7 @@ JSValueRef JSCallService::getProperty(JSContextRef context,
 
        try {
                Converter convert(context);
-               if(JSStringIsEqualToUTF8CString(propertyName, "voicemailNumbers")) {
+               if(JSStringIsEqualToUTF8CString(propertyName, STR_VOICEMAIL_NUMBERS)) {
                        return convert.toJSValueRef(callService->getVoicemailNumbers(), globalContext);
                }
        } catch(WrtDeviceApis::Commons::Exception) {
@@ -212,6 +213,7 @@ JSValueRef JSCallService::launchDialer(JSContextRef context, JSObjectRef object,
                if (argumentCount >= 4) {
                        event ->setExtension(converter.toString(arguments[3]));
                }
+               event->setAppId(privateData->getApplicationId());
                event->setPrivateData(StaticPointerCast<IEventPrivateData> (cbm));
                event->setForAsynchronousCall(&ResponseDispatcher::getInstance());