summaryrefslogtreecommitdiffstats
path: root/ksmserver
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2012-03-13 11:29:53 -0500
committerDarrell Anderson <humanreadable@yahoo.com>2012-03-13 11:29:53 -0500
commit5c3cfcce1ce974b6be37ea4c6f7bc7decf666383 (patch)
treeffab2c58cd08ec7a85139fcc2a6f81ad63881ea7 /ksmserver
parentdf5d0a61401e5a477660c2676f14a53a760510d9 (diff)
downloadtdebase-5c3cfcce1ce974b6be37ea4c6f7bc7decf666383.tar.gz
tdebase-5c3cfcce1ce974b6be37ea4c6f7bc7decf666383.zip
Add ksmserver source code module name to stdout/stderr messages to improve readability.
Fix some KDE -> TDE branding issues.
Diffstat (limited to 'ksmserver')
-rw-r--r--ksmserver/main.cpp14
-rw-r--r--ksmserver/server.cpp20
2 files changed, 17 insertions, 17 deletions
diff --git a/ksmserver/main.cpp b/ksmserver/main.cpp
index d164bb242..5108716f3 100644
--- a/ksmserver/main.cpp
+++ b/ksmserver/main.cpp
@@ -27,7 +27,7 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org>
static const char version[] = "0.4";
-static const char description[] = I18N_NOOP( "The reliable KDE session manager that talks the standard X11R6 \nsession management protocol (XSMP)." );
+static const char description[] = I18N_NOOP( "The reliable TDE session manager that talks the standard X11R6 \nsession management protocol (XSMP)." );
static const KCmdLineOptions options[] =
{
@@ -159,9 +159,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);
@@ -170,7 +170,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);
}
@@ -180,7 +180,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char* argv[] )
{
sanity_check(argc, argv);
- KAboutData aboutData( "ksmserver", I18N_NOOP("The KDE Session Manager"),
+ KAboutData aboutData( "ksmserver", I18N_NOOP("The TDE Session Manager"),
version, description, KAboutData::License_BSD,
"(C) 2000, The KDE Developers");
aboutData.addAuthor("Matthias Ettrich",0, "ettrich@kde.org");
@@ -199,7 +199,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char* argv[] )
kapp->dcopClient()->registerAs("ksmserver", false);
if (!kapp->dcopClient()->isRegistered())
{
- tqWarning("Could not register with DCOPServer. Aborting.");
+ tqWarning("[KSMServer] Could not register with DCOPServer. Aborting.");
return 1;
}
@@ -215,7 +215,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) {
- tqWarning("--[no]local is not supported on your platform. Sorry.");
+ tqWarning("[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 da6af4943..2b6c406a0 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())
{
- tqWarning("KSMServer: could not find iceauth");
+ tqWarning("[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())
{
- tqWarning("KSMServer: could not find iceauth");
+ tqWarning("[KSMServer] could not find iceauth");
return;
}
@@ -479,7 +479,7 @@ void FreeAuthenticationData(int count, IceAuthDataEntry *authDataEntries)
static int Xio_ErrorHandler( Display * )
{
- tqWarning("ksmserver: Fatal IO error: client killed");
+ tqWarning("[KSMServer] Fatal IO error: client killed");
// Don't do anything that might require the X connection
if (the_server)
@@ -617,14 +617,14 @@ KSMServer::KSMServer( const TQString& windowManager, const TQString& windowManag
(SmPointer) this,
HostBasedAuthProc, 256, errormsg ) ) {
- tqWarning("KSMServer: could not register XSM protocol");
+ tqWarning("[KSMServer] could not register XSM protocol");
}
if (!IceListenForConnections (&numTransports, &listenObjs,
256, errormsg))
{
- tqWarning("KSMServer: Error listening for connections: %s", errormsg);
- tqWarning("KSMServer: Aborting.");
+ tqWarning("[KSMServer] Error listening for connections: %s", errormsg);
+ tqWarning("[KSMServer] Aborting.");
exit(1);
}
@@ -643,8 +643,8 @@ KSMServer::KSMServer( const TQString& windowManager, const TQString& windowManag
f = ::fopen(fName.data(), "w+");
if (!f)
{
- tqWarning("KSMServer: can't open %s: %s", fName.data(), strerror(errno));
- tqWarning("KSMServer: Aborting.");
+ tqWarning("[KSMServer] can't open %s: %s", fName.data(), strerror(errno));
+ tqWarning("[KSMServer] Aborting.");
exit(1);
}
char* session_manager = IceComposeNetworkIdList(numTransports, listenObjs);
@@ -657,10 +657,10 @@ KSMServer::KSMServer( const TQString& windowManager, const TQString& windowManag
if (only_local) {
if (!SetAuthentication_local(numTransports, listenObjs))
- tqFatal("KSMSERVER: authentication setup failed.");
+ tqFatal("[KSMServer] authentication setup failed.");
} else {
if (!SetAuthentication(numTransports, listenObjs, &authDataEntries))
- tqFatal("KSMSERVER: authentication setup failed.");
+ tqFatal("[KSMServer] authentication setup failed.");
}
IceAddConnectionWatch (KSMWatchProc, (IcePointer) this);