diff options
| author | Timothy Pearson <[email protected]> | 2014-10-18 18:35:56 -0500 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2014-10-18 18:35:56 -0500 |
| commit | 891da4b83e901780ca4becb9b6f7c9cf0fb70ffd (patch) | |
| tree | b177b8ddddf3a0e73a86e482d88e0e188c601516 /tdeioslave/media/mounthelper | |
| parent | 0c11ace605ba33feb137eca638a39c27a71e1d8d (diff) | |
| parent | d7ccc16037550f5dc9ba2db00e47ea950c3732d2 (diff) | |
| download | tdebase-891da4b83e901780ca4becb9b6f7c9cf0fb70ffd.tar.gz tdebase-891da4b83e901780ca4becb9b6f7c9cf0fb70ffd.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase
Diffstat (limited to 'tdeioslave/media/mounthelper')
| -rw-r--r-- | tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp index 5357bc68d..3f0319f9f 100644 --- a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp +++ b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp @@ -33,7 +33,9 @@ #include <kprocess.h> #include <tdestartupinfo.h> #include <kmimetype.h> +#ifdef __TDE_HAVE_TDEHWLIB #include <tdehardwaredevices.h> +#endif #include "dialog.h" #include "tdeio_media_mounthelper.h" @@ -187,6 +189,7 @@ MountHelper::MountHelper() : TDEApplication() void MountHelper::invokeEject(const TQString &device, bool quiet) { +#ifdef __TDE_HAVE_TDEHWLIB // Try TDE HW library eject first... TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); TDEGenericDevice *hwdevice = hwdevices->findByDeviceNode(device); @@ -197,6 +200,7 @@ void MountHelper::invokeEject(const TQString &device, bool quiet) ::exit(0); } } +#endif // Then fall back to tdeeject if needed TDEProcess *proc = new TDEProcess(TQT_TQOBJECT(this)); |