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.

[patch] tdelibs : add support for udisk1 and udisk2 in tdeioslave/file

tdelibs-14.0.0-mount_udisks_2a.patch (text/plain), 3.79 KB, created by Slávek Banko on 2013-11-14 19:56:26 CST

(hide)

Description: tdelibs : add support for udisk1 and udisk2 in tdeioslave/file

Filename:

MIME Type:

Creator: Slávek Banko

Created: 2013-11-14 19:56:26 CST

Size: 3.79 KB

patch

obsolete

>diff --git a/tdeioslave/file/file.cc b/tdeioslave/file/file.cc >index 75b3b17..b2b00b2 100644 >--- a/tdeioslave/file/file.cc >+++ b/tdeioslave/file/file.cc >@@ -1658,18 +1658,43 @@ void FileProtocol::unmount( const TQString& _point ) > > bool FileProtocol::pmount(const TQString &dev) > { >- TQString epath = getenv("PATH"); >- TQString path = TQString::fromLatin1("/sbin:/bin"); >- if (!epath.isEmpty()) >- path += ":" + epath; >- TQString pmountProg = TDEGlobal::dirs()->findExe("pmount", path); >+ TQString mountProg; >+ TQCString buffer; > >- if (pmountProg.isEmpty()) >- return false; >+#ifdef WITH_UDISKS2 >+ // Use 'udisksctl' (UDISKS2) if available >+ if (mountProg.isEmpty()) { >+ mountProg = TDEGlobal::dirs()->findExe("udisksctl"); >+ if (!mountProg.isEmpty()) { >+ buffer.sprintf( "%s mount -b %s", TQFile::encodeName(mountProg).data(), >+ TQFile::encodeName(TDEProcess::quote(dev)).data() ); >+ } >+ } >+#endif // WITH_UDISKS2 > >- TQCString buffer; >- buffer.sprintf( "%s %s", TQFile::encodeName(pmountProg).data(), >- TQFile::encodeName(TDEProcess::quote(dev)).data() ); >+#ifdef WITH_UDISKS >+ // Use 'udisks' (UDISKS1) if available >+ if (mountProg.isEmpty()) { >+ mountProg = TDEGlobal::dirs()->findExe("udisks"); >+ if (!mountProg.isEmpty()) { >+ buffer.sprintf( "%s --mount %s", TQFile::encodeName(mountProg).data(), >+ TQFile::encodeName(TDEProcess::quote(dev)).data() ); >+ } >+ } >+#endif // WITH_UDISKS >+ >+ // Use 'pmount', if available >+ if (mountProg.isEmpty()) { >+ mountProg = TDEGlobal::dirs()->findExe("pmount", path); >+ if (!mountProg.isEmpty()) { >+ buffer.sprintf( "%s %s", TQFile::encodeName(mountProg).data(), >+ TQFile::encodeName(TDEProcess::quote(dev)).data() ); >+ } >+ } >+ >+ if (mountProg.isEmpty()) { >+ return false; >+ } > > int res = system( buffer.data() ); > >@@ -1700,18 +1725,43 @@ bool FileProtocol::pumount(const TQString &point) > if (dev.isEmpty()) return false; > if (dev.endsWith("/")) dev.truncate(dev.length()-1); > >- TQString epath = getenv("PATH"); >- TQString path = TQString::fromLatin1("/sbin:/bin"); >- if (!epath.isEmpty()) >- path += ":" + epath; >- TQString pumountProg = TDEGlobal::dirs()->findExe("pumount", path); >+ TQString umountProg; >+ TQCString buffer; > >- if (pumountProg.isEmpty()) >- return false; >+#ifdef WITH_UDISKS2 >+ // Use 'udisksctl' (UDISKS2), if available >+ if (umountProg.isEmpty()) { >+ umountProg = TDEGlobal::dirs()->findExe("udisksctl"); >+ if (!umountProg.isEmpty()) { >+ buffer.sprintf( "%s unmount -b %s", TQFile::encodeName(umountProg).data(), >+ TQFile::encodeName(TDEProcess::quote(dev)).data() ); >+ } >+ } >+#endif // WITH_UDISKS2 > >- TQCString buffer; >- buffer.sprintf( "%s %s", TQFile::encodeName(pumountProg).data(), >+#ifdef WITH_UDISKS >+ // Use 'udisks' (UDISKS1), if available >+ if (umountProg.isEmpty()) { >+ umountProg = TDEGlobal::dirs()->findExe("udisks"); >+ if (!umountProg.isEmpty()) { >+ buffer.sprintf( "%s --unmount %s", TQFile::encodeName(umountProg).data(), > TQFile::encodeName(TDEProcess::quote(dev)).data() ); >+ } >+ } >+#endif // WITH_UDISKS >+ >+ // Use 'pumount', if available >+ if (umountProg.isEmpty()) { >+ umountProg = TDEGlobal::dirs()->findExe("pumount"); >+ if (!umountProg.isEmpty()) { >+ buffer.sprintf( "%s %s", TQFile::encodeName(umountProg).data(), >+ TQFile::encodeName(TDEProcess::quote(dev)).data() ); >+ } >+ } >+ >+ if (umountProg.isEmpty()) { >+ return false; >+ } > > int res = system( buffer.data() ); > View Attachment As Diff View Attachment As Raw

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    [x]
  • | Forgot Password
    Login: [x]