From 09e3ff73669ba1849ccd711a98c8dd80e2ad9679 Mon Sep 17 00:00:00 2001
From: Tomasz Marciniak <t.marciniak@samsung.com>
Date: Mon, 18 May 2015 09:11:50 +0200
Subject: [PATCH] [SystemInfo] Unregister all listeners in destructor.

[Verification] Code compiles without errors.
SystemInfo_addPropertyValueChangeListener_with_options passes.

Change-Id: Ibe408f0a3288c1df4035f80088c1e75d1bf51c6f
Signed-off-by: Tomasz Marciniak <t.marciniak@samsung.com>
---
 src/systeminfo/systeminfo_instance.cc | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/systeminfo/systeminfo_instance.cc b/src/systeminfo/systeminfo_instance.cc
index 3eced3ea..acf3af91 100644
--- a/src/systeminfo/systeminfo_instance.cc
+++ b/src/systeminfo/systeminfo_instance.cc
@@ -129,6 +129,21 @@ SysteminfoInstance::SysteminfoInstance() {
 }
 
 SysteminfoInstance::~SysteminfoInstance() {
+  LoggerD("Entered");
+  //TODO Below solution is temporary
+  //Implementation should be changed that each SysteminfoInstance object
+  //should have own SystemInfoListeners manager
+  SysteminfoUtils::UnregisterBatteryListener();
+  SysteminfoUtils::UnregisterCpuListener();
+  SysteminfoUtils::UnregisterStorageListener();
+  SysteminfoUtils::UnregisterDisplayListener();
+  SysteminfoUtils::UnregisterDeviceOrientationListener();
+  SysteminfoUtils::UnregisterLocaleListener();
+  SysteminfoUtils::UnregisterNetworkListener();
+  SysteminfoUtils::UnregisterWifiNetworkListener();
+  SysteminfoUtils::UnregisterCellularNetworkListener();
+  SysteminfoUtils::UnregisterPeripheralListener();
+  SysteminfoUtils::UnregisterMemoryListener();
 }
 
 void SysteminfoInstance::GetCapabilities(const picojson::value& args, picojson::object& out) {
-- 
2.34.1