24 lines
737 B
Diff
24 lines
737 B
Diff
--- kdelibs/kdesu/client.cpp 2008/01/04 09:09:11 757128
|
|
+++ kdelibs/kdesu/client.cpp 2008/05/20 14:24:27 810350
|
|
@@ -55,7 +55,7 @@
|
|
:d(new KDEsuClientPrivate)
|
|
{
|
|
#ifdef Q_WS_X11
|
|
- QByteArray display(getenv("DISPLAY"));
|
|
+ QString display = QString::fromAscii(qgetenv("DISPLAY"));
|
|
if (display.isEmpty())
|
|
{
|
|
kWarning(900) << k_lineinfo << "$DISPLAY is not set\n";
|
|
@@ -63,10 +63,7 @@
|
|
}
|
|
|
|
// strip the screen number from the display
|
|
- while (QChar::fromLatin1(display.at(display.count() - 1)).isDigit())
|
|
- display.chop(1);
|
|
- if (display.endsWith('.'))
|
|
- display.chop(1);
|
|
+ display.replace(QRegExp("\\.[0-9]+$"), "");
|
|
#elif defined(Q_WS_QWS)
|
|
QByteArray display("QWS");
|
|
#else
|