status-im
/
snorenotify
mirror of https://github.com/status-im/snorenotify.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

updated gntp-send

This commit is contained in:
Patrick von Reth 2014-08-01 14:28:16 +02:00
parent 6b256bcabf
commit e3003fc9be
3 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/plugins/backends/growl/growlbackend.cpp
View File

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

2
src/plugins/backends/growl/growlbackend.h
View File

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

2
thirdparty/gntp-send vendored

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