From 981176deef74b86d5a2c382152799dbab03115ef6ad5d9e5b7af3a958122b99d Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sat, 3 Jan 2015 20:21:49 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kinit?expand=0&rev=54 --- more_verbose.patch | 76 +++++----------------------------------------- 1 file changed, 7 insertions(+), 69 deletions(-) diff --git a/more_verbose.patch b/more_verbose.patch index f6beec1..5e3c45a 100644 --- a/more_verbose.patch +++ b/more_verbose.patch @@ -1,5 +1,5 @@ diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp -index 296ebfd..dedbc9c 100644 +index 3c3c913..0a59d38 100644 --- a/src/kdeinit/kinit.cpp +++ b/src/kdeinit/kinit.cpp @@ -448,7 +448,7 @@ static void reset_oom_protect() @@ -206,7 +206,7 @@ index 296ebfd..dedbc9c 100644 #endif } diff --git a/src/klauncher/klauncher.cpp b/src/klauncher/klauncher.cpp -index 31498e0..fbcb064 100644 +index 1b43293..00241e1 100644 --- a/src/klauncher/klauncher.cpp +++ b/src/klauncher/klauncher.cpp @@ -65,7 +65,7 @@ @@ -216,76 +216,14 @@ index 31498e0..fbcb064 100644 -// #define KLAUNCHER_VERBOSE_OUTPUT +#define KLAUNCHER_VERBOSE_OUTPUT - static const char *const s_DBusStartupTypeToString[] = - { "DBusNone", "DBusUnique", "DBusMulti", "ERROR" }; -@@ -617,7 +617,7 @@ KLauncher::requestStart(KLaunchRequest *request) - request_header.arg_length = requestData.length(); - - #ifdef KLAUNCHER_VERBOSE_OUTPUT -- // qDebug() << "Asking kdeinit to start" << request->name << request->arg_list -+ qDebug() << "Asking kdeinit to start" << request->name << request->arg_list - << "cmd=" << commandToString(request_header.cmd); - #endif - -@@ -782,7 +782,7 @@ KLauncher::start_service(KService::Ptr service, const QStringList &_urls, - } - - #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 @@ KLauncher::slotDequeue() - 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 @@ KLauncher::requestSlave(const QString &protocol, - 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 @@ KLauncher::requestSlave(const QString &protocol, + #include + Q_DECLARE_LOGGING_CATEGORY(KLAUNCHER) +@@ -1118,7 +1118,7 @@ KLauncher::requestSlave(const QString &protocol, requestStart(request); pid_t pid = request->pid; --// qDebug() << "Slave launched, pid = " << pid; -+ qDebug() << "Slave launched, pid = " << pid; +-// qCDebug(KLAUNCHER) << "Slave launched, pid = " << pid; ++ qCDebug(KLAUNCHER) << "Slave launched, pid = " << pid; // We don't care about this request any longer.... requestDone(request); -@@ -1208,7 +1208,7 @@ KLauncher::slotGotOutput() - #ifdef USE_KPROCESS_FOR_KIOSLAVES - QProcess *p = static_cast(sender()); - QByteArray _stdout = p->readAllStandardOutput(); -- // qDebug() << _stdout.data(); -+ qDebug() << _stdout.data(); - #endif - } - -@@ -1217,12 +1217,12 @@ KLauncher::slotFinished(int exitCode, QProcess::ExitStatus exitStatus) - { - #ifdef USE_KPROCESS_FOR_KIOSLAVES - QProcess *p = static_cast(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;