upload tizen1.0 source

[profile/ivi/wrt-plugins-tizen.git] / src / standards / Tizen / Messaging / ConverterMessage.cpp

diff --git a/src/standards/Tizen/Messaging/ConverterMessage.cpp b/src/standards/Tizen/Messaging/ConverterMessage.cpp
index 1bc83dd..5a912a5 100755 (executable)
--- a/src/standards/Tizen/Messaging/ConverterMessage.cpp
+++ b/src/standards/Tizen/Messaging/ConverterMessage.cpp
@@ -59,9 +59,9 @@ namespace Tizen1_0 {
 
 MessageFunctions ConverterMessage::m_callbackNames[MESSAGING_MULTI_FUNTION_MAX]
 {
-       {"messagesAdded", "messagesUpdated", "messagesRemoved"},
-       {"conversationsAdded", "conversationsUpdated", "conversationsRemoved"},
-       {"foldersAdded", "foldersUpdated", "foldersRemoved"}
+       {"messagesadded", "messagesupdated", "messagesremoved"},
+       {"conversationsadded", "conversationsupdated", "conversationsremoved"},
+       {"foldersadded", "foldersupdated", "foldersremoved"}
 };
 
 ConverterMessage::ConverterMessage(JSContextRef context) :
@@ -531,8 +531,7 @@ JSValueRef ConverterMessage::toFunctionOrNull(const JSValueRef& arg)
 
     if (Validator(m_context).isCallback(arg)) {
         return arg;
-    } else if (!JSValueIsNull(m_context,
-                              arg) && !JSValueIsUndefined(m_context, arg)) {
+    } else if (!JSValueIsNull(m_context, arg) ) {
         ThrowMsg(ConversionException, "Not a function nor JS null.");
     }
     return NULL;
@@ -544,8 +543,8 @@ JSValueRef ConverterMessage::toFunction(const JSValueRef& arg)
 
     if (Validator(m_context).isCallback(arg)) {
         return arg;
-    } else if (JSValueIsNull(m_context,
-                             arg) || JSValueIsUndefined(m_context, arg)) {
+    } else if (JSValueIsNull(m_context, 
+               arg) || JSValueIsUndefined(m_context, arg)) {
         ThrowMsg(InvalidArgumentException, "JS null passed as function.");
     }
     ThrowMsg(ConversionException, "Not a function nor JS null.");