From 7e34fbaecf874be08fd02d00710ff3614d11d172 Mon Sep 17 00:00:00 2001
From: Patrick von Reth <patrick.vonreth@gmail.com>
Date: Sun, 24 Jul 2011 12:28:44 +0200
Subject: [PATCH] extended gntp with app icon

---
 src/core/notification/icon.cpp                            | 2 --
 src/core/snoreserver.cpp                                  | 2 +-
 .../freedesktopnotificationfrontend.cpp                   | 2 +-
 src/plugins/growl/gntp.h                                  | 8 ++++++--
 src/plugins/growl/growl_backend.cpp                       | 2 +-
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/core/notification/icon.cpp b/src/core/notification/icon.cpp
index 19745e2..ca2a537 100644
--- a/src/core/notification/icon.cpp
+++ b/src/core/notification/icon.cpp
@@ -40,11 +40,9 @@ public:
 
     SnoreIconData(const QString &url){
         if(url.startsWith(":/")){
-			qDebug()<<url<<"is resource";
 			_img = QImage(url);
 			_isLocalFile = false;
 		}else if(QFile(url).exists()){
-			qDebug()<<url<<"is local File icon";
             _isLocalFile = true;
             _localFileName = url;
 		}
diff --git a/src/core/snoreserver.cpp b/src/core/snoreserver.cpp
index 5b3d9b8..65b8682 100644
--- a/src/core/snoreserver.cpp
+++ b/src/core/snoreserver.cpp
@@ -27,7 +27,7 @@
 
 
 QString const SnoreServer::version(){
-    return "0.1.5";
+    return "0.15";
 }
 
 QString const SnoreServer::snoreTMP(){
diff --git a/src/plugins/freedesktopfrontend/freedesktopnotificationfrontend.cpp b/src/plugins/freedesktopfrontend/freedesktopnotificationfrontend.cpp
index 387027a..b165881 100644
--- a/src/plugins/freedesktopfrontend/freedesktopnotificationfrontend.cpp
+++ b/src/plugins/freedesktopfrontend/freedesktopnotificationfrontend.cpp
@@ -51,7 +51,7 @@ void FreedesktopNotification_Frontend::actionInvoked(Notification notification)
 void FreedesktopNotification_Frontend::notificationClosed(Notification notification) {
 
 	qDebug()<<"Closing Dbus notification"<<notification.id()<<"reason:"<<(int)notification.closeReason();
-	activeNotifications.take(notification.id());
+	activeNotifications.remove(notification.id());
 	emit NotificationClosed(notification.id(),notification.closeReason());
 }
 
diff --git a/src/plugins/growl/gntp.h b/src/plugins/growl/gntp.h
index 147cc31..8d49c0c 100644
--- a/src/plugins/growl/gntp.h
+++ b/src/plugins/growl/gntp.h
@@ -163,18 +163,21 @@ private:
   std::string hostname_;
   std::string port_;
   std::string password_;
+  std::string icon_;
   CryptoPP::AutoSeededRandomPool rng;
 public:
-  gntp(std::string application = "gntp-send", std::string password = "",
+  gntp(std::string application = "gntp-send", std::string icon = "" ,std::string password = "",
       std::string hostname = "localhost", std::string port = "23053") :
     application_(application),
     password_(password),
     hostname_(hostname),
-    port_(port) { }
+    port_(port),
+	icon_(icon){ }
 
   void regist(const char* name) throw (std::runtime_error) {
     std::stringstream stm;
     stm << "Application-Name: " << sanitize_text(application_) << "\r\n";
+	stm << "Application-Icon: " << sanitize_text(icon_) <<"\r\n";
     stm << "Notifications-Count: 1\r\n";
     stm << "\r\n";
     make_regist(stm, name);
@@ -185,6 +188,7 @@ public:
   void regist(const char* name) throw (std::runtime_error) {
     std::stringstream stm;
     stm << "Application-Name: " << sanitize_text(application_) << "\r\n";
+	stm << "Application-Icon: " << sanitize_text(icon_) <<"\r\n";
     stm << "Notifications-Count: 1\r\n";
     stm << "\r\n";
     make_regist(stm, name);
diff --git a/src/plugins/growl/growl_backend.cpp b/src/plugins/growl/growl_backend.cpp
index 5055c2f..10f03af 100644
--- a/src/plugins/growl/growl_backend.cpp
+++ b/src/plugins/growl/growl_backend.cpp
@@ -38,7 +38,7 @@ Growl_Backend::~Growl_Backend(){
 }
 
 void Growl_Backend::registerApplication(Application *application){
-	gntp *growl =  new gntp(application->name().toUtf8().constData());
+	gntp *growl =  new gntp(application->name().toUtf8().constData(),application->icon().localUrl().toUtf8().constData());
 	foreach(Alert *a,application->alerts()){
 		try{
 			growl->regist(a->name().toUtf8().constData());