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

List:       kde-commits
Subject:    KDE/kdelibs/kinit
From:       David Faure <faure () kde ! org>
Date:       2009-05-22 11:44:09
Message-ID: 1242992649.667330.29232.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 971332 by dfaure:

new method in the dbus interface: terminate_kdeinit. To be used by the kdepimlibs \
unittest for proper cleanup.


 M  +12 -0     klauncher.cpp  
 M  +1 -0      klauncher.h  
 M  +6 -0      klauncher_adaptor.cpp  
 M  +1 -0      klauncher_adaptor.h  


--- trunk/KDE/kdelibs/kinit/klauncher.cpp #971331:971332
@@ -754,6 +754,9 @@
    else
    {
       service = KService::serviceByDesktopPath(serviceName);
+      // TODO?
+      //if (!service)
+      //    service = KService::serviceByStorageId(serviceName); // This method \
should be named start_service_by_storage_id ideally...  }
    if (!service)
    {
@@ -1299,4 +1302,13 @@
 }
 #endif
 
+void KLauncher::terminate_kdeinit()
+{
+    kDebug(7016);
+    klauncher_header request_header;
+    request_header.cmd = LAUNCHER_TERMINATE_KDEINIT;
+    request_header.arg_length = 0;
+    write(kdeinitSocket, &request_header, sizeof(request_header));
+}
+
 #include "klauncher.moc"
--- trunk/KDE/kdelibs/kinit/klauncher.h #971331:971332
@@ -245,6 +245,7 @@
     pid_t requestSlave(const QString &protocol, const QString &host,
                        const QString &app_socket, QString &error);
     void waitForSlave(int pid, const QDBusMessage &msg);
+    void terminate_kdeinit();
 
 public Q_SLOTS:
    void slotAutoStart();
--- trunk/KDE/kdelibs/kinit/klauncher_adaptor.cpp #971331:971332
@@ -152,4 +152,10 @@
     static_cast<KLauncher *>(parent())->waitForSlave(pid, msg);
 }
 
+void KLauncherAdaptor::terminate_kdeinit()
+{
+    KLauncher *p = static_cast<KLauncher *>(parent());
+    p->terminate_kdeinit();
+}
+
 #include "klauncher_adaptor.moc"
--- trunk/KDE/kdelibs/kinit/klauncher_adaptor.h #971331:971332
@@ -58,6 +58,7 @@
     // Deprecated, to be removed in KDE5.
     int start_service_by_name(const QString &serviceName, const QStringList &urls, \
const QStringList &envs, const QString &startup_id, bool blind, const QDBusMessage \
&msg, QString &dbusServiceName, QString &error, int &pid);  void waitForSlave(int \
pid, const QDBusMessage &msg); +    void terminate_kdeinit();
 Q_SIGNALS: // SIGNALS
     void autoStart0Done();
     void autoStart1Done();


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