Hrvoje Senjan 2014-07-26 13:04:04 +00:00 committed by Git OBS Bridge
parent 86d76cbda7
commit 61392c13aa

View File

@ -206,7 +206,7 @@ diff -Naur kinit-5.0.0/src/kdeinit/kinit.cpp kinit-5.0.0.new/src/kdeinit/kinit.c
} }
diff -Naur kinit-5.0.0/src/klauncher/klauncher.cpp kinit-5.0.0.new/src/klauncher/klauncher.cpp diff -Naur kinit-5.0.0/src/klauncher/klauncher.cpp kinit-5.0.0.new/src/klauncher/klauncher.cpp
--- kinit-5.0.0/src/klauncher/klauncher.cpp 2014-07-01 20:31:22.000000000 +0200 --- kinit-5.0.0/src/klauncher/klauncher.cpp 2014-07-01 20:31:22.000000000 +0200
+++ kinit-5.0.0.new/src/klauncher/klauncher.cpp 2014-07-26 15:00:17.385754202 +0200 +++ kinit-5.0.0.new/src/klauncher/klauncher.cpp 2014-07-26 15:02:27.770124173 +0200
@@ -65,7 +65,7 @@ @@ -65,7 +65,7 @@
// Dispose slaves after being idle for SLAVE_MAX_IDLE seconds // Dispose slaves after being idle for SLAVE_MAX_IDLE seconds
#define SLAVE_MAX_IDLE 30 #define SLAVE_MAX_IDLE 30
@ -225,3 +225,65 @@ diff -Naur kinit-5.0.0/src/klauncher/klauncher.cpp kinit-5.0.0.new/src/klauncher
<< "cmd=" << commandToString(request_header.cmd); << "cmd=" << commandToString(request_header.cmd);
#endif #endif
@@ -782,7 +782,7 @@
}
#ifdef KLAUNCHER_VERBOSE_OUTPUT
- // qDebug() << "name=" << request->name << "dbus_name=" << request->dbus_name
+ qDebug() << "name=" << request->name << "dbus_name=" << request->dbus_name
<< "startup type=" << s_DBusStartupTypeToString[request->dbus_startup_type];
#endif
@@ -957,7 +957,7 @@
if (request->status != KLaunchRequest::Launching) {
// Request handled.
#ifdef KLAUNCHER_VERBOSE_OUTPUT
- // qDebug() << "Request handled already";
+ qDebug() << "Request handled already";
#endif
requestDone(request);
continue;
@@ -1063,8 +1063,8 @@
QString name = slaveModulePath;
#endif
- // qDebug() << "KLauncher: launching new slave " << name << " with protocol=" << protocol
- // << " args=" << arg_list << endl;
+ qDebug() << "KLauncher: launching new slave " << name << " with protocol=" << protocol
+ << " args=" << arg_list << endl;
#ifdef Q_OS_UNIX
#ifndef USE_KPROCESS_FOR_KIOSLAVES
@@ -1104,7 +1104,7 @@
requestStart(request);
pid_t pid = request->pid;
-// qDebug() << "Slave launched, pid = " << pid;
+ qDebug() << "Slave launched, pid = " << pid;
// We don't care about this request any longer....
requestDone(request);
@@ -1208,7 +1208,7 @@
#ifdef USE_KPROCESS_FOR_KIOSLAVES
QProcess *p = static_cast<QProcess *>(sender());
QByteArray _stdout = p->readAllStandardOutput();
- // qDebug() << _stdout.data();
+ qDebug() << _stdout.data();
#endif
}
@@ -1217,12 +1217,12 @@
{
#ifdef USE_KPROCESS_FOR_KIOSLAVES
QProcess *p = static_cast<QProcess *>(sender());
- // qDebug() << "process finished exitcode=" << exitCode << "exitStatus=" << exitStatus;
+ qDebug() << "process finished exitcode=" << exitCode << "exitStatus=" << exitStatus;
foreach (KLaunchRequest *request, requestList) {
if (request->process == p) {
#ifdef KLAUNCHER_VERBOSE_OUTPUT
- // qDebug() << "found KProcess, request done";
+ qDebug() << "found KProcess, request done";
#endif
if (exitCode == 0 && exitStatus == QProcess::NormalExit) {
request->status = KLaunchRequest::Done;