status-im/snorenotify
2
0
Fork 0
mirror of https://github.com/status-im/snorenotify.git synced 2025-02-18 11:17:21 +00:00
Code Issues Projects Releases Wiki Activity

more fixes

Browse Source
This commit is contained in:
Patrick von Reth 2013-07-10 12:13:26 +02:00
parent 01b47fd6a7
commit 7fc91d819e
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/notification/notification.cpp
View File

@ -37,7 +37,7 @@ int Notification::notificationMetaID = qRegisterMetaType<Notification>();
uint Notification::notificationCount = 0; uint Notification::notificationCount = 0;
uint Notification::m_idCount; uint Notification::m_idCount = 1;
int Notification::DefaultTimeout = 10; int Notification::DefaultTimeout = 10;

9
src/plugins/backends/snarl/snarl.cpp
View File

@ -70,7 +70,11 @@ public:
break; break;
} }
} }
if(notificationID == 0)
{
qDebug() << "Snarl notification already closed" << msg->lParam;
return true;
}
Notification notification = m_snarl->snore()->getActiveNotificationByID(notificationID); Notification notification = m_snarl->snore()->getActiveNotificationByID(notificationID);
qDebug()<<"recived a Snarl callback id:"<<notificationID<< "|" << msg->lParam <<"action:"<<action<<"data:"<<data; qDebug()<<"recived a Snarl callback id:"<<notificationID<< "|" << msg->lParam <<"action:"<<action<<"data:"<<data;
NotificationEnums::CloseReasons::closeReasons reason = NotificationEnums::CloseReasons::NONE; NotificationEnums::CloseReasons::closeReasons reason = NotificationEnums::CloseReasons::NONE;
@ -216,6 +220,7 @@ void SnarlBackend::slotNotify(Notification notification){
snarlInterface->AddAction(id,a->name.toUtf8().constData(),QString("@").append(QString::number(a->id)).toUtf8().constData()); snarlInterface->AddAction(id,a->name.toUtf8().constData(),QString("@").append(QString::number(a->id)).toUtf8().constData());
} }
m_idMap[notification.id()] = id; m_idMap[notification.id()] = id;
qDebug() << "snarl" << id << notification.id();
startTimeout(notification.id(),notification.timeout()); startTimeout(notification.id(),notification.timeout());
}else{ }else{
@ -228,6 +233,8 @@ void SnarlBackend::slotNotify(Notification notification){
notification.icon().isLocalFile()?notification.icon().localUrl().toUtf8().constData():0, notification.icon().isLocalFile()?notification.icon().localUrl().toUtf8().constData():0,
!notification.icon().isLocalFile()?notification.icon().imageData().toBase64().constData():0, !notification.icon().isLocalFile()?notification.icon().imageData().toBase64().constData():0,
priority); priority);
m_idMap[notification.id()] = m_idMap[notification.updateID()];
qDebug() << "snarl update" << m_idMap[notification.updateID()] << notification.id();
startTimeout(notification.updateID(),notification.timeout()); startTimeout(notification.updateID(),notification.timeout());
} }