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

make freedesktop backend compile again

This commit is contained in:
Patrick von Reth 2014-01-12 02:34:24 +01:00
parent 072736d832
commit 3f9e56c9ed
2 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/plugins/backends/freedesktop/freedesktopnotification_backend.cpp
View File

@ -3,6 +3,8 @@
#include <QtGlobal> #include <QtGlobal>
#include <QDebug> #include <QDebug>
#include "core/notification/notification.h" #include "core/notification/notification.h"
#include "core/notification/notification_p.h"
#include "core/snore_p.h"
#include <QtCore> #include <QtCore>
#include <QImage> #include <QImage>
#include "fredesktopnotification.h" #include "fredesktopnotification.h"
@ -34,16 +36,6 @@ bool FreedesktopBackend::init(SnoreCore *snore){
return SnoreBackend::init(snore); return SnoreBackend::init(snore);
} }
void FreedesktopBackend::slotRegisterApplication ( Application *application )
{
Q_UNUSED ( application );
}
void FreedesktopBackend::slotUnregisterApplication ( Application *application )
{
Q_UNUSED ( application );
}
void FreedesktopBackend::slotNotify ( Notification noti ) void FreedesktopBackend::slotNotify ( Notification noti )
{ {
QStringList actions; QStringList actions;
@ -51,10 +43,6 @@ void FreedesktopBackend::slotNotify ( Notification noti )
{ {
actions << QString::number(k) << noti.actions()[k]->name; actions << QString::number(k) << noti.actions()[k]->name;
} }
QVariantMap hints; QVariantMap hints;
if(noti.icon().isValid()) if(noti.icon().isValid())
{ {
@ -66,7 +54,7 @@ void FreedesktopBackend::slotNotify ( Notification noti )
{ {
hints["urgency"] = (char)noti.priority()+1; hints["urgency"] = (char)noti.priority()+1;
} }
qDebug() << "hints" << hints;
uint updateId = 0; uint updateId = 0;
if(noti.updateID() != 0) if(noti.updateID() != 0)
@ -96,15 +84,19 @@ void FreedesktopBackend::slotNotify ( Notification noti )
void FreedesktopBackend::slotActionInvoked(const uint &id, const QString &actionID){ void FreedesktopBackend::slotActionInvoked(const uint &id, const QString &actionID){
Notification noti = getActiveNotificationByID(m_dbusIdMap[id]); Notification noti = getActiveNotificationByID(m_dbusIdMap[id]);
if(!noti.isValid()) if(!noti.isValid())
{
return; return;
noti.setActionInvoked ( actionID.toInt() ); }
snore()->notificationActionInvoked ( noti ); noti.data()->setActionInvoked ( actionID.toInt() );
snore()->d()->notificationActionInvoked ( noti );
} }
void FreedesktopBackend::slotCloseNotification ( Notification notification ) void FreedesktopBackend::slotCloseNotification ( Notification notification )
{ {
if(!m_snoreIdMap.contains(notification.id())) if(!m_snoreIdMap.contains(notification.id()))
{
return; return;
}
uint id = m_snoreIdMap.take(notification.id()); uint id = m_snoreIdMap.take(notification.id());
m_dbusIdMap.remove(id); m_dbusIdMap.remove(id);
m_interface->CloseNotification(id); m_interface->CloseNotification(id);

2
src/plugins/backends/freedesktop/freedesktopnotification_backend.h
View File

@ -15,8 +15,6 @@ public:
public slots: public slots:
void slotNotify( Snore::Notification notification ); void slotNotify( Snore::Notification notification );
void slotCloseNotification ( Snore::Notification notification ); void slotCloseNotification ( Snore::Notification notification );
void slotRegisterApplication ( Snore::Application *application );
void slotUnregisterApplication ( Snore::Application *application );
void slotActionInvoked(const uint &id,const QString &actionID); void slotActionInvoked(const uint &id,const QString &actionID);
void slotNotificationClosed ( const uint &id,const uint &reason ); void slotNotificationClosed ( const uint &id,const uint &reason );