[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdelibs/arts/knotify
From:       Luboš Luňák <l.lunak () kde ! org>
Date:       2005-03-17 15:26:04
Message-ID: 20050317152604.851171853F () office ! kde ! org
[Download RAW message or body]

CVS commit by lunakl: 

Show the dialog as the last thing, because it blocks (which means it's
more or less broken anyway, as it shouldn't block at all).
BUG: 98960


  M +7 -8      knotify.cpp   1.96


--- kdelibs/arts/knotify/knotify.cpp  #1.95:1.96
@@ -389,9 +389,6 @@ void KNotify::notify(const QString &even
         notifyBySound( sound, fromApp, eventId );
 
-    if ( present & KNotifyClient::PassivePopup )
-        notifyByPassivePopup( text, fromApp, checkWinId( fromApp, winId ));
-
-    else if ( present & KNotifyClient::Messagebox )
-        notifyByMessagebox( text, level, checkWinId( fromApp, winId ));
+    if ( present & KNotifyClient::Execute )
+        notifyByExecute( commandline, event, fromApp, text, winId, eventId );
 
     if ( present & KNotifyClient::Logfile ) // && QFile(file).isWritable()
@@ -401,10 +398,12 @@ void KNotify::notify(const QString &even
         notifyByStderr( text );
 
-    if ( present & KNotifyClient::Execute )
-        notifyByExecute( commandline, event, fromApp, text, winId, eventId );
-
     if ( present & KNotifyClient::Taskbar )
         notifyByTaskbar( checkWinId( fromApp, winId ));
 
+    if ( present & KNotifyClient::PassivePopup )
+        notifyByPassivePopup( text, fromApp, checkWinId( fromApp, winId ));
+    else if ( present & KNotifyClient::Messagebox )
+        notifyByMessagebox( text, level, checkWinId( fromApp, winId ));
+
     QByteArray qbd;
     QDataStream ds(qbd, IO_WriteOnly);


[prev in list] [next in list] [prev in thread] [next in thread]