From fb6c0ddf5945acb54627a2fcad470f67f1e751e9 Mon Sep 17 00:00:00 2001
From: Mu-Woong Lee <muwoong.lee@samsung.com>
Date: Tue, 8 Aug 2017 18:23:32 +0900
Subject: [PATCH] Remove redundant unsubscribe() calls from the publisher
 destructors

Change-Id: Ie93435561b7f832bd10db910f8dddd90299fcc00
Signed-off-by: Mu-Woong Lee <muwoong.lee@samsung.com>
---
 src/server/publisher/AlarmEvent.cpp     | 2 --
 src/server/publisher/BatteryState.cpp   | 2 --
 src/server/publisher/ChargerState.cpp   | 2 --
 src/server/publisher/DisplayState.cpp   | 2 --
 src/server/publisher/EarJackState.cpp   | 2 --
 src/server/publisher/GeofenceEvent.cpp  | 2 --
 src/server/publisher/GpsState.cpp       | 2 --
 src/server/publisher/PowerSaveState.cpp | 2 --
 src/server/publisher/UsbState.cpp       | 2 --
 src/server/publisher/UserActivity.cpp   | 1 -
 src/server/publisher/WifiState.cpp      | 2 --
 11 files changed, 21 deletions(-)

diff --git a/src/server/publisher/AlarmEvent.cpp b/src/server/publisher/AlarmEvent.cpp
index 166b2d2..5f34c2d 100644
--- a/src/server/publisher/AlarmEvent.cpp
+++ b/src/server/publisher/AlarmEvent.cpp
@@ -83,8 +83,6 @@ AlarmEvent::AlarmEvent(uid_t uid)
 
 AlarmEvent::~AlarmEvent()
 {
-	unsubscribe();
-
 	_D("Destroyed");
 }
 
diff --git a/src/server/publisher/BatteryState.cpp b/src/server/publisher/BatteryState.cpp
index 4ea4c92..3c19625 100644
--- a/src/server/publisher/BatteryState.cpp
+++ b/src/server/publisher/BatteryState.cpp
@@ -57,8 +57,6 @@ BatteryState::BatteryState(uid_t uid)
 
 BatteryState::~BatteryState()
 {
-	unsubscribe();
-
 	_D("Destroyed");
 }
 
diff --git a/src/server/publisher/ChargerState.cpp b/src/server/publisher/ChargerState.cpp
index 06f2325..f6c4da2 100644
--- a/src/server/publisher/ChargerState.cpp
+++ b/src/server/publisher/ChargerState.cpp
@@ -56,8 +56,6 @@ ChargerState::ChargerState(uid_t uid)
 
 ChargerState::~ChargerState()
 {
-	unsubscribe();
-
 	_D("Destroyed");
 }
 
diff --git a/src/server/publisher/DisplayState.cpp b/src/server/publisher/DisplayState.cpp
index 47388f3..8609227 100644
--- a/src/server/publisher/DisplayState.cpp
+++ b/src/server/publisher/DisplayState.cpp
@@ -52,8 +52,6 @@ DisplayState::DisplayState(uid_t uid)
 
 DisplayState::~DisplayState()
 {
-	unsubscribe();
-
 	_D("Destroyed");
 }
 
diff --git a/src/server/publisher/EarJackState.cpp b/src/server/publisher/EarJackState.cpp
index 4496cab..7769a27 100644
--- a/src/server/publisher/EarJackState.cpp
+++ b/src/server/publisher/EarJackState.cpp
@@ -52,8 +52,6 @@ EarJackState::EarJackState(uid_t uid)
 
 EarJackState::~EarJackState()
 {
-	unsubscribe();
-
 	_D("Destroyed");
 }
 
diff --git a/src/server/publisher/GeofenceEvent.cpp b/src/server/publisher/GeofenceEvent.cpp
index ea2cfe9..358ff73 100644
--- a/src/server/publisher/GeofenceEvent.cpp
+++ b/src/server/publisher/GeofenceEvent.cpp
@@ -71,8 +71,6 @@ GeofenceEvent::GeofenceEvent(uid_t uid) :
 
 GeofenceEvent::~GeofenceEvent()
 {
-	unsubscribe();
-
 	_D("Destroyed");
 }
 
diff --git a/src/server/publisher/GpsState.cpp b/src/server/publisher/GpsState.cpp
index ffc653a..5ee4d86 100644
--- a/src/server/publisher/GpsState.cpp
+++ b/src/server/publisher/GpsState.cpp
@@ -70,8 +70,6 @@ GpsState::GpsState(uid_t uid)
 
 GpsState::~GpsState()
 {
-	unsubscribe();
-
 	_D("Destroyed");
 }
 
diff --git a/src/server/publisher/PowerSaveState.cpp b/src/server/publisher/PowerSaveState.cpp
index e0c11fa..9e75f24 100644
--- a/src/server/publisher/PowerSaveState.cpp
+++ b/src/server/publisher/PowerSaveState.cpp
@@ -51,8 +51,6 @@ PowerSaveState::PowerSaveState(uid_t uid)
 
 PowerSaveState::~PowerSaveState()
 {
-	unsubscribe();
-
 	_D("Destroyed");
 }
 
diff --git a/src/server/publisher/UsbState.cpp b/src/server/publisher/UsbState.cpp
index 9f5bfc0..68f1207 100644
--- a/src/server/publisher/UsbState.cpp
+++ b/src/server/publisher/UsbState.cpp
@@ -56,8 +56,6 @@ UsbState::UsbState(uid_t uid)
 
 UsbState::~UsbState()
 {
-	unsubscribe();
-
 	_D("Destroyed");
 }
 
diff --git a/src/server/publisher/UserActivity.cpp b/src/server/publisher/UserActivity.cpp
index f84ecb3..1d5fb50 100644
--- a/src/server/publisher/UserActivity.cpp
+++ b/src/server/publisher/UserActivity.cpp
@@ -184,7 +184,6 @@ ActivityStationary::ActivityStationary(uid_t uid)
 
 ActivityStationary::~ActivityStationary()
 {
-	unsubscribe();
 	_D("Destroyed");
 }
 
diff --git a/src/server/publisher/WifiState.cpp b/src/server/publisher/WifiState.cpp
index cc98eb0..fb2dd4a 100644
--- a/src/server/publisher/WifiState.cpp
+++ b/src/server/publisher/WifiState.cpp
@@ -79,8 +79,6 @@ WifiState::WifiState(uid_t uid) :
 
 WifiState::~WifiState()
 {
-	unsubscribe();
-
 	_D("Destroyed");
 }
 
-- 
2.7.4