From 98cc024c40c41af4f64688db8e55373c5ca56676 Mon Sep 17 00:00:00 2001
From: Darrell Anderson <humanreadable@yahoo.com>
Date: Tue, 13 Mar 2012 11:29:53 -0500
Subject: [PATCH] Add ksmserver source code module name to stdout/stderr
 messages to improve readability. Fix some KDE -> TDE branding issues. (cherry
 picked from commit 5c3cfcce1ce974b6be37ea4c6f7bc7decf666383)

---
 ksmserver/main.cpp   | 10 +++++-----
 ksmserver/server.cpp | 20 ++++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/ksmserver/main.cpp b/ksmserver/main.cpp
index c116923c5..70fee78d5 100644
--- a/ksmserver/main.cpp
+++ b/ksmserver/main.cpp
@@ -158,9 +158,9 @@ void sanity_check( int argc, char* argv[] )
   {
     const char *msg_pre =
              "The following installation problem was detected\n"
-             "while trying to start KDE:"
+             "while trying to start TDE:"
              "\n\n    ";
-    const char *msg_post = "\n\nKDE is unable to start.\n";
+    const char *msg_post = "\n\nTDE is unable to start.\n";
     fputs(msg_pre, stderr);
     fprintf(stderr, msg.data(), path.data());
     fputs(msg_post, stderr);
@@ -169,7 +169,7 @@ void sanity_check( int argc, char* argv[] )
     TQCString qmsg(256+path.length());
     qmsg.sprintf(msg.data(), path.data());
     qmsg = msg_pre+qmsg+msg_post;
-    TQMessageBox::critical(0, "KDE Installation Problem!",
+    TQMessageBox::critical(0, "TDE Installation Problem!",
         TQString::fromLatin1(qmsg.data()));
     exit(255);
   }
@@ -198,7 +198,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char* argv[] )
     kapp->dcopClient()->registerAs("ksmserver", false);
     if (!kapp->dcopClient()->isRegistered())
     {
-       qWarning("Could not register with DCOPServer. Aborting.");
+       qWarning("[KSMServer] Could not register with DCOPServer. Aborting.");
        return 1;
     }
 
@@ -213,7 +213,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char* argv[] )
      * does nothing on this platform, as here the default is reversed)
      */
     if (!only_local) {
-        qWarning("--[no]local is not supported on your platform. Sorry.");
+        qWarning("[KSMServer] --[no]local is not supported on your platform. Sorry.");
     }
     only_local = false;
 #endif
diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp
index 191a5ff63..63a4313b9 100644
--- a/ksmserver/server.cpp
+++ b/ksmserver/server.cpp
@@ -435,7 +435,7 @@ Status SetAuthentication (int count, IceListenObj *listenObjs,
     TQString iceAuth = KGlobal::dirs()->findExe("iceauth");
     if (iceAuth.isEmpty())
     {
-        qWarning("KSMServer: could not find iceauth");
+        qWarning("[KSMServer] could not find iceauth");
         return 0;
     }
 
@@ -465,7 +465,7 @@ void FreeAuthenticationData(int count, IceAuthDataEntry *authDataEntries)
     TQString iceAuth = KGlobal::dirs()->findExe("iceauth");
     if (iceAuth.isEmpty())
     {
-        qWarning("KSMServer: could not find iceauth");
+        qWarning("[KSMServer] could not find iceauth");
         return;
     }
     
@@ -479,7 +479,7 @@ void FreeAuthenticationData(int count, IceAuthDataEntry *authDataEntries)
 
 static int Xio_ErrorHandler( Display * )
 {
-    qWarning("ksmserver: Fatal IO error: client killed");
+    qWarning("[KSMServer] Fatal IO error: client killed");
 
     // Don't do anything that might require the X connection
     if (the_server)
@@ -616,14 +616,14 @@ KSMServer::KSMServer( const TQString& windowManager, bool _only_local )
                          (SmPointer) this,
                          HostBasedAuthProc, 256, errormsg ) ) {
 
-        qWarning("KSMServer: could not register XSM protocol");
+        qWarning("[KSMServer] could not register XSM protocol");
     }
 
     if (!IceListenForConnections (&numTransports, &listenObjs,
                                   256, errormsg))
     {
-        qWarning("KSMServer: Error listening for connections: %s", errormsg);
-        qWarning("KSMServer: Aborting.");
+        qWarning("[KSMServer] Error listening for connections: %s", errormsg);
+        qWarning("[KSMServer] Aborting.");
         exit(1);
     }
 
@@ -642,8 +642,8 @@ KSMServer::KSMServer( const TQString& windowManager, bool _only_local )
         f = ::fopen(fName.data(), "w+");
         if (!f)
         {
-            qWarning("KSMServer: can't open %s: %s", fName.data(), strerror(errno));
-            qWarning("KSMServer: Aborting.");
+            qWarning("[KSMServer] can't open %s: %s", fName.data(), strerror(errno));
+            qWarning("[KSMServer] Aborting.");
             exit(1);
         }
         char* session_manager = IceComposeNetworkIdList(numTransports, listenObjs);
@@ -656,10 +656,10 @@ KSMServer::KSMServer( const TQString& windowManager, bool _only_local )
 
     if (only_local) {
         if (!SetAuthentication_local(numTransports, listenObjs))
-            qFatal("KSMSERVER: authentication setup failed.");
+            qFatal("[KSMServer] authentication setup failed.");
     } else {
         if (!SetAuthentication(numTransports, listenObjs, &authDataEntries))
-            qFatal("KSMSERVER: authentication setup failed.");
+            qFatal("[KSMServer] authentication setup failed.");
     }
 
     IceAddConnectionWatch (KSMWatchProc, (IcePointer) this);