Sync with 3.0 : Ver. 0.0.8 to 0.0.10

Signed-off-by: Jihoon Jung <jh8801.jung@samsung.com>
Change-Id: I65c30cd2d6db91061b025676c26162d1fa2cd463

diff --git a/packaging/capi-network-smartcard.spec b/packaging/capi-network-smartcard.spec
index 2e0f2ad..0dc809e 100755 (executable)
--- a/packaging/capi-network-smartcard.spec
+++ b/packaging/capi-network-smartcard.spec
@@ -1,6 +1,6 @@
 Name:       capi-network-smartcard
 Summary:    A Smartcard library in Native API
-Version:    0.0.8
+Version:    0.0.10
 Release:    1
 Group:      Network & Connectivity/Smartcard
 License:    Apache-2.0
@@ -42,8 +42,6 @@ make %{?jobs:-j%jobs}
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}/usr/share/license/smartcard/
-cp -af %{_builddir}/%{name}-%{version}/LICENSE.APLv2 %{buildroot}/usr/share/license/smartcard/
 
 %make_install
 
@@ -54,8 +52,8 @@ cp -af %{_builddir}/%{name}-%{version}/LICENSE.APLv2 %{buildroot}/usr/share/lice
 
 %files
 %manifest capi-network-smartcard.manifest
+%license LICENSE.APLv2
 %{_libdir}/libcapi-network-smartcard.so*
-/usr/share/license/smartcard/LICENSE.APLv2
 
 %files devel
 %{_includedir}/*.h

diff --git a/src/SEService.cpp b/src/SEService.cpp
index a85bc22..6c3882f 100755 (executable)
--- a/src/SEService.cpp
+++ b/src/SEService.cpp
@@ -46,24 +46,27 @@ namespace smartcard_service_api
 
        SEService::SEService(void *user_data, serviceConnected handler)
                throw(ErrorIO &, ErrorIllegalParameter &) :
-               SEServiceHelper(), handle(-1),
-               listener(NULL), version(VERSION)
+               SEServiceHelper(), handle(-1), listener(NULL),
+               event_handler(NULL), event_handler_context(NULL),
+               proxy(NULL), version(VERSION)
        {
                initialize(user_data, handler);
        }
 
        SEService::SEService(void *user_data, SEServiceListener *listener)
                throw(ErrorIO &, ErrorIllegalParameter &) :
-               SEServiceHelper(), handle(-1),
-               handler(NULL), version(VERSION)
+               SEServiceHelper(), handle(-1), handler(NULL),
+               event_handler(NULL), event_handler_context(NULL),
+               proxy(NULL), version(VERSION)
        {
                initialize(user_data, listener);
        }
 
        SEService::SEService(void *user_data)
                throw(ErrorIO &, ErrorIllegalParameter &, ExceptionBase &) :
-               SEServiceHelper(), handle(-1),
-               handler(NULL), version(VERSION)
+               SEServiceHelper(), handle(-1), handler(NULL), listener(NULL),
+               event_handler(NULL), event_handler_context(NULL),
+               proxy(NULL), version(VERSION)
        {
                initializeSync(user_data);
        }