Update change log and spec for wrt-plugins-tizen_0.4.73

diff --git a/packaging/wrt-plugins-tizen.spec b/packaging/wrt-plugins-tizen.spec
index 3a2f344..a31e333 100755 (executable)
--- a/packaging/wrt-plugins-tizen.spec
+++ b/packaging/wrt-plugins-tizen.spec
@@ -1,6 +1,6 @@
 Name:       wrt-plugins-tizen
 Summary:    JavaScript plugins for WebRuntime
-Version:    0.4.72
+Version:    0.4.73
 Release:    0
 Group:      Development/Libraries
 License:    Apache License, Version 2.0

diff --git a/src/NFC/NFCDefaultAdapter.h b/src/NFC/NFCDefaultAdapter.h
index 106b2f1..8e0f746 100755 (executable)
--- a/src/NFC/NFCDefaultAdapter.h
+++ b/src/NFC/NFCDefaultAdapter.h
@@ -63,12 +63,13 @@ public:
        void unsetExclusiveMode();
        bool isSupported();
        void deinitialze();
-private:
        /**
      * Initialize NFC.
      */
        int initialize();
 
+private:
+
        std::vector<NFCAdapter *> m_NFCTagListeners;
        std::vector<NFCAdapter *> m_NFCTargetListeners;
         

diff --git a/src/Systeminfo/EventWatchSysteminfo.cpp b/src/Systeminfo/EventWatchSysteminfo.cpp
index 1da11d0..a34a638 100755 (executable)
--- a/src/Systeminfo/EventWatchSysteminfo.cpp
+++ b/src/Systeminfo/EventWatchSysteminfo.cpp
@@ -288,13 +288,14 @@ void EventWatchSysteminfo::processGetValue()
                 for (int k=0; k<m_tmpStorageCnt; k++) {
                     if (m_propertyValue.storageInfo[k].capacity != capacity[k] || m_propertyValue.storageInfo[k].availableCapacity != availableCapacity[k]
                         || m_propertyValue.storageInfo[k].isRemovable != isRemovable[k]) {
-                        LoggerD("make callback");
+                        LoggerD("make callback / m_tmpStorageCnt : " << m_tmpStorageCnt);
                         m_cbm->callOnSuccess(tmpValue);
                         setTimer();
                         break;
                     }
                 }
             } else {
+                LoggerD("make callback / m_tmpStorageCnt : " << m_tmpStorageCnt);
                 m_cbm->callOnSuccess(tmpValue);
                 setTimer();
             }

diff --git a/src/Systeminfo/JSStorageInfo.cpp b/src/Systeminfo/JSStorageInfo.cpp
index 029a084..8034487 100755 (executable)
--- a/src/Systeminfo/JSStorageInfo.cpp
+++ b/src/Systeminfo/JSStorageInfo.cpp
@@ -95,7 +95,6 @@ JSObjectRef JSStorageInfo::createJSObject(JSContextRef context, const StoragePro
 
 JSValueRef JSStorageInfo::getProperty(JSContextRef context, JSObjectRef object, JSStringRef propertyName, JSValueRef* exception)
 {
-    LoggerD("Enter");
     JSStoragePriv *priv = static_cast<JSStoragePriv*>(JSObjectGetPrivate(object));
     if (NULL == priv) {
         LoggerE("Private object not set.");

diff --git a/src/Systeminfo/JSStorageUnitInfo.cpp b/src/Systeminfo/JSStorageUnitInfo.cpp
index 797d1b9..e71cca2 100755 (executable)
--- a/src/Systeminfo/JSStorageUnitInfo.cpp
+++ b/src/Systeminfo/JSStorageUnitInfo.cpp
@@ -102,7 +102,6 @@ JSObjectRef JSStorageUnitInfo::createJSObject(JSContextRef context, const Storag
 
 JSValueRef JSStorageUnitInfo::getProperty(JSContextRef context, JSObjectRef object, JSStringRef propertyName, JSValueRef* exception)
 {
-    LoggerD("Enter");
     JSStorageUnitPriv *priv = static_cast<JSStorageUnitPriv*>(JSObjectGetPrivate(object));
     if (NULL == priv) {
         LoggerE("Private object not set.");

diff --git a/src/Systeminfo/Systeminfo.cpp b/src/Systeminfo/Systeminfo.cpp
index 3a557e3..ebbff1b 100755 (executable)
--- a/src/Systeminfo/Systeminfo.cpp
+++ b/src/Systeminfo/Systeminfo.cpp
@@ -84,8 +84,17 @@ void NetworkValueCallback(const char* ipv4_address, const char* ipv6_address, vo
     }
 }
 
+void StorageValueVconfCallback(keynode_t *node, void *event_ptr)
+{
+    LoggerD("enter");
+    if(event_ptr) {
+        ((Systeminfo*)event_ptr)->getWatchValue(WATCH_TYPE_STORAGE);
+    }    
+}
+
 static Eina_Bool StorageValueCallback(void* event_ptr)
 {
+    LoggerD("enter");
     if(event_ptr) {
         ((Systeminfo*)event_ptr)->getWatchValue(WATCH_TYPE_STORAGE);
     }
@@ -397,6 +406,7 @@ void Systeminfo::clearWatch(const long id)
                 break;
             case WATCH_TYPE_STORAGE:
                 if ((m_EventMgrPtr->getEventStorageList()).size() == 1) {
+                    vconf_ignore_key_changed(VCONFKEY_SYSMAN_MMC_STATUS, StorageValueVconfCallback);
                     if (m_storageTimer) {
                         ecore_timer_freeze(m_storageTimer);
                         ecore_timer_del(m_storageTimer);
@@ -506,7 +516,10 @@ void Systeminfo::getWatchValue(const int watchType)
         int sdcardState = 0;
         if(vconf_get_int(VCONFKEY_SYSMAN_MMC_STATUS, &sdcardState) == 0) {
             if(sdcardState == VCONFKEY_SYSMAN_MMC_MOUNTED) {
+                    LoggerD("mmc is mounted");
                 storageCnt++;
+                } else {
+                    LoggerD("mmc is unmounted");
             }
         }
         LoggerD("storage cnt : " << storageCnt);
@@ -719,6 +732,7 @@ void Systeminfo::OnRequestReceived(const EventWatchSysteminfoPtr& event)
             break;
         case WATCH_TYPE_STORAGE:
             if ((m_EventMgrPtr->getEventStorageList()).size() == 1) {
+                vconf_notify_key_changed(VCONFKEY_SYSMAN_MMC_STATUS, StorageValueVconfCallback, (void *)this);
                 if (!m_storageTimer) {
                     m_storageTimer = ecore_timer_add(1, StorageValueCallback, this);
                     ecore_timer_thaw(m_storageTimer);
@@ -1361,7 +1375,7 @@ PROPERTY_GET_SYSTEMINFO_DEFINITION(Network) {
             } else if (networkType == VCONFKEY_TELEPHONY_SVCTYPE_2G) {
                 Network->networkType= "2G";
             } else if (networkType == VCONFKEY_TELEPHONY_SVCTYPE_2G || networkType == VCONFKEY_TELEPHONY_SVCTYPE_2_5G_EDGE) {
-                Network->networkType= "2.5";
+                Network->networkType= "2.5G";
             } else if (networkType == VCONFKEY_TELEPHONY_SVCTYPE_3G || networkType == VCONFKEY_TELEPHONY_SVCTYPE_HSDPA) {
                 Network->networkType= "3G";
             } else if (networkType == VCONFKEY_TELEPHONY_SVCTYPE_LTE) {