diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-08-25 03:45:20 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-08-25 03:45:20 +0000 |
| commit | 3243d91d7fecb219e3e2fa90d4dfcc2ce957effe (patch) | |
| tree | 384c47f9f6bf81ada3b2300e06e6b604f3c630b9 | |
| parent | 7382c6fd5cc98895fee9358e6343b4a30489ff6b (diff) | |
| download | tdelibs-3243d91d.tar.gz tdelibs-3243d91d.zip | |
* Call utempter in the proper location and with the right arguments [Thanks to Ken Milmore for the patch]
* Attempt to fix FTBFS under Slackware due to incorrect Qt header ordering
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1167615 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
| -rw-r--r-- | kdecore/kconfigdialogmanager.cpp | 2 | ||||
| -rw-r--r-- | kdecore/kpty.cpp | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/kdecore/kconfigdialogmanager.cpp b/kdecore/kconfigdialogmanager.cpp index 411ed2a90..1d89bf49b 100644 --- a/kdecore/kconfigdialogmanager.cpp +++ b/kdecore/kconfigdialogmanager.cpp @@ -158,7 +158,7 @@ bool KConfigDialogManager::parseChildren(const TQWidget *widget, bool trackChang return valueChanged; TQObject *object; - for( TQPtrListIterator<TQObject> it( *listOfChildren ); + for( TQObjectListIterator it( *listOfChildren ); (object = it.current()); ++it ) { if(!object->isWidgetType()) diff --git a/kdecore/kpty.cpp b/kdecore/kpty.cpp index b6c3782c4..f6fc9d5cd 100644 --- a/kdecore/kpty.cpp +++ b/kdecore/kpty.cpp @@ -442,7 +442,9 @@ void KPty::login(const char *user, const char *remotehost) #ifdef HAVE_UTEMPTER KProcess_Utmp utmp; utmp.cmdFd = d->masterFd; - utmp << "/usr/sbin/utempter" << "-a" << d->ttyName << ""; + utmp << "/usr/lib/utempter/utempter" << "add"; + if (remotehost) + utmp << remotehost; utmp.start(KProcess::Block); Q_UNUSED(user); Q_UNUSED(remotehost); @@ -485,7 +487,7 @@ void KPty::logout() #ifdef HAVE_UTEMPTER KProcess_Utmp utmp; utmp.cmdFd = d->masterFd; - utmp << "/usr/sbin/utempter" << "-d" << d->ttyName; + utmp << "/usr/lib/utempter/utempter" << "del"; utmp.start(KProcess::Block); #elif defined(USE_LOGIN) const char *str_ptr = d->ttyName.data(); |