← Back to branch summary

~ubuntu-branches/ubuntu/quantal/psi/quantal

« back to all changes in this revision

Viewing changes to src/psipopup.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Jan Niehusmann
  • Date: 2006-01-20 00:20:36 UTC
  • mfrom: (1.2.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20060120002036-7nw6yo6totip0ee5
Tags: 0.10-2
http://bugs.debian.org/327748
http://bugs.debian.org/204416
* Added upstream changelog (Closes: Bug#327748)
* Mention --no-gpg and --no-gpg-agent in manpage (Closes: Bug#204416)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/psipopup.cpp
436
436
        if ( !d->id.isEmpty() /*&& option.ppNoDupes*/ ) {
437
437
                PsiPopup *pp = psiPopupList->first();
438
438
                while ( pp ) {
439
 
                        if ( d->id == pp->id() ) {
 
439
                        if ( d->id == pp->id() && pp->popup() ) {
440
440
                                pp->popup()->restartHideTimer();
441
441
 
442
442
                                d->display = false;
447
447
                }
448
448
        }
449
449
 
450
 
        // do not show popups when DND
451
 
        if ( d->account->status().show() == "dnd" )
452
 
                d->display = false;
453
 
 
454
450
        if ( d->display ) {
455
451
                psiPopupList->prepend( this );
456
452
                d->popup->show();