TDE
/
tdebase
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase
0
0
Fork 0
Code Issues Releases Wiki Activity

Add ksmserver source code module name to stdout/stderr messages to improve readability.

Browse Source 
Fix some KDE -> TDE branding issues.
pull/2/head
Darrell Anderson 14 years ago
parent df5d0a6140
commit 5c3cfcce1c
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File

14
ksmserver/main.cpp
Unescape Escape View File

@ -27,7 +27,7 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org>
static const char version[] = "0.4"; 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[] = static const KCmdLineOptions options[] =
{ {
@ -159,9 +159,9 @@ void sanity_check( int argc, char* argv[] )
{ {
const char *msg_pre = const char *msg_pre =
"The following installation problem was detected\n" "The following installation problem was detected\n"
"while trying to start KDE:" "while trying to start TDE:"
"\n\n "; "\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); fputs(msg_pre, stderr);
fprintf(stderr, msg.data(), path.data()); fprintf(stderr, msg.data(), path.data());
fputs(msg_post, stderr); fputs(msg_post, stderr);
@ -170,7 +170,7 @@ void sanity_check( int argc, char* argv[] )
TQCString qmsg(256+path.length()); TQCString qmsg(256+path.length());
qmsg.sprintf(msg.data(), path.data()); qmsg.sprintf(msg.data(), path.data());
qmsg = msg_pre+qmsg+msg_post; qmsg = msg_pre+qmsg+msg_post;
TQMessageBox::critical(0, "KDE Installation Problem!", TQMessageBox::critical(0, "TDE Installation Problem!",
TQString::fromLatin1(qmsg.data())); TQString::fromLatin1(qmsg.data()));
exit(255); exit(255);
} }
@ -180,7 +180,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char* argv[] )
{ {
sanity_check(argc, 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, version, description, KAboutData::License_BSD,
"(C) 2000, The KDE Developers"); "(C) 2000, The KDE Developers");
aboutData.addAuthor("Matthias Ettrich",0, "ettrich@kde.org"); 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); kapp->dcopClient()->registerAs("ksmserver", false);
if (!kapp->dcopClient()->isRegistered()) if (!kapp->dcopClient()->isRegistered())
{ {
tqWarning("Could not register with DCOPServer. Aborting."); tqWarning("[KSMServer] Could not register with DCOPServer. Aborting.");
return 1; 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) * does nothing on this platform, as here the default is reversed)
*/ */
if (!only_local) { 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; only_local = false;
#endif #endif

20
ksmserver/server.cpp
Unescape Escape View File

@ -435,7 +435,7 @@ Status SetAuthentication (int count, IceListenObj *listenObjs,
TQString iceAuth = KGlobal::dirs()->findExe("iceauth"); TQString iceAuth = KGlobal::dirs()->findExe("iceauth");
if (iceAuth.isEmpty()) if (iceAuth.isEmpty())
{ {
tqWarning("KSMServer: could not find iceauth"); tqWarning("[KSMServer] could not find iceauth");
return 0; return 0;
} }
@ -465,7 +465,7 @@ void FreeAuthenticationData(int count, IceAuthDataEntry *authDataEntries)
TQString iceAuth = KGlobal::dirs()->findExe("iceauth"); TQString iceAuth = KGlobal::dirs()->findExe("iceauth");
if (iceAuth.isEmpty()) if (iceAuth.isEmpty())
{ {
tqWarning("KSMServer: could not find iceauth"); tqWarning("[KSMServer] could not find iceauth");
return; return;
} }
@ -479,7 +479,7 @@ void FreeAuthenticationData(int count, IceAuthDataEntry *authDataEntries)
static int Xio_ErrorHandler( Display * ) 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 // Don't do anything that might require the X connection
if (the_server) if (the_server)
@ -617,14 +617,14 @@ KSMServer::KSMServer( const TQString& windowManager, const TQString& windowManag
(SmPointer) this, (SmPointer) this,
HostBasedAuthProc, 256, errormsg ) ) { HostBasedAuthProc, 256, errormsg ) ) {
tqWarning("KSMServer: could not register XSM protocol"); tqWarning("[KSMServer] could not register XSM protocol");
} }
if (!IceListenForConnections (&numTransports, &listenObjs, if (!IceListenForConnections (&numTransports, &listenObjs,
256, errormsg)) 256, errormsg))
{ {
tqWarning("KSMServer: Error listening for connections: %s", errormsg); tqWarning("[KSMServer] Error listening for connections: %s", errormsg);
tqWarning("KSMServer: Aborting."); tqWarning("[KSMServer] Aborting.");
exit(1); exit(1);
} }
@ -643,8 +643,8 @@ KSMServer::KSMServer( const TQString& windowManager, const TQString& windowManag
f = ::fopen(fName.data(), "w+"); f = ::fopen(fName.data(), "w+");
if (!f) if (!f)
{ {
tqWarning("KSMServer: can't open %s: %s", fName.data(), strerror(errno)); tqWarning("[KSMServer] can't open %s: %s", fName.data(), strerror(errno));
tqWarning("KSMServer: Aborting."); tqWarning("[KSMServer] Aborting.");
exit(1); exit(1);
} }
char* session_manager = IceComposeNetworkIdList(numTransports, listenObjs); char* session_manager = IceComposeNetworkIdList(numTransports, listenObjs);
@ -657,10 +657,10 @@ KSMServer::KSMServer( const TQString& windowManager, const TQString& windowManag
if (only_local) { if (only_local) {
if (!SetAuthentication_local(numTransports, listenObjs)) if (!SetAuthentication_local(numTransports, listenObjs))
tqFatal("KSMSERVER: authentication setup failed."); tqFatal("[KSMServer] authentication setup failed.");
} else { } else {
if (!SetAuthentication(numTransports, listenObjs, &authDataEntries)) if (!SetAuthentication(numTransports, listenObjs, &authDataEntries))
tqFatal("KSMSERVER: authentication setup failed."); tqFatal("[KSMServer] authentication setup failed.");
} }
IceAddConnectionWatch (KSMWatchProc, (IcePointer) this); IceAddConnectionWatch (KSMWatchProc, (IcePointer) this);

Write Preview
Loading…
Cancel
Save