Update and clean up

Signed-off-by: Emanoil Kotsev <[email protected]>

1 files changed, 4 insertions, 3 deletions

diff --git a/src/daemon/NotificationsService.cpp b/src/daemon/NotificationsService.cpp
index f2992c7..9ee757b 100644
--- a/src/daemon/NotificationsService.cpp
+++ b/src/daemon/NotificationsService.cpp
@@ -30,6 +30,8 @@
 
 #define SRV_VERSION "1.1"
 #define SPEC_VERSION "1.1"
+#define NOTIFICATIONS_NAME "Notification Daemon"
+#define TRINITY_DESKTOP_PROJECT "Trinity Desktop Project"
 
 NotificationsService::NotificationsService(TQT_DBusConnection &conn)
 : org::freedesktop::NotificationsInterface(), mConnection(&conn)
@@ -46,7 +48,6 @@ void NotificationsService::closeNotifyWidget(TQ_UINT32 id, TQ_UINT32 reason) {
 
     if (notificationMap[id]) {
         notificationMap[id]->close();
-        delete notificationMap[id];
         notificationMap.remove(id);
     }
 
@@ -87,8 +88,8 @@ bool NotificationsService::ReloadSettings(TQT_DBusError& error) {
 
 bool NotificationsService::GetServerInformation(TQString& return_name, TQString& return_vendor, TQString& return_version, TQString& return_spec_version, TQT_DBusError& error) {
 
-    return_name = TQString("Notification Daemon");
-    return_vendor = TQString("Trinity Desktop Project");
+    return_name = TQString(NOTIFICATIONS_NAME);
+    return_vendor = TQString(TRINITY_DESKTOP_PROJECT);
     return_version = TQString(SRV_VERSION);
     return_spec_version = TQString(SPEC_VERSION);
     return true;