FreeBSD Bugzilla – Attachment 143033 Details for
Bug 190158
textproc/kdiff3 fails to save output with -o relative path
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
patch-23ad423
patch-23ad423 (text/plain), 3.15 KB, created by
Ed Maste
on 2014-05-24 02:30:00 UTC
(
hide
)
Description:
patch-23ad423
Filename:
MIME Type:
Creator:
Ed Maste
Created:
2014-05-24 02:30:00 UTC
Size:
3.15 KB
patch
obsolete
>commit 23ad423e4255c80ee22b269f73e20333f7c06678 >Author: joachim99 <joachim.eibl@gmx.de> >Date: Sat Sep 22 23:02:12 2012 +0200 > > - Fix for saving files on KDE with relative path specified via > command line option -o. > > Signed-off-by: joachim99 <joachim.eibl@gmx.de> > >diff --git src-QT4/fileaccess.cpp src-QT4/fileaccess.cpp >index 134fc26..b6e01f0 100644 >--- src-QT4/fileaccess.cpp >+++ src-QT4/fileaccess.cpp >@@ -183,7 +183,8 @@ static QString nicePath( const QFileInfo& fi ) > > void FileAccess::setFile( const QFileInfo& fi, FileAccess* pParent ) > { >- m_filePath = nicePath( fi.filePath() ); // remove "./" at start >+ m_filePath = pParent == 0 ? fi.absoluteFilePath() : >+ nicePath( fi.filePath() ); // remove "./" at start > > m_bSymLink = fi.isSymLink(); > if ( m_bSymLink || (!m_bExists && m_filePath.contains("@@") ) ) >@@ -566,7 +567,16 @@ QString FileAccess::absoluteFilePath() const > if ( parent() != 0 ) > return parent()->absoluteFilePath() + "/" + m_filePath; > else >- return m_filePath; >+ { >+ if ( m_filePath.isEmpty() ) >+ return QString(); >+ >+ QFileInfo fi( m_filePath ); >+ if ( fi.isAbsolute() ) >+ return m_filePath; >+ else >+ return fi.absoluteFilePath(); // Probably never reached >+ } > } // Full abs path > > // Just the name-part of the path, without parent directories >@@ -1184,7 +1194,7 @@ bool FileAccessJobHandler::rename( const QString& dest ) > m_bSuccess = false; > KIO::FileCopyJob* pJob = KIO::file_move( m_pFileAccess->url(), kurl, permissions, KIO::HideProgressInfo ); > connect( pJob, SIGNAL(result(KJob*)), this, SLOT(slotSimpleJobResult(KJob*))); >- connect( pJob, SIGNAL(percent(KJob*,unsigned long)), this, SLOT(slotPercent(KJob*, unsigned long))); >+ connect( pJob, SIGNAL(percent(KJob*,unsigned long)), &pp, SLOT(slotPercent(KJob*, unsigned long))); > > ProgressProxy::enterEventLoop( pJob, > i18n("Renaming file: %1 -> %2",m_pFileAccess->prettyAbsPath(),dest) ); >@@ -1673,7 +1683,7 @@ bool FileAccessJobHandler::listDir( t_DirectoryList* pDirList, bool bRecursive, > &pp, SLOT( slotListDirInfoMessage(KJob*, const QString&) )); > > // This line makes the transfer via fish unreliable.:-( >- //connect( pListJob, SIGNAL(percent(KJob*,unsigned long)), this, SLOT(slotPercent(KJob*, unsigned long))); >+ //connect( pListJob, SIGNAL(percent(KJob*,unsigned long)), &pp, SLOT(slotPercent(KJob*, unsigned long))); > > ProgressProxy::enterEventLoop( pListJob, > i18n("Listing directory: %1",m_pFileAccess->prettyAbsPath()) ); >diff --git src-QT4/kdiff3.cpp src-QT4/kdiff3.cpp >index 165602f..de7cc9c 100644 >--- src-QT4/kdiff3.cpp >+++ src-QT4/kdiff3.cpp >@@ -211,6 +211,8 @@ KDiff3App::KDiff3App(QWidget* pParent, const char* /*name*/, KDiff3Part* pKDiff3 > m_outputFilename = args->getOption("output"); > if ( m_outputFilename.isEmpty() ) > m_outputFilename = args->getOption("out"); >+ if ( ! m_outputFilename.isEmpty() ) >+ m_outputFilename = FileAccess( m_outputFilename, true ).absoluteFilePath(); > } > > m_bAutoFlag = args!=0 && args->isSet("auto");
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 190158
: 143033