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

List:       kde-commits
Subject:    branches/KDE/3.5/kdelibs/kinit
From:       Luboš Luňák <l.lunak () kde ! org>
Date:       2005-09-30 13:39:33
Message-ID: 1128087573.887404.17076.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 465681 by lunakl:

Don't try to indirectly cause launching of kbuildsycoca from a call
that's supposed to launch kbuildsycoca.
BUG: 113203



 M  +10 -7     klauncher.cpp  


--- branches/KDE/3.5/kdelibs/kinit/klauncher.cpp #465680:465681
@@ -1143,13 +1143,16 @@
    request->startup_id = startup_id;
 #endif
    request->envs = envs;
-   // Find service, if any - strip path if needed
-   KService::Ptr service = KService::serviceByDesktopName( app.mid( app.findRev( '/' ) + 1 ));
-   if (service != NULL)
-       send_service_startup_info( request,  service,
-           startup_id, QValueList< QCString >());
-   else // no .desktop file, no startup info
-       cancel_service_startup_info( request, startup_id, envs );
+   if( app != "kbuildsycoca" ) // avoid stupid loop
+   {
+       // Find service, if any - strip path if needed
+       KService::Ptr service = KService::serviceByDesktopName( app.mid( app.findRev( '/' ) + 1 ));
+       if (service != NULL)
+           send_service_startup_info( request,  service,
+               startup_id, QValueList< QCString >());
+       else // no .desktop file, no startup info
+           cancel_service_startup_info( request, startup_id, envs );
+   }
    request->transaction = dcopClient()->beginTransaction();
    queueRequest(request);
    return true;
[prev in list] [next in list] [prev in thread] [next in thread]