Attachment #2208 for bug #2110

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 2110
Collapse All | Expand All




#include <kprocess.h>
#include <tdestartupinfo.h>
#include <kmimetype.h>
#ifdef COMPILE_TDEHARDWAREBACKEND
#include <tdehardwaredevices.h>
#endif

#include "dialog.h"
#include "tdeio_media_mounthelper.h"


void MountHelper::invokeEject(const TQString &device, bool quiet)
{
#ifdef COMPILE_TDEHARDWAREBACKEND
	// Try TDE HW library eject first...
	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
	TDEGenericDevice *hwdevice = hwdevices->findByDeviceNode(device);

			::exit(0);
		}
	}
#endif

	// Then fall back to tdeeject if needed
	TDEProcess *proc = new TDEProcess(TQT_TQOBJECT(this));

Return to bug 2110

Lines 33-39 Link Here

(-)tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp.orig (+4 lines)
33	#include <kprocess.h>	33	#include <kprocess.h>
34	#include <tdestartupinfo.h>	34	#include <tdestartupinfo.h>
35	#include <kmimetype.h>	35	#include <kmimetype.h>
		36	#ifdef COMPILE_TDEHARDWAREBACKEND
36	#include <tdehardwaredevices.h>	37	#include <tdehardwaredevices.h>
		38	#endif
37		39
38	#include "dialog.h"	40	#include "dialog.h"
39	#include "tdeio_media_mounthelper.h"	41	#include "tdeio_media_mounthelper.h"
Lines 187-192 Link Here
187		189
188	void MountHelper::invokeEject(const TQString &device, bool quiet)	190	void MountHelper::invokeEject(const TQString &device, bool quiet)
189	{	191	{
		192	#ifdef COMPILE_TDEHARDWAREBACKEND
190	// Try TDE HW library eject first...	193	// Try TDE HW library eject first...
191	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();	194	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
192	TDEGenericDevice *hwdevice = hwdevices->findByDeviceNode(device);	195	TDEGenericDevice *hwdevice = hwdevices->findByDeviceNode(device);
Lines 197-202 Link Here
197	::exit(0);	200	::exit(0);
198	}	201	}
199	}	202	}
		203	#endif
200		204
201	// Then fall back to tdeeject if needed	205	// Then fall back to tdeeject if needed
202	TDEProcess *proc = new TDEProcess(TQT_TQOBJECT(this));	206	TDEProcess *proc = new TDEProcess(TQT_TQOBJECT(this));