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

List:       kde-commits
Subject:    branches/kdepim/enterprise4/kdelibs-4.0.83/kdeui/kernel
From:       Jaroslaw Staniek <js () iidea ! pl>
Date:       2008-06-24 14:14:26
Message-ID: 1214316866.140338.15700.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 823973 by staniek:

disable dbus workaround as we're moving to patched windbus...



 M  +8 -4      kuniqueapplication.cpp  


--- branches/kdepim/enterprise4/kdelibs-4.0.83/kdeui/kernel/kuniqueapplication.cpp \
#823972:823973 @@ -147,15 +147,19 @@
   {
      QDBusConnectionInterface* dbusService = tryToInitDBusConnection();
 
+     QString pid = QString::number(getpid()); 
      if (forceNewProcess)
-     {
-        QString pid = QString::number(getpid());
         appName = appName + '-' + pid;
-     }
 
      // Check to make sure that we're actually able to register with the D-Bus \
session  // server.
-     if (dbusService->registerService(appName) != \
QDBusConnectionInterface::ServiceRegistered) +     if (
+#ifdef Q_WS_WIN
+       dbusService->registerService(appName + ".unique-" + pid) != \
QDBusConnectionInterface::ServiceRegistered +#else
+       dbusService->registerService(appName) != \
QDBusConnectionInterface::ServiceRegistered +#endif
+       )
      {
         kError() << "KUniqueApplication: Can't setup D-Bus service. Probably already \
running."  << endl;


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