Attachment #19 for bug #181

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




++ b/ark/arch.cpp


void Arch::slotOpenExited( KProcess* _kp )
{
 bool success = ( _kp->normalExit() && ( _kp->exitStatus() == 0 ) );

  if( !success )
  {
    if ( passwordRequired() )
    {
        QString msg;
        if ( !m_password.isEmpty() )
            msg = i18n("The password was incorrect. ");
        if (KPasswordDialog::getPassword( m_password, msg+i18n("You must enter a password to open the file:") ) == KPasswordDialog::Accepted )
        {
            delete _kp;
            _kp = m_currentProcess = 0;
            clearShellOutput();
            open(); // try to open the file again with a password
            return;
        }
        m_password = "";
        emit sigOpen( this, false, QString::null, 0 );
        delete _kp;
        _kp = m_currentProcess = 0;
        return;
    }
  }

  int exitStatus = 100; // arbitrary bad exit status

  if ( _kp->normalExit() )
++ b/ark/rar.cpp

  m_finished = false;

  KProcess *kp = m_currentProcess = new KProcess;
  *kp << m_unarchiver_program << "v" << "-c-";

  if ( !m_password.isEmpty() )
    *kp << "-p" + m_password;
  else
    *kp << "-p-";

  *kp << m_filename;

  connect( kp, SIGNAL( receivedStdout(KProcess*, char*, int) ),
           SLOT( slotReceivedTOC(KProcess*, char*, int) ) );

Return to bug 181

Line Link Here

(-)file_not_specified_in_diff (-3 / +35 lines)
0	-- a/ark/arch.cpp	0	++ b/ark/arch.cpp
Lines 100-105 Link Here
100		100
101	void Arch::slotOpenExited( KProcess* _kp )	101	void Arch::slotOpenExited( KProcess* _kp )
102	{	102	{
		103	bool success = ( _kp->normalExit() && ( _kp->exitStatus() == 0 ) );
		104
		105	if( !success )
		106	{
		107	if ( passwordRequired() )
		108	{
		109	QString msg;
		110	if ( !m_password.isEmpty() )
		111	msg = i18n("The password was incorrect. ");
		112	if (KPasswordDialog::getPassword( m_password, msg+i18n("You must enter a password to open the file:") ) == KPasswordDialog::Accepted )
		113	{
		114	delete _kp;
		115	_kp = m_currentProcess = 0;
		116	clearShellOutput();
		117	open(); // try to open the file again with a password
		118	return;
		119	}
		120	m_password = "";
		121	emit sigOpen( this, false, QString::null, 0 );
		122	delete _kp;
		123	_kp = m_currentProcess = 0;
		124	return;
		125	}
		126	}
		127
103	int exitStatus = 100; // arbitrary bad exit status	128	int exitStatus = 100; // arbitrary bad exit status
104		129
105	if ( _kp->normalExit() )	130	if ( _kp->normalExit() )
106	-- a/ark/rar.cpp	131	++ b/ark/rar.cpp
Lines 128-134 Link Here
128	m_finished = false;	128	m_finished = false;
129		129
130	KProcess *kp = m_currentProcess = new KProcess;	130	KProcess *kp = m_currentProcess = new KProcess;
131	*kp << m_unarchiver_program << "v" << "-c-" << m_filename;	131	*kp << m_unarchiver_program << "v" << "-c-";
		132
		133	if ( !m_password.isEmpty() )
		134	*kp << "-p" + m_password;
		135	else
		136	*kp << "-p-";
		137
		138	*kp << m_filename;
132		139
133	connect( kp, SIGNAL( receivedStdout(KProcess, char, int) ),	140	connect( kp, SIGNAL( receivedStdout(KProcess, char, int) ),
134	SLOT( slotReceivedTOC(KProcess, char, int) ) );	141	SLOT( slotReceivedTOC(KProcess, char, int) ) );