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

Fixed update of qued notifications

This commit is contained in:
Patrick von Reth 2014-07-06 12:09:47 +02:00
parent f333e04334
commit a1a569b242
1 changed files with 36 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/plugins/backends/snore/snorenotifier.cpp
View File

@ -48,30 +48,48 @@ void SnoreNotifier::slotNotify(Snore::Notification notification)
if(notification.isUpdate()) if(notification.isUpdate())
{ {
NotifyWidget *w = m_widgets[notification.old().hints().privateValue(this, "id").toInt()]; if(notification.old().hints().privateValue(this, "id").isValid())
if(w->isVisible() && w->notification().isValid() && w->notification().id() == notification.old().id())
{ {
w->update(notification); NotifyWidget *w = m_widgets[notification.old().hints().privateValue(this, "id").toInt()];
notification.hints().setPrivateValue(this, "id", w->id()); if(w->isVisible() && w->notification().isValid() && w->notification().id() == notification.old().id())
startTimeout(notification);
return;
}
}
if(m_queue.isEmpty())
{
foreach (NotifyWidget *w, m_widgets)
{
if(w->acquire())
{ {
w->display(notification); qDebug() << "replacing notification" << w->notification().id() << notification.id();
w->update(notification);
notification.hints().setPrivateValue(this, "id", w->id()); notification.hints().setPrivateValue(this, "id", w->id());
startTimeout(notification); startTimeout(notification);
return; }
}
else
{
for(int i = 0; i < m_queue.length(); ++i)
{
Notification n = m_queue.at(i);
if(n.id() == notification.old().id())
{
qDebug() << "replacing qued notification" << n.id() << notification.id();
m_queue.replace(i,notification);
}
} }
} }
} }
m_queue.append(notification); else
m_timer->start(); {
if(m_queue.isEmpty())
{
foreach (NotifyWidget *w, m_widgets)
{
if(w->acquire())
{
w->display(notification);
notification.hints().setPrivateValue(this, "id", w->id());
startTimeout(notification);
return;
}
}
}
m_queue.append(notification);
m_timer->start();
}
} }
void SnoreNotifier::slotCloseNotification(Snore::Notification notification) void SnoreNotifier::slotCloseNotification(Snore::Notification notification)
@ -104,7 +122,6 @@ void SnoreNotifier::slotProcessQueue()
{ {
if(m_queue.isEmpty()) if(m_queue.isEmpty())
{ {
snoreDebug( SNORE_DEBUG ) << "queue is empty"; snoreDebug( SNORE_DEBUG ) << "queue is empty";
m_timer->stop(); m_timer->stop();
} }
@ -120,6 +137,7 @@ void SnoreNotifier::slotProcessQueue()
startTimeout(notification); startTimeout(notification);
if(m_queue.isEmpty()) if(m_queue.isEmpty())
{ {
m_timer->stop();
return; return;
} }
} }