diff options
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | kdeeject/Makefile.am | 1 | ||||
| -rw-r--r-- | kdesktop/init/Templates/CDROM-Device.desktop | 2 | ||||
| -rw-r--r-- | kdesktop/init/Templates/CDWRITER-Device.desktop | 2 | ||||
| -rw-r--r-- | kdesktop/init/Templates/DVDROM-Device.desktop | 2 | ||||
| -rw-r--r-- | kdesktop/init/Templates/ZIP-Device.desktop | 2 | ||||
| -rw-r--r-- | tdeeject/CMakeLists.txt (renamed from kdeeject/CMakeLists.txt) | 2 | ||||
| -rw-r--r-- | tdeeject/Makefile.am | 1 | ||||
| -rwxr-xr-x | tdeeject/tdeeject (renamed from kdeeject/kdeeject) | 4 | ||||
| -rw-r--r-- | tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp | 6 |
10 files changed, 13 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 57cf4a860..d7504dc58 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -160,7 +160,7 @@ option( BUILD_TDEPRINT "Build tdeprint" ${BUILD_ALL} ) option( BUILD_KPERSONALIZER "Build kpersonalizer" ${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_TDEEJECT "Build tdeeject" ${BUILD_ALL} ) option( BUILD_KDIALOG "Build kdialog" ${BUILD_ALL} ) option( BUILD_KREADCONFIG "Build kreadconfig" ${BUILD_ALL} ) option( BUILD_TDESU "Build tdesu" ${BUILD_ALL} ) @@ -240,7 +240,7 @@ tde_conditional_add_subdirectory( BUILD_TDEPRINT tdeprint ) tde_conditional_add_subdirectory( BUILD_KPERSONALIZER kpersonalizer ) 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_TDEEJECT tdeeject ) tde_conditional_add_subdirectory( BUILD_KDIALOG kdialog ) tde_conditional_add_subdirectory( BUILD_KREADCONFIG kreadconfig ) tde_conditional_add_subdirectory( BUILD_TDESU tdesu ) diff --git a/kdeeject/Makefile.am b/kdeeject/Makefile.am deleted file mode 100644 index 9c4e42c8d..000000000 --- a/kdeeject/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -bin_SCRIPTS = kdeeject diff --git a/kdesktop/init/Templates/CDROM-Device.desktop b/kdesktop/init/Templates/CDROM-Device.desktop index edb19d8a1..b4201f447 100644 --- a/kdesktop/init/Templates/CDROM-Device.desktop +++ b/kdesktop/init/Templates/CDROM-Device.desktop @@ -89,4 +89,4 @@ Name[xh]=Khuphela ngaphandle Name[zh_CN]=弹出 Name[zh_TW]=退出 Name[zu]=Khipha -Exec=kdeeject %v +Exec=tdeeject %v diff --git a/kdesktop/init/Templates/CDWRITER-Device.desktop b/kdesktop/init/Templates/CDWRITER-Device.desktop index 13758ef9d..77c5d0774 100644 --- a/kdesktop/init/Templates/CDWRITER-Device.desktop +++ b/kdesktop/init/Templates/CDWRITER-Device.desktop @@ -89,4 +89,4 @@ Name[xh]=Khuphela ngaphandle Name[zh_CN]=弹出 Name[zh_TW]=退出 Name[zu]=Khipha -Exec=kdeeject %v +Exec=tdeeject %v diff --git a/kdesktop/init/Templates/DVDROM-Device.desktop b/kdesktop/init/Templates/DVDROM-Device.desktop index 005c19945..d4f272c43 100644 --- a/kdesktop/init/Templates/DVDROM-Device.desktop +++ b/kdesktop/init/Templates/DVDROM-Device.desktop @@ -89,4 +89,4 @@ Name[xh]=Khuphela ngaphandle Name[zh_CN]=弹出 Name[zh_TW]=退出 Name[zu]=Khipha -Exec=kdeeject %v +Exec=tdeeject %v diff --git a/kdesktop/init/Templates/ZIP-Device.desktop b/kdesktop/init/Templates/ZIP-Device.desktop index a93bb71c3..bec34fe73 100644 --- a/kdesktop/init/Templates/ZIP-Device.desktop +++ b/kdesktop/init/Templates/ZIP-Device.desktop @@ -89,4 +89,4 @@ Name[xh]=Khuphela ngaphandle Name[zh_CN]=弹出 Name[zh_TW]=退出 Name[zu]=Khipha -Exec=kdeeject %v +Exec=tdeeject %v diff --git a/kdeeject/CMakeLists.txt b/tdeeject/CMakeLists.txt index 08f4ce9a3..dc57412ec 100644 --- a/kdeeject/CMakeLists.txt +++ b/tdeeject/CMakeLists.txt @@ -9,4 +9,4 @@ # ################################################# -install( PROGRAMS kdeeject DESTINATION ${BIN_INSTALL_DIR} ) +install( PROGRAMS tdeeject DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/tdeeject/Makefile.am b/tdeeject/Makefile.am new file mode 100644 index 000000000..dd6d3982d --- /dev/null +++ b/tdeeject/Makefile.am @@ -0,0 +1 @@ +bin_SCRIPTS = tdeeject diff --git a/kdeeject/kdeeject b/tdeeject/tdeeject index b97ab5df6..7adb15570 100755 --- a/kdeeject/kdeeject +++ b/tdeeject/tdeeject @@ -37,7 +37,7 @@ if test -n "$udi"; then fi # Checking for stuff in the PATH is ugly with sh. -# I guess this is the reason for making this a kde app... +# I guess this is the reason for making this a TDE app... OS=`uname -s` case "$OS" in OpenBSD) @@ -58,6 +58,6 @@ if test $? -eq 0; then #dcop kdesktop default refreshIcons exit 0 elif test $quiet -eq 0; then - kdialog --title "KDE Eject" --error "Eject $device failed!" + kdialog --title "TDE Eject" --error "Eject $device failed!" fi exit 1 diff --git a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp index b07705373..5357bc68d 100644 --- a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp +++ b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp @@ -198,9 +198,9 @@ void MountHelper::invokeEject(const TQString &device, bool quiet) } } - // Then fall back to kdeeject if needed + // Then fall back to tdeeject if needed TDEProcess *proc = new TDEProcess(TQT_TQOBJECT(this)); - *proc << "kdeeject"; + *proc << "tdeeject"; if (quiet) { *proc << "-q"; @@ -271,7 +271,7 @@ static TDECmdLineOptions options[] = { "d", I18N_NOOP("Decrypt given URL"), 0 }, { "u", I18N_NOOP("Unmount given URL"), 0 }, { "m", I18N_NOOP("Mount given URL (default)"), 0 }, - { "e", I18N_NOOP("Eject given URL via kdeeject"), 0}, + { "e", I18N_NOOP("Eject given URL via tdeeject"), 0}, { "s", I18N_NOOP("Unmount and Eject given URL (necessary for some USB devices)"), 0}, {"!+URL", I18N_NOOP("media:/ URL to mount/unmount/eject/remove"), 0 }, TDECmdLineLastOption |