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 1762
Collapse All | Expand All

(-)k3b/libk3bdevice/configure.in.in (-1 / +1 lines)
Lines 140-146 Link Here
140 
HAL_DBUS_LIBS=""
 140 
HAL_DBUS_LIBS=""
141 
AC_MSG_RESULT(Found HAL storage version $hal_storage_version)
 141 
AC_MSG_RESULT(Found HAL storage version $hal_storage_version)
142 
if [test "x$hal" = "xFOUND"] && [test "x$dbus" = "xFOUND"] && [ test $hal_storage_version = 5 ] ; then
 142 
if [test "x$hal" = "xFOUND"] && [test "x$dbus" = "xFOUND"] && [ test $hal_storage_version = 5 ] ; then
143 
  AC_DEFINE(HAVE_HAL, , [compile in HAL support])
 143 
  AC_DEFINE(HAVE_HAL,1, [compile in HAL support])
144 
  have_hal=yes
 144 
  have_hal=yes
145 
  HAL_DBUS_LIBS="$HAL_LIBS $DBUSQT_LIBS"
 145 
  HAL_DBUS_LIBS="$HAL_LIBS $DBUSQT_LIBS"
146 
fi
 146 
fi
(-)k3b/libk3bdevice/k3bhalconnection.cpp (+11 lines)
Lines 840-848 Link Here
840 
	TDEStorageDevice* sdevice = static_cast<TDEStorageDevice*>(hwdevice);
 840 
	TDEStorageDevice* sdevice = static_cast<TDEStorageDevice*>(hwdevice);
841 
	// FIXME
 841 
	// FIXME
842 
#ifdef HAVE_HAL
843 
 // Options from 'options' are not currently loaded into 'optionString'
844 
 TQString optionString;
845 
 TQString mountedPath = sdevice->mountDevice(mountPoint, optionString);
846 
#else
842 
	// Options from 'options' are not currently loaded into 'mountOptions'
 847 
	// Options from 'options' are not currently loaded into 'mountOptions'
843 
	TDEStorageMountOptions mountOptions;
 848 
	TDEStorageMountOptions mountOptions;
844 
	TQString mountedPath = sdevice->mountDevice(mountPoint, mountOptions);
 849 
	TQString mountedPath = sdevice->mountDevice(mountPoint, mountOptions);
850 
#endif // HAVE_HAL
845 
	if (mountedPath.isNull()) {
 851 
	if (mountedPath.isNull()) {
846 
		return org_freedesktop_Hal_CommunicationError;
 852 
		return org_freedesktop_Hal_CommunicationError;
847 
	}
 853 
	}
Lines 869-876 Link Here
869 
	TDEStorageDevice* sdevice = static_cast<TDEStorageDevice*>(hwdevice);
 875 
	TDEStorageDevice* sdevice = static_cast<TDEStorageDevice*>(hwdevice);
870 
	// FIXME
 876 
	// FIXME
877 
#ifdef HAVE_HAL
878 
 // Options from 'options' are not currently loaded into 'optionString'
879 
 TQString optionString;
880 
#else
871 
	// Options from 'options' are not currently loaded into 'mountOptions'
 881 
	// Options from 'options' are not currently loaded into 'mountOptions'
872 
	TQString mountOptions;
 882 
	TQString mountOptions;
883 
#endif // HAVE_HAL
873 
	if (!sdevice->unmountDevice(NULL)) {
 884 
	if (!sdevice->unmountDevice(NULL)) {
874 
		// Unmount failed!
 885 
		// Unmount failed!

Return to bug 1762