From kde-commits  Tue Mar 22 16:22:21 2005
From: =?utf-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= <l.lunak () kde ! org>
Date: Tue, 22 Mar 2005 16:22:21 +0000
To: kde-commits
Subject: kdelibs/kdecore
Message-Id: <20050322162221.9CDEF3C3 () office ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=111150855928445

CVS commit by lunakl: 

Stop previous startup notification for the application immediately if new one is set.
In #99205 the dcopstart-like functionality in kfmclient launches konqueror,
waits for it to register with DCOP and then it uses. And since it's kinda unreliable
when having two kfmclient's started at the same time they may both use
the same konqueror and ignore the second one.
BUG: 99205


  M +5 -0      kapplication.cpp   1.707


--- kdelibs/kdecore/kapplication.cpp  #1.706:1.707
@@ -2883,4 +2883,9 @@ QCString KApplication::startupId() const
 void KApplication::setStartupId( const QCString& startup_id )
 {
+    if( startup_id == d->startup_id )
+        return;
+#if defined Q_WS_X11
+    KStartupInfo::handleAutoAppStartedSending(); // finish old startup notification if needed
+#endif
     if( startup_id.isEmpty())
         d->startup_id = "0";