diff --git a/CMakeLists.txt b/CMakeLists.txt index e717aad37..2339436cc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -153,7 +153,7 @@ option( BUILD_KLIPPER "Build klipper" ${BUILD_ALL} ) option( BUILD_KMENUEDIT "Build kmenuedit" ${BUILD_ALL} ) option( BUILD_TDEPRINT "Build tdeprint" ${BUILD_ALL} ) option( BUILD_KPERSONALIZER "Build kpersonalizer" ${BUILD_ALL} ) -option( BUILD_KDEPASSWD "Build kdepasswd" ${BUILD_ALL} ) +option( BUILD_TDEPASSWD "Build tdepasswd" ${BUILD_ALL} ) option( BUILD_KTIP "Build ktip" ${BUILD_ALL} ) option( BUILD_KDEEJECT "Build kdeeject" ${BUILD_ALL} ) option( BUILD_KDIALOG "Build kdialog" ${BUILD_ALL} ) @@ -232,7 +232,7 @@ tde_conditional_add_subdirectory( BUILD_KLIPPER klipper ) tde_conditional_add_subdirectory( BUILD_KMENUEDIT kmenuedit ) tde_conditional_add_subdirectory( BUILD_TDEPRINT tdeprint ) tde_conditional_add_subdirectory( BUILD_KPERSONALIZER kpersonalizer ) -tde_conditional_add_subdirectory( BUILD_KDEPASSWD kdepasswd ) +tde_conditional_add_subdirectory( BUILD_TDEPASSWD tdepasswd ) tde_conditional_add_subdirectory( BUILD_KTIP ktip ) tde_conditional_add_subdirectory( BUILD_KDEEJECT kdeeject ) tde_conditional_add_subdirectory( BUILD_KDIALOG kdialog ) diff --git a/README b/README index c429c4be9..01e295240 100644 --- a/README +++ b/README @@ -114,7 +114,7 @@ libraries. Here is an overview of the directories: The KDE session manager (saves program status on login, restarts those program at the next login). -* kdepasswd +* tdepasswd A KDE frontend for passwd. Also contains the "Password & User Information" KCM. * ksplashml diff --git a/kdepasswd/Makefile.am b/kdepasswd/Makefile.am deleted file mode 100644 index 3a5c6e626..000000000 --- a/kdepasswd/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ - -SUBDIRS = kcm - -bin_PROGRAMS = kdepasswd -kdepasswd_SOURCES = kdepasswd.cpp passwd.cpp passwddlg.cpp -kdepasswd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -kdepasswd_LDADD = $(LIB_KIO) - -METASOURCES = AUTO -AM_CPPFLAGS= -I$(top_srcdir)/libkonq $(all_includes) -noinst_HEADERS = passwd.h passwddlg.h - -xdg_apps_DATA = kdepasswd.desktop - -messages: - $(XGETTEXT) $(kdepasswd_SOURCES) -o $(podir)/kdepasswd.pot - diff --git a/kdepasswd/README b/kdepasswd/README deleted file mode 100644 index 50bbe54fd..000000000 --- a/kdepasswd/README +++ /dev/null @@ -1,3 +0,0 @@ -kdepasswd: A KDE front end to the Unix passwd command. - -Please report bugs to Geert Jansen diff --git a/kdepasswd/CMakeLists.txt b/tdepasswd/CMakeLists.txt similarity index 73% rename from kdepasswd/CMakeLists.txt rename to tdepasswd/CMakeLists.txt index 887362b28..c711ea628 100644 --- a/kdepasswd/CMakeLists.txt +++ b/tdepasswd/CMakeLists.txt @@ -25,13 +25,13 @@ link_directories( ##### other data ################################ -install( FILES kdepasswd.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +install( FILES tdepasswd.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) -##### kdepasswd (executable) #################### +##### tdepasswd (executable) #################### -tde_add_executable( kdepasswd AUTOMOC - SOURCES kdepasswd.cpp passwd.cpp passwddlg.cpp +tde_add_executable( tdepasswd AUTOMOC + SOURCES tdepasswd.cpp passwd.cpp passwddlg.cpp LINK tdeio-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kdepasswd/LICENSE.readme b/tdepasswd/LICENSE.readme similarity index 99% rename from kdepasswd/LICENSE.readme rename to tdepasswd/LICENSE.readme index 23b7877d0..d3840e950 100644 --- a/kdepasswd/LICENSE.readme +++ b/tdepasswd/LICENSE.readme @@ -1,4 +1,4 @@ -kdepasswd - a KDE front end to passwd +tdepasswd - a KDE front end to passwd Copyright (c) 1999,2000 by Geert Jansen diff --git a/tdepasswd/Makefile.am b/tdepasswd/Makefile.am new file mode 100644 index 000000000..65261086d --- /dev/null +++ b/tdepasswd/Makefile.am @@ -0,0 +1,17 @@ + +SUBDIRS = kcm + +bin_PROGRAMS = tdepasswd +tdepasswd_SOURCES = tdepasswd.cpp passwd.cpp passwddlg.cpp +tdepasswd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +tdepasswd_LDADD = $(LIB_KIO) + +METASOURCES = AUTO +AM_CPPFLAGS= -I$(top_srcdir)/libkonq $(all_includes) +noinst_HEADERS = passwd.h passwddlg.h + +xdg_apps_DATA = tdepasswd.desktop + +messages: + $(XGETTEXT) $(tdepasswd_SOURCES) -o $(podir)/tdepasswd.pot + diff --git a/tdepasswd/README b/tdepasswd/README new file mode 100644 index 000000000..bac44cd6a --- /dev/null +++ b/tdepasswd/README @@ -0,0 +1,3 @@ +tdepasswd: A KDE front end to the Unix passwd command. + +Please report bugs to Geert Jansen diff --git a/kdepasswd/kcm/CMakeLists.txt b/tdepasswd/kcm/CMakeLists.txt similarity index 100% rename from kdepasswd/kcm/CMakeLists.txt rename to tdepasswd/kcm/CMakeLists.txt diff --git a/kdepasswd/kcm/Makefile.am b/tdepasswd/kcm/Makefile.am similarity index 100% rename from kdepasswd/kcm/Makefile.am rename to tdepasswd/kcm/Makefile.am diff --git a/kdepasswd/kcm/README b/tdepasswd/kcm/README similarity index 95% rename from kdepasswd/kcm/README rename to tdepasswd/kcm/README index 467862f48..b6c9f28ef 100644 --- a/kdepasswd/kcm/README +++ b/tdepasswd/kcm/README @@ -3,7 +3,7 @@ Thu Jan 29 00:34:49 CET 2004 Frans Englich KCM useraccount is a merge of the former tdebase/kcontrol/email -and tdeutils/kdepasswd/userinfo/. They existed in KDE 3.1, at least. +and tdeutils/tdepasswd/userinfo/. They existed in KDE 3.1, at least. As a bonus, on top of saving the stuff with KEMailSettings it tries also to save the realname to /etc/passwd. This is done via chfn, wrapped diff --git a/kdepasswd/kcm/chfacedlg.cpp b/tdepasswd/kcm/chfacedlg.cpp similarity index 100% rename from kdepasswd/kcm/chfacedlg.cpp rename to tdepasswd/kcm/chfacedlg.cpp diff --git a/kdepasswd/kcm/chfacedlg.h b/tdepasswd/kcm/chfacedlg.h similarity index 100% rename from kdepasswd/kcm/chfacedlg.h rename to tdepasswd/kcm/chfacedlg.h diff --git a/kdepasswd/kcm/chfnprocess.cpp b/tdepasswd/kcm/chfnprocess.cpp similarity index 98% rename from kdepasswd/kcm/chfnprocess.cpp rename to tdepasswd/kcm/chfnprocess.cpp index 56bd546da..72c1599fc 100644 --- a/kdepasswd/kcm/chfnprocess.cpp +++ b/tdepasswd/kcm/chfnprocess.cpp @@ -10,7 +10,7 @@ /** * @file Change a user's 'finger' information, specifically their full name. - * derived from kdepasswd. + * derived from tdepasswd. */ #include diff --git a/kdepasswd/kcm/chfnprocess.h b/tdepasswd/kcm/chfnprocess.h similarity index 100% rename from kdepasswd/kcm/chfnprocess.h rename to tdepasswd/kcm/chfnprocess.h diff --git a/kdepasswd/kcm/kcm_useraccount.desktop b/tdepasswd/kcm/kcm_useraccount.desktop similarity index 100% rename from kdepasswd/kcm/kcm_useraccount.desktop rename to tdepasswd/kcm/kcm_useraccount.desktop diff --git a/kdepasswd/kcm/kcm_useraccount.kcfg b/tdepasswd/kcm/kcm_useraccount.kcfg similarity index 100% rename from kdepasswd/kcm/kcm_useraccount.kcfg rename to tdepasswd/kcm/kcm_useraccount.kcfg diff --git a/kdepasswd/kcm/kcm_useraccount_pass.kcfg b/tdepasswd/kcm/kcm_useraccount_pass.kcfg similarity index 100% rename from kdepasswd/kcm/kcm_useraccount_pass.kcfg rename to tdepasswd/kcm/kcm_useraccount_pass.kcfg diff --git a/kdepasswd/kcm/main.cpp b/tdepasswd/kcm/main.cpp similarity index 98% rename from kdepasswd/kcm/main.cpp rename to tdepasswd/kcm/main.cpp index 18ecbb445..48478c306 100644 --- a/kdepasswd/kcm/main.cpp +++ b/tdepasswd/kcm/main.cpp @@ -108,12 +108,12 @@ KCMUserAccount::KCMUserAccount( TQWidget *parent, const char *name, void KCMUserAccount::slotChangePassword() { TDEProcess *proc = new TDEProcess; - TQString bin = TDEGlobal::dirs()->findExe("kdepasswd"); + TQString bin = TDEGlobal::dirs()->findExe("tdepasswd"); if ( !bin ) { - kdDebug() << "kcm_useraccount: kdepasswd was not found." << endl; + kdDebug() << "kcm_useraccount: tdepasswd was not found." << endl; KMessageBox::sorry ( this, i18n( "A program error occurred: the internal " - "program 'kdepasswd' could not be found. You will " + "program 'tdepasswd' could not be found. You will " "not be able to change your password.")); _mw->btnChangePassword->setEnabled(false); diff --git a/kdepasswd/kcm/main.h b/tdepasswd/kcm/main.h similarity index 100% rename from kdepasswd/kcm/main.h rename to tdepasswd/kcm/main.h diff --git a/kdepasswd/kcm/main_widget.ui b/tdepasswd/kcm/main_widget.ui similarity index 100% rename from kdepasswd/kcm/main_widget.ui rename to tdepasswd/kcm/main_widget.ui diff --git a/kdepasswd/kcm/pass.kcfgc b/tdepasswd/kcm/pass.kcfgc similarity index 100% rename from kdepasswd/kcm/pass.kcfgc rename to tdepasswd/kcm/pass.kcfgc diff --git a/kdepasswd/kcm/pics/Apple.png b/tdepasswd/kcm/pics/Apple.png similarity index 100% rename from kdepasswd/kcm/pics/Apple.png rename to tdepasswd/kcm/pics/Apple.png diff --git a/kdepasswd/kcm/pics/BeachBall.png b/tdepasswd/kcm/pics/BeachBall.png similarity index 100% rename from kdepasswd/kcm/pics/BeachBall.png rename to tdepasswd/kcm/pics/BeachBall.png diff --git a/kdepasswd/kcm/pics/Blowfish.png b/tdepasswd/kcm/pics/Blowfish.png similarity index 100% rename from kdepasswd/kcm/pics/Blowfish.png rename to tdepasswd/kcm/pics/Blowfish.png diff --git a/kdepasswd/kcm/pics/Bug.png b/tdepasswd/kcm/pics/Bug.png similarity index 100% rename from kdepasswd/kcm/pics/Bug.png rename to tdepasswd/kcm/pics/Bug.png diff --git a/kdepasswd/kcm/pics/Butterfly.png b/tdepasswd/kcm/pics/Butterfly.png similarity index 100% rename from kdepasswd/kcm/pics/Butterfly.png rename to tdepasswd/kcm/pics/Butterfly.png diff --git a/kdepasswd/kcm/pics/CMakeLists.txt b/tdepasswd/kcm/pics/CMakeLists.txt similarity index 100% rename from kdepasswd/kcm/pics/CMakeLists.txt rename to tdepasswd/kcm/pics/CMakeLists.txt diff --git a/kdepasswd/kcm/pics/CREDITS b/tdepasswd/kcm/pics/CREDITS similarity index 100% rename from kdepasswd/kcm/pics/CREDITS rename to tdepasswd/kcm/pics/CREDITS diff --git a/kdepasswd/kcm/pics/Car.png b/tdepasswd/kcm/pics/Car.png similarity index 100% rename from kdepasswd/kcm/pics/Car.png rename to tdepasswd/kcm/pics/Car.png diff --git a/kdepasswd/kcm/pics/Cow.png b/tdepasswd/kcm/pics/Cow.png similarity index 100% rename from kdepasswd/kcm/pics/Cow.png rename to tdepasswd/kcm/pics/Cow.png diff --git a/kdepasswd/kcm/pics/Daemon.png b/tdepasswd/kcm/pics/Daemon.png similarity index 100% rename from kdepasswd/kcm/pics/Daemon.png rename to tdepasswd/kcm/pics/Daemon.png diff --git a/kdepasswd/kcm/pics/Dog.png b/tdepasswd/kcm/pics/Dog.png similarity index 100% rename from kdepasswd/kcm/pics/Dog.png rename to tdepasswd/kcm/pics/Dog.png diff --git a/kdepasswd/kcm/pics/Elephant.png b/tdepasswd/kcm/pics/Elephant.png similarity index 100% rename from kdepasswd/kcm/pics/Elephant.png rename to tdepasswd/kcm/pics/Elephant.png diff --git a/kdepasswd/kcm/pics/Flower.png b/tdepasswd/kcm/pics/Flower.png similarity index 100% rename from kdepasswd/kcm/pics/Flower.png rename to tdepasswd/kcm/pics/Flower.png diff --git a/kdepasswd/kcm/pics/Frog.png b/tdepasswd/kcm/pics/Frog.png similarity index 100% rename from kdepasswd/kcm/pics/Frog.png rename to tdepasswd/kcm/pics/Frog.png diff --git a/kdepasswd/kcm/pics/Ghost.png b/tdepasswd/kcm/pics/Ghost.png similarity index 100% rename from kdepasswd/kcm/pics/Ghost.png rename to tdepasswd/kcm/pics/Ghost.png diff --git a/kdepasswd/kcm/pics/Guitar.png b/tdepasswd/kcm/pics/Guitar.png similarity index 100% rename from kdepasswd/kcm/pics/Guitar.png rename to tdepasswd/kcm/pics/Guitar.png diff --git a/kdepasswd/kcm/pics/Heart.png b/tdepasswd/kcm/pics/Heart.png similarity index 100% rename from kdepasswd/kcm/pics/Heart.png rename to tdepasswd/kcm/pics/Heart.png diff --git a/kdepasswd/kcm/pics/Konqui.png b/tdepasswd/kcm/pics/Konqui.png similarity index 100% rename from kdepasswd/kcm/pics/Konqui.png rename to tdepasswd/kcm/pics/Konqui.png diff --git a/kdepasswd/kcm/pics/Lion.png b/tdepasswd/kcm/pics/Lion.png similarity index 100% rename from kdepasswd/kcm/pics/Lion.png rename to tdepasswd/kcm/pics/Lion.png diff --git a/kdepasswd/kcm/pics/Makefile.am b/tdepasswd/kcm/pics/Makefile.am similarity index 100% rename from kdepasswd/kcm/pics/Makefile.am rename to tdepasswd/kcm/pics/Makefile.am diff --git a/kdepasswd/kcm/pics/Monkey.png b/tdepasswd/kcm/pics/Monkey.png similarity index 100% rename from kdepasswd/kcm/pics/Monkey.png rename to tdepasswd/kcm/pics/Monkey.png diff --git a/kdepasswd/kcm/pics/Penguin.png b/tdepasswd/kcm/pics/Penguin.png similarity index 100% rename from kdepasswd/kcm/pics/Penguin.png rename to tdepasswd/kcm/pics/Penguin.png diff --git a/kdepasswd/kcm/pics/Pig.png b/tdepasswd/kcm/pics/Pig.png similarity index 100% rename from kdepasswd/kcm/pics/Pig.png rename to tdepasswd/kcm/pics/Pig.png diff --git a/kdepasswd/kcm/pics/Rabbit.png b/tdepasswd/kcm/pics/Rabbit.png similarity index 100% rename from kdepasswd/kcm/pics/Rabbit.png rename to tdepasswd/kcm/pics/Rabbit.png diff --git a/kdepasswd/kcm/pics/Ring.png b/tdepasswd/kcm/pics/Ring.png similarity index 100% rename from kdepasswd/kcm/pics/Ring.png rename to tdepasswd/kcm/pics/Ring.png diff --git a/kdepasswd/kcm/pics/Scream.png b/tdepasswd/kcm/pics/Scream.png similarity index 100% rename from kdepasswd/kcm/pics/Scream.png rename to tdepasswd/kcm/pics/Scream.png diff --git a/kdepasswd/kcm/pics/Shark.png b/tdepasswd/kcm/pics/Shark.png similarity index 100% rename from kdepasswd/kcm/pics/Shark.png rename to tdepasswd/kcm/pics/Shark.png diff --git a/kdepasswd/kcm/pics/Splash.png b/tdepasswd/kcm/pics/Splash.png similarity index 100% rename from kdepasswd/kcm/pics/Splash.png rename to tdepasswd/kcm/pics/Splash.png diff --git a/kdepasswd/kcm/pics/Star.png b/tdepasswd/kcm/pics/Star.png similarity index 100% rename from kdepasswd/kcm/pics/Star.png rename to tdepasswd/kcm/pics/Star.png diff --git a/kdepasswd/kcm/pics/Teddybear.png b/tdepasswd/kcm/pics/Teddybear.png similarity index 100% rename from kdepasswd/kcm/pics/Teddybear.png rename to tdepasswd/kcm/pics/Teddybear.png diff --git a/kdepasswd/kcm/pics/Turtle.png b/tdepasswd/kcm/pics/Turtle.png similarity index 100% rename from kdepasswd/kcm/pics/Turtle.png rename to tdepasswd/kcm/pics/Turtle.png diff --git a/kdepasswd/kcm/settings.kcfgc b/tdepasswd/kcm/settings.kcfgc similarity index 100% rename from kdepasswd/kcm/settings.kcfgc rename to tdepasswd/kcm/settings.kcfgc diff --git a/kdepasswd/passwd.cpp b/tdepasswd/passwd.cpp similarity index 100% rename from kdepasswd/passwd.cpp rename to tdepasswd/passwd.cpp diff --git a/kdepasswd/passwd.h b/tdepasswd/passwd.h similarity index 100% rename from kdepasswd/passwd.h rename to tdepasswd/passwd.h diff --git a/kdepasswd/passwddlg.cpp b/tdepasswd/passwddlg.cpp similarity index 89% rename from kdepasswd/passwddlg.cpp rename to tdepasswd/passwddlg.cpp index 7aee3fe52..0406f75b2 100644 --- a/kdepasswd/passwddlg.cpp +++ b/tdepasswd/passwddlg.cpp @@ -13,7 +13,7 @@ #include "passwddlg.h" -KDEpasswd1Dialog::KDEpasswd1Dialog() +TDEpasswd1Dialog::TDEpasswd1Dialog() : KPasswordDialog(Password, false, 0) { setCaption(i18n("Change Password")); @@ -21,12 +21,12 @@ KDEpasswd1Dialog::KDEpasswd1Dialog() } -KDEpasswd1Dialog::~KDEpasswd1Dialog() +TDEpasswd1Dialog::~TDEpasswd1Dialog() { } -bool KDEpasswd1Dialog::checkPassword(const char *password) +bool TDEpasswd1Dialog::checkPassword(const char *password) { PasswdProcess proc(0); @@ -66,9 +66,9 @@ bool KDEpasswd1Dialog::checkPassword(const char *password) // static -int KDEpasswd1Dialog::getPassword(TQCString &password) +int TDEpasswd1Dialog::getPassword(TQCString &password) { - KDEpasswd1Dialog *dlg = new KDEpasswd1Dialog(); + TDEpasswd1Dialog *dlg = new TDEpasswd1Dialog(); int res = dlg->exec(); if (res == Accepted) password = dlg->password(); @@ -78,7 +78,7 @@ int KDEpasswd1Dialog::getPassword(TQCString &password) -KDEpasswd2Dialog::KDEpasswd2Dialog(const char *oldpass, TQCString user) +TDEpasswd2Dialog::TDEpasswd2Dialog(const char *oldpass, TQCString user) : KPasswordDialog(NewPassword, false, 0) { m_Pass = oldpass; @@ -92,12 +92,12 @@ KDEpasswd2Dialog::KDEpasswd2Dialog(const char *oldpass, TQCString user) } -KDEpasswd2Dialog::~KDEpasswd2Dialog() +TDEpasswd2Dialog::~TDEpasswd2Dialog() { } -bool KDEpasswd2Dialog::checkPassword(const char *password) +bool TDEpasswd2Dialog::checkPassword(const char *password) { PasswdProcess proc(m_User); diff --git a/kdepasswd/passwddlg.h b/tdepasswd/passwddlg.h similarity index 77% rename from kdepasswd/passwddlg.h rename to tdepasswd/passwddlg.h index 3e81856e9..88d3be2da 100644 --- a/kdepasswd/passwddlg.h +++ b/tdepasswd/passwddlg.h @@ -11,14 +11,14 @@ #include -class KDEpasswd1Dialog +class TDEpasswd1Dialog : public KPasswordDialog { Q_OBJECT public: - KDEpasswd1Dialog(); - ~KDEpasswd1Dialog(); + TDEpasswd1Dialog(); + ~TDEpasswd1Dialog(); static int getPassword(TQCString &password); @@ -27,14 +27,14 @@ protected: }; -class KDEpasswd2Dialog +class TDEpasswd2Dialog : public KPasswordDialog { Q_OBJECT public: - KDEpasswd2Dialog(const char *oldpass, TQCString user); - ~KDEpasswd2Dialog(); + TDEpasswd2Dialog(const char *oldpass, TQCString user); + ~TDEpasswd2Dialog(); protected: bool checkPassword(const char *password); diff --git a/kdepasswd/kdepasswd.cpp b/tdepasswd/tdepasswd.cpp similarity index 81% rename from kdepasswd/kdepasswd.cpp rename to tdepasswd/tdepasswd.cpp index 6f1c38aa3..7df4aaf47 100644 --- a/kdepasswd/kdepasswd.cpp +++ b/tdepasswd/tdepasswd.cpp @@ -28,7 +28,7 @@ static TDECmdLineOptions options[] = int main(int argc, char **argv) { - TDEAboutData aboutData("kdepasswd", I18N_NOOP("TDE passwd"), + TDEAboutData aboutData("tdepasswd", I18N_NOOP("TDE passwd"), VERSION, I18N_NOOP("Changes a UNIX password."), TDEAboutData::License_Artistic, "Copyright (c) 2000 Geert Jansen"); aboutData.addAuthor("Geert Jansen", I18N_NOOP("Maintainer"), @@ -40,7 +40,7 @@ int main(int argc, char **argv) if (!KUniqueApplication::start()) { - kdDebug() << "kdepasswd is already running" << endl; + kdDebug() << "tdepasswd is already running" << endl; return 0; } @@ -54,7 +54,7 @@ int main(int argc, char **argv) if (args->count()) user = args->arg(0); - /* You must be able to run "kdepasswd loginName" */ + /* You must be able to run "tdepasswd loginName" */ if ( !user.isEmpty() && user!=KUser().loginName().utf8() && !bRoot) { KMessageBox::sorry(0, i18n("You need to be root to change the password of other users.")); @@ -64,12 +64,12 @@ int main(int argc, char **argv) TQCString oldpass; if (!bRoot) { - int result = KDEpasswd1Dialog::getPassword(oldpass); - if (result != KDEpasswd1Dialog::Accepted) + int result = TDEpasswd1Dialog::getPassword(oldpass); + if (result != TDEpasswd1Dialog::Accepted) return 0; } - KDEpasswd2Dialog *dlg = new KDEpasswd2Dialog(oldpass, user); + TDEpasswd2Dialog *dlg = new TDEpasswd2Dialog(oldpass, user); dlg->exec(); diff --git a/kdepasswd/kdepasswd.desktop b/tdepasswd/tdepasswd.desktop similarity index 99% rename from kdepasswd/kdepasswd.desktop rename to tdepasswd/tdepasswd.desktop index 98a22b359..5f76f8a85 100644 --- a/kdepasswd/kdepasswd.desktop +++ b/tdepasswd/tdepasswd.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=kdepasswd +Exec=tdepasswd Icon=password Type=Application Categories=Qt;TDE;Settings; diff --git a/tdmlib/kgreeterplugin.h b/tdmlib/kgreeterplugin.h index edf67f141..925828455 100644 --- a/tdmlib/kgreeterplugin.h +++ b/tdmlib/kgreeterplugin.h @@ -106,7 +106,7 @@ public: * - Unlock: tdm unlock dialog (TODO) * - ChangeTok: tdm password change dialog (TODO) * - ExUnlock: kdesktop_lock unlock dialog - * - ExChangeTok: kdepasswd password change dialog (TODO) + * - ExChangeTok: tdepasswd password change dialog (TODO) * * The Ex* contexts exist within a running session; the talker must know * how to obtain the currently logged in user (+ domain/realm, etc.)