updated gntp-send

src/plugins/backends/growl/growlbackend.cpp

@@ -23,8 +23,6 @@
 #include "core/snore_p.h"
 
 
-
-
 #include <QtCore>
 #include <QTcpSocket>
 
@@ -38,7 +36,7 @@ GrowlBackend::GrowlBackend():
     SnoreBackend("Growl",false,false),
     m_id(0)
 {
-
+    s_instance = this;
 }
 
 GrowlBackend::~GrowlBackend()
@@ -47,29 +45,22 @@ GrowlBackend::~GrowlBackend()
 
 bool GrowlBackend::initialize(SnoreCore *snore)
 {
-
-    QTcpSocket qsocket;
-    qsocket.connectToHost("localhost", 23053);
-    if(qsocket.waitForConnected(100))
+    if(Growl::init((GROWL_CALLBACK)&GrowlBackend::gntpCallback) && Growl::isRunning(GROWL_TCP))
     {
-        qsocket.write(QString("GNTP/1.0\r\n").toUtf8());
-        if(qsocket.waitForReadyRead(100))
-        {
-            snoreDebug( SNORE_DEBUG ) << QString::fromUtf8(qsocket.readAll());
-            s_instance = this;
-            Growl::setCallback((GROWL_CALLBACK)&GrowlBackend::gntpCallback);
-            return SnoreBackend::initialize(snore);
-        }
+        return SnoreBackend::initialize(snore);
     }
     snoreDebug( SNORE_DEBUG ) << "Growl is not running";
     return false;
-
 }
 
 bool GrowlBackend::deinitialize()
 {
-        s_instance = NULL;
-        return SnoreBackend::deinitialize();
+    if(!Growl::shutdown())
+    {
+        return false;
+    }
+    s_instance = NULL;
+    return SnoreBackend::deinitialize();
 }
 
 void GrowlBackend::slotRegisterApplication(const Application &application)
@@ -104,7 +95,7 @@ void GrowlBackend::slotNotify(Notification notification)
     QString alert = notification.alert().name();
     snoreDebug( SNORE_DEBUG ) << "Notify Growl:" <<notification.application() << alert << Snore::toPlainText(notification.title());
 
-    GrowlNotificationData data(growl, alert.toUtf8().constData(),notification.id(),
+    GrowlNotificationData data(alert.toUtf8().constData(),notification.id(),
                                Snore::toPlainText(notification.title()).toUtf8().constData(),
                                Snore::toPlainText(notification.text()).toUtf8().constData());
 

src/plugins/backends/growl/growlbackend.h

@@ -21,7 +21,7 @@
 #define GROWL_BACKEND_H
 #include "core/plugins/snorebackend.h"
 
-#include <gntp/growl.hpp>
+#include "growl.hpp"
 #include <string>
 
 class GrowlBackend:public Snore::SnoreBackend

thirdparty/gntp-send

@@ -1 +1 @@
-Subproject commit d37b3d53b97dee6724e185fc3b413e6b0f1d64ec
+Subproject commit 20a62e3dabd121a8ecd73cabad446c13357d8b93