Hello community, here is the log from the commit of package smb4k for openSUSE:Factory checked in at 2013-05-27 10:02:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/smb4k (Old) and /work/SRC/openSUSE:Factory/.smb4k.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "smb4k" Changes: -------- --- /work/SRC/openSUSE:Factory/smb4k/smb4k.changes 2013-03-18 07:18:00.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.smb4k.new/smb4k.changes 2013-05-27 10:02:09.000000000 +0200 @@ -1,0 +2,12 @@ +Fri May 17 20:41:24 UTC 2013 - [email protected] + +- Update to version 1.0.7: + * Fixed remounting of shares. + * Fixed Smb4KCustomOptionsManager::hasCustomOptions(). + The default options defined via the configuration dialog are + honored now. + * Fixed "Ignoring unknown parameter" error messages + * Fixed command line argument when a master browser is queried + for the browse list. + +------------------------------------------------------------------- Old: ---- smb4k-1.0.6.tar.bz2 New: ---- smb4k-1.0.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ smb4k.spec ++++++ --- /var/tmp/diff_new_pack.15L7a9/_old 2013-05-27 10:02:10.000000000 +0200 +++ /var/tmp/diff_new_pack.15L7a9/_new 2013-05-27 10:02:10.000000000 +0200 @@ -17,7 +17,7 @@ Name: smb4k -Version: 1.0.6 +Version: 1.0.7 Release: 0 Summary: Advanced Network Neighborhood Browser for KDE License: GPL-2.0+ ++++++ smb4k-1.0.6.tar.bz2 -> smb4k-1.0.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-1.0.6/CMakeLists.txt new/smb4k-1.0.7/CMakeLists.txt --- old/smb4k-1.0.6/CMakeLists.txt 2013-03-03 11:46:53.000000000 +0100 +++ new/smb4k-1.0.7/CMakeLists.txt 2013-05-12 14:45:15.000000000 +0200 @@ -1,9 +1,9 @@ project( smb4k ) -set( VERSION 1.0.6 ) +set( VERSION 1.0.7 ) set( VERSION_MAJOR 1 ) set( VERSION_MINOR 0 ) -set( VERSION_PATCH 6 ) +set( VERSION_PATCH 7 ) cmake_minimum_required( VERSION 2.6 ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-1.0.6/ChangeLog new/smb4k-1.0.7/ChangeLog --- old/smb4k-1.0.6/ChangeLog 2013-03-03 11:46:53.000000000 +0100 +++ new/smb4k-1.0.7/ChangeLog 2013-05-12 14:45:15.000000000 +0200 @@ -1,3 +1,11 @@ +Smb4K 1.0.7 (2013-05-13): +- Fixed remounting of shares. +- Fixed Smb4KCustomOptionsManager::hasCustomOptions(). The default options + defined via the configuration dialog are honored now. +- Fixed "Ignoring unknown parameter" error messages (closes SF ticket #29). +- Fixed command line argument when a master browser is queried for the + browse list. + Smb4K 1.0.6 (2013-03-03): - Fixed crash in Smb4KMounter::slotAuthError() due to signals being emitted from Smb4KMountJob::slotActionFinished() too often (closes SF ticket #25). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-1.0.6/core/smb4kcustomoptionsmanager.cpp new/smb4k-1.0.7/core/smb4kcustomoptionsmanager.cpp --- old/smb4k-1.0.6/core/smb4kcustomoptionsmanager.cpp 2013-03-03 11:46:53.000000000 +0100 +++ new/smb4k-1.0.7/core/smb4kcustomoptionsmanager.cpp 2013-05-12 14:45:15.000000000 +0200 @@ -41,6 +41,7 @@ #include <smb4knotification.h> #include <smb4khost.h> #include <smb4kshare.h> +#include "smb4ksettings.h" K_GLOBAL_STATIC( Smb4KCustomOptionsManagerPrivate, p ); @@ -823,12 +824,87 @@ { Q_ASSERT( options ); - // Check if there are custom options defined. We do this - // by using an empty Smb4KCustomOptions object for comparison. - Smb4KCustomOptions default_options; + // Check if there are custom options defined. + // Checks are performed against an empty and a default custom + // options object. Default means that the values of the global + // settings are honored. + Smb4KCustomOptions empty_options, default_options; + + // Set up the default options + default_options.setSMBPort( Smb4KSettings::remoteSMBPort() ); +#ifndef Q_OS_FREEBSD + default_options.setFileSystemPort( Smb4KSettings::remoteFileSystemPort() ); + + switch ( Smb4KSettings::writeAccess() ) + { + case Smb4KSettings::EnumWriteAccess::ReadWrite: + { + default_options.setWriteAccess( Smb4KCustomOptions::ReadWrite ); + break; + } + case Smb4KSettings::EnumWriteAccess::ReadOnly: + { + default_options.setWriteAccess( Smb4KCustomOptions::ReadOnly ); + break; + } + default: + { + default_options.setWriteAccess( Smb4KCustomOptions::UndefinedWriteAccess ); + break; + } + } +#endif + + switch ( Smb4KSettings::protocolHint() ) + { + case Smb4KSettings::EnumProtocolHint::Automatic: + { + default_options.setProtocolHint( Smb4KCustomOptions::Automatic ); + break; + } + case Smb4KSettings::EnumProtocolHint::RPC: + { + default_options.setProtocolHint( Smb4KCustomOptions::RPC ); + break; + } + case Smb4KSettings::EnumProtocolHint::RAP: + { + default_options.setProtocolHint( Smb4KCustomOptions::RAP ); + break; + } + case Smb4KSettings::EnumProtocolHint::ADS: + { + default_options.setProtocolHint( Smb4KCustomOptions::ADS ); + break; + } + default: + { + default_options.setProtocolHint( Smb4KCustomOptions::UndefinedProtocolHint ); + break; + } + } + + if ( Smb4KSettings::useKerberos() ) + { + default_options.setUseKerberos( Smb4KCustomOptions::UseKerberos ); + } + else + { + default_options.setUseKerberos( Smb4KCustomOptions::NoKerberos ); + } + + default_options.setUID( (K_UID)Smb4KSettings::userID().toInt() ); + default_options.setGID( (K_GID)Smb4KSettings::groupID().toInt() ); + + // WOL features have no default values. + + // + // Do the actual check + // // SMB port - if ( default_options.smbPort() != options->smbPort() ) + if ( empty_options.smbPort() != options->smbPort() && + default_options.smbPort() != options->smbPort() ) { return true; } @@ -840,7 +916,8 @@ #ifndef Q_OS_FREEBSD // File system port (used for mounting) - if ( default_options.fileSystemPort() != options->fileSystemPort() ) + if ( empty_options.fileSystemPort() != options->fileSystemPort() && + default_options.fileSystemPort() != options->fileSystemPort() ) { return true; } @@ -850,7 +927,8 @@ } // Write access - if ( default_options.writeAccess() != options->writeAccess() ) + if ( empty_options.writeAccess() != options->writeAccess() && + default_options.writeAccess() != options->writeAccess() ) { return true; } @@ -861,7 +939,8 @@ #endif // Protocol hint - if ( default_options.protocolHint() != options->protocolHint() ) + if ( empty_options.protocolHint() != options->protocolHint() && + default_options.protocolHint() != options->protocolHint() ) { return true; } @@ -871,7 +950,8 @@ } // Kerberos - if ( default_options.useKerberos() != options->useKerberos() ) + if ( empty_options.useKerberos() != options->useKerberos() && + default_options.useKerberos() != options->useKerberos() ) { return true; } @@ -881,7 +961,8 @@ } // UID - if ( default_options.uid() != options->uid() ) + if ( empty_options.uid() != options->uid() && + default_options.uid() != options->uid() ) { return true; } @@ -891,7 +972,8 @@ } // GID - if ( default_options.gid() != options->gid() ) + if ( empty_options.gid() != options->gid() && + default_options.gid() != options->gid() ) { return true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-1.0.6/core/smb4kmounter.cpp new/smb4k-1.0.7/core/smb4kmounter.cpp --- old/smb4k-1.0.6/core/smb4kmounter.cpp 2013-03-03 11:46:53.000000000 +0100 +++ new/smb4k-1.0.7/core/smb4kmounter.cpp 2013-05-12 14:45:15.000000000 +0200 @@ -85,6 +85,7 @@ m_timeout = 0; m_checks = 0; m_dialog = NULL; + m_first_import_done = false; connect( kapp, SIGNAL( aboutToQuit() ), this, SLOT( slotAboutToQuit() ) ); @@ -280,6 +281,8 @@ { // Do nothing } + + m_remounting_done = true; } @@ -1277,7 +1280,16 @@ } // Clean up the mount prefix - cleanup(); + cleanup(); + + if ( Smb4KSettings::remountShares() && m_first_import_done && !m_remounting_done ) + { + triggerRemounts(); + } + else + { + // Do nothing + } } else { @@ -1295,20 +1307,19 @@ void Smb4KMounter::slotStartJobs() { - startTimer( TIMEOUT ); - import( true ); if ( Smb4KSolidInterface::self()->networkStatus() == Smb4KSolidInterface::Connected || Smb4KSolidInterface::self()->networkStatus() == Smb4KSolidInterface::Unknown ) { p->setHardwareReason( false ); - triggerRemounts(); } else { // Do nothing and wait until the network becomes available. } + + startTimer( TIMEOUT ); } @@ -2033,6 +2044,15 @@ // Do nothing } } + + if ( !m_first_import_done && m_imported_shares.isEmpty() ) + { + m_first_import_done = true; + } + else + { + // Do nothing + } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-1.0.6/core/smb4kmounter.h new/smb4k-1.0.7/core/smb4kmounter.h --- old/smb4k-1.0.6/core/smb4kmounter.h 2013-03-03 11:46:53.000000000 +0100 +++ new/smb4k-1.0.7/core/smb4kmounter.h 2013-05-12 14:45:15.000000000 +0200 @@ -432,6 +432,16 @@ * The mount dialog */ Smb4KMountDialog *m_dialog; + + /** + * The first import has been done + */ + bool m_first_import_done; + + /** + * The remounting has been done + */ + bool m_remounting_done; }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-1.0.6/core/smb4kpreviewer_p.cpp new/smb4k-1.0.7/core/smb4kpreviewer_p.cpp --- old/smb4k-1.0.6/core/smb4kpreviewer_p.cpp 2013-03-03 11:46:53.000000000 +0100 +++ new/smb4k-1.0.7/core/smb4kpreviewer_p.cpp 2013-05-12 14:45:15.000000000 +0200 @@ -443,7 +443,7 @@ // Remove DEBUG messages and the additional information // that smbclient unfortunately reports to stderr. - QStringList err_msg = stderr.split( "\n", QString::SkipEmptyParts ); + QStringList err_msg = stderr.split( '\n', QString::SkipEmptyParts ); QMutableStringListIterator it( err_msg ); @@ -455,7 +455,11 @@ { it.remove(); } - else if ( line.trimmed().startsWith( "Domain" ) || line.trimmed().startsWith( "OS" ) ) + else if ( line.trimmed().startsWith( QLatin1String( "Domain" ) ) || line.trimmed().startsWith( QLatin1String( "OS" ) ) ) + { + it.remove(); + } + else if ( line.trimmed().startsWith( "Ignoring unknown parameter" ) ) { it.remove(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-1.0.6/core/smb4kprint_p.cpp new/smb4k-1.0.7/core/smb4kprint_p.cpp --- old/smb4k-1.0.6/core/smb4kprint_p.cpp 2013-03-03 11:46:53.000000000 +0100 +++ new/smb4k-1.0.7/core/smb4kprint_p.cpp 2013-05-12 14:45:15.000000000 +0200 @@ -265,7 +265,7 @@ else { // Remove DEBUG messages. - QStringList err_msg = stderr.split( "\n", QString::SkipEmptyParts ); + QStringList err_msg = stderr.split( '\n', QString::SkipEmptyParts ); QMutableStringListIterator it( err_msg ); @@ -277,6 +277,10 @@ { it.remove(); } + else if ( line.trimmed().startsWith( "Ignoring unknown parameter" ) ) + { + it.remove(); + } else { // Do nothing diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-1.0.6/core/smb4kscanner_p.cpp new/smb4k-1.0.7/core/smb4kscanner_p.cpp --- old/smb4k-1.0.6/core/smb4kscanner_p.cpp 2013-03-03 11:46:53.000000000 +0100 +++ new/smb4k-1.0.7/core/smb4kscanner_p.cpp 2013-05-12 14:45:15.000000000 +0200 @@ -424,6 +424,34 @@ // Read from stderr and decide what to do. QString stderr = QString::fromUtf8( m_proc->readAllStandardError(), -1 ).trimmed(); + // Remove unimportant warnings + if ( stderr.contains( "Ignoring unknown parameter" ) ) + { + QStringList tmp = stderr.split( '\n' ); + + QMutableStringListIterator it( tmp ); + + while ( it.hasNext() ) + { + QString test = it.next(); + + if ( test.trimmed().startsWith( "Ignoring unknown parameter" ) ) + { + it.remove(); + } + else + { + // Do nothing + } + } + + stderr = tmp.join( "\n" ); + } + else + { + // Do nothing + } + if ( !stderr.isEmpty() ) { Smb4KNotification *notification = new Smb4KNotification(); @@ -703,7 +731,7 @@ // User name and password if needed if ( Smb4KSettings::masterBrowsersRequireAuth() && !host.login().isEmpty() ) { - arguments << QString( "-U %1%" ).arg( host.login() ); + arguments << QString( "-U %1" ).arg( host.login() ); } else { @@ -768,7 +796,7 @@ // User name and password if needed if ( Smb4KSettings::masterBrowsersRequireAuth() && !host.login().isEmpty() ) { - arguments << QString( "-U %1%" ).arg( host.login() ); + arguments << QString( "-U %1" ).arg( host.login() ); } else { @@ -820,6 +848,34 @@ // Read from stderr and decide what to do. QString stderr = QString::fromUtf8( m_proc->readAllStandardError(), -1 ).trimmed(); + // Remove unimportant warnings + if ( stderr.contains( "Ignoring unknown parameter" ) ) + { + QStringList tmp = stderr.split( '\n' ); + + QMutableStringListIterator it( tmp ); + + while ( it.hasNext() ) + { + QString test = it.next(); + + if ( test.trimmed().startsWith( "Ignoring unknown parameter" ) ) + { + it.remove(); + } + else + { + // Do nothing + } + } + + stderr = tmp.join( "\n" ); + } + else + { + // Do nothing + } + if ( !stderr.isEmpty() ) { if ( stderr.contains( "The username or password was not correct." ) || @@ -830,13 +886,13 @@ if ( m_master_browser.isEmpty() ) { // Figure out the current master browser's IP address. - QStringList stderr_list = stderr.split( "\n", QString::SkipEmptyParts ); + QStringList stderr_list = stderr.split( '\n', QString::SkipEmptyParts ); foreach ( const QString &line, stderr_list ) { if ( line.contains( "Connecting to host=" ) ) { - m_master_browser = line.section( "=", 1, 1 ).trimmed(); + m_master_browser = line.section( '=', 1, 1 ).trimmed(); break; } else @@ -1351,6 +1407,34 @@ { QString stderr = QString::fromUtf8( m_proc->readAllStandardError(), -1 ).trimmed(); + // Remove unimportant warnings + if ( stderr.contains( "Ignoring unknown parameter" ) ) + { + QStringList tmp = stderr.split( '\n' ); + + QMutableStringListIterator it( tmp ); + + while ( it.hasNext() ) + { + QString test = it.next(); + + if ( test.trimmed().startsWith( "Ignoring unknown parameter" ) ) + { + it.remove(); + } + else + { + // Do nothing + } + } + + stderr = tmp.join( "\n" ); + } + else + { + // Do nothing + } + if ( !stderr.isEmpty() ) { Smb4KNotification *notification = new Smb4KNotification(); @@ -1665,6 +1749,34 @@ { QString stderr = QString::fromUtf8( m_proc->readAllStandardError(), -1 ).trimmed(); + // Remove unimportant warnings + if ( stderr.contains( "Ignoring unknown parameter" ) ) + { + QStringList tmp = stderr.split( '\n' ); + + QMutableStringListIterator it( tmp ); + + while ( it.hasNext() ) + { + QString test = it.next(); + + if ( test.trimmed().startsWith( "Ignoring unknown parameter" ) ) + { + it.remove(); + } + else + { + // Do nothing + } + } + + stderr = tmp.join( "\n" ); + } + else + { + // Do nothing + } + if ( !stderr.isEmpty() ) { if ( stderr.contains( "The username or password was not correct." ) || @@ -1677,7 +1789,7 @@ else if ( stderr.contains( "tdb_transaction_recover:" ) || stderr.contains( "tdb_log" ) ) { - // Suppress debug output/information sent to stderr + // Suppress debug output/information send to stderr qDebug() << stderr; } else @@ -2071,7 +2183,7 @@ } // Authentication data - if ( !m_host.login().isEmpty() && !m_host.login().isEmpty() ) + if ( !m_host.login().isEmpty() ) { arguments << QString( "-U %1" ).arg( m_host.login() ); } @@ -2109,6 +2221,38 @@ { QString stderr = QString::fromUtf8( m_proc->readAllStandardError(), -1 ).trimmed(); + // Remove unimportant warnings + if ( stderr.contains( "Ignoring unknown parameter" ) ) + { + QStringList tmp = stderr.split( '\n' ); + + QMutableStringListIterator it( tmp ); + + while ( it.hasNext() ) + { + QString test = it.next(); + + if ( test.trimmed().startsWith( "Ignoring unknown parameter" ) ) + { + it.remove(); + } + else if ( test.contains( "creating lame", Qt::CaseSensitive ) ) + { + it.remove(); + } + else + { + // Do nothing + } + } + + stderr = tmp.join( "\n" ); + } + else + { + // Do nothing + } + if ( !stderr.isEmpty() ) { if ( stderr.contains( "The username or password was not correct." ) || @@ -2125,15 +2269,8 @@ } else { - if ( !stderr.contains( "creating lame", Qt::CaseSensitive ) ) - { - Smb4KNotification *notification = new Smb4KNotification(); - notification->retrievingSharesFailed( &m_host, stderr ); - } - else - { - // Do nothing - } + Smb4KNotification *notification = new Smb4KNotification(); + notification->retrievingSharesFailed( &m_host, stderr ); } } else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-1.0.6/core/smb4ksearch_p.cpp new/smb4k-1.0.7/core/smb4ksearch_p.cpp --- old/smb4k-1.0.6/core/smb4ksearch_p.cpp 2013-03-03 11:46:53.000000000 +0100 +++ new/smb4k-1.0.7/core/smb4ksearch_p.cpp 2013-05-12 14:45:15.000000000 +0200 @@ -328,6 +328,34 @@ { QString stderr = QString::fromUtf8( m_proc->readAllStandardError(), -1 ); + // Remove unimportant warnings + if ( stderr.contains( "Ignoring unknown parameter" ) ) + { + QStringList tmp = stderr.split( '\n' ); + + QMutableStringListIterator it( tmp ); + + while ( it.hasNext() ) + { + QString test = it.next(); + + if ( test.trimmed().startsWith( "Ignoring unknown parameter" ) ) + { + it.remove(); + } + else + { + // Do nothing + } + } + + stderr = tmp.join( "\n" ); + } + else + { + // Do nothing + } + // Process authentication errors: if ( stderr.contains( "The username or password was not correct." ) || stderr.contains( "NT_STATUS_ACCOUNT_DISABLED" ) /* AD error */ || @@ -337,7 +365,7 @@ m_proc->abort(); emit authError( this ); } - else if ( stderr.contains( "NT_STATUS" ) ) + else if ( stderr.contains("NT_STATUS") ) { Smb4KNotification *notification = new Smb4KNotification(); notification->searchingFailed( m_string, stderr ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-1.0.6/core/unknown_parameter_patch.diff new/smb4k-1.0.7/core/unknown_parameter_patch.diff --- old/smb4k-1.0.6/core/unknown_parameter_patch.diff 1970-01-01 01:00:00.000000000 +0100 +++ new/smb4k-1.0.7/core/unknown_parameter_patch.diff 2013-05-12 14:45:15.000000000 +0200 @@ -0,0 +1,327 @@ +Index: smb4kpreviewer_p.cpp +=================================================================== +--- smb4kpreviewer_p.cpp (Revision 1345791) ++++ smb4kpreviewer_p.cpp (Arbeitskopie) +@@ -443,7 +443,7 @@ + + // Remove DEBUG messages and the additional information + // that smbclient unfortunately reports to stderr. +- QStringList err_msg = stderr.split( "\n", QString::SkipEmptyParts ); ++ QStringList err_msg = stderr.split( '\n', QString::SkipEmptyParts ); + + QMutableStringListIterator it( err_msg ); + +@@ -455,10 +455,14 @@ + { + it.remove(); + } +- else if ( line.trimmed().startsWith( "Domain" ) || line.trimmed().startsWith( "OS" ) ) ++ else if ( line.trimmed().startsWith( QLatin1String( "Domain" ) ) || line.trimmed().startsWith( QLatin1String( "OS" ) ) ) + { + it.remove(); + } ++ else if ( line.trimmed().startsWith( "Ignoring unknown parameter" ) ) ++ { ++ it.remove(); ++ } + else + { + // Do nothing +Index: smb4kprint_p.cpp +=================================================================== +--- smb4kprint_p.cpp (Revision 1345791) ++++ smb4kprint_p.cpp (Arbeitskopie) +@@ -265,7 +265,7 @@ + else + { + // Remove DEBUG messages. +- QStringList err_msg = stderr.split( "\n", QString::SkipEmptyParts ); ++ QStringList err_msg = stderr.split( '\n', QString::SkipEmptyParts ); + + QMutableStringListIterator it( err_msg ); + +@@ -277,6 +277,10 @@ + { + it.remove(); + } ++ else if ( line.trimmed().startsWith( "Ignoring unknown parameter" ) ) ++ { ++ it.remove(); ++ } + else + { + // Do nothing +Index: smb4ksearch_p.cpp +=================================================================== +--- smb4ksearch_p.cpp (Revision 1345791) ++++ smb4ksearch_p.cpp (Arbeitskopie) +@@ -328,6 +328,34 @@ + { + QString stderr = QString::fromUtf8( m_proc->readAllStandardError(), -1 ); + ++ // Remove unimportant warnings ++ if ( stderr.contains( "Ignoring unknown parameter" ) ) ++ { ++ QStringList tmp = stderr.split( '\n' ); ++ ++ QMutableStringListIterator it( tmp ); ++ ++ while ( it.hasNext() ) ++ { ++ QString test = it.next(); ++ ++ if ( test.trimmed().startsWith( "Ignoring unknown parameter" ) ) ++ { ++ it.remove(); ++ } ++ else ++ { ++ // Do nothing ++ } ++ } ++ ++ stderr = tmp.join( "\n" ); ++ } ++ else ++ { ++ // Do nothing ++ } ++ + // Process authentication errors: + if ( stderr.contains( "The username or password was not correct." ) || + stderr.contains( "NT_STATUS_ACCOUNT_DISABLED" ) /* AD error */ || +@@ -337,7 +365,7 @@ + m_proc->abort(); + emit authError( this ); + } +- else if ( stderr.contains( "NT_STATUS" ) ) ++ else if ( stderr.contains("NT_STATUS") ) + { + Smb4KNotification *notification = new Smb4KNotification(); + notification->searchingFailed( m_string, stderr ); +Index: smb4kscanner_p.cpp +=================================================================== +--- smb4kscanner_p.cpp (Revision 1345791) ++++ smb4kscanner_p.cpp (Arbeitskopie) +@@ -424,6 +424,34 @@ + // Read from stderr and decide what to do. + QString stderr = QString::fromUtf8( m_proc->readAllStandardError(), -1 ).trimmed(); + ++ // Remove unimportant warnings ++ if ( stderr.contains( "Ignoring unknown parameter" ) ) ++ { ++ QStringList tmp = stderr.split( '\n' ); ++ ++ QMutableStringListIterator it( tmp ); ++ ++ while ( it.hasNext() ) ++ { ++ QString test = it.next(); ++ ++ if ( test.trimmed().startsWith( "Ignoring unknown parameter" ) ) ++ { ++ it.remove(); ++ } ++ else ++ { ++ // Do nothing ++ } ++ } ++ ++ stderr = tmp.join( "\n" ); ++ } ++ else ++ { ++ // Do nothing ++ } ++ + if ( !stderr.isEmpty() ) + { + Smb4KNotification *notification = new Smb4KNotification(); +@@ -820,6 +848,34 @@ + // Read from stderr and decide what to do. + QString stderr = QString::fromUtf8( m_proc->readAllStandardError(), -1 ).trimmed(); + ++ // Remove unimportant warnings ++ if ( stderr.contains( "Ignoring unknown parameter" ) ) ++ { ++ QStringList tmp = stderr.split( '\n' ); ++ ++ QMutableStringListIterator it( tmp ); ++ ++ while ( it.hasNext() ) ++ { ++ QString test = it.next(); ++ ++ if ( test.trimmed().startsWith( "Ignoring unknown parameter" ) ) ++ { ++ it.remove(); ++ } ++ else ++ { ++ // Do nothing ++ } ++ } ++ ++ stderr = tmp.join( "\n" ); ++ } ++ else ++ { ++ // Do nothing ++ } ++ + if ( !stderr.isEmpty() ) + { + if ( stderr.contains( "The username or password was not correct." ) || +@@ -830,13 +886,13 @@ + if ( m_master_browser.isEmpty() ) + { + // Figure out the current master browser's IP address. +- QStringList stderr_list = stderr.split( "\n", QString::SkipEmptyParts ); ++ QStringList stderr_list = stderr.split( '\n', QString::SkipEmptyParts ); + + foreach ( const QString &line, stderr_list ) + { + if ( line.contains( "Connecting to host=" ) ) + { +- m_master_browser = line.section( "=", 1, 1 ).trimmed(); ++ m_master_browser = line.section( '=', 1, 1 ).trimmed(); + break; + } + else +@@ -1351,6 +1407,34 @@ + { + QString stderr = QString::fromUtf8( m_proc->readAllStandardError(), -1 ).trimmed(); + ++ // Remove unimportant warnings ++ if ( stderr.contains( "Ignoring unknown parameter" ) ) ++ { ++ QStringList tmp = stderr.split( '\n' ); ++ ++ QMutableStringListIterator it( tmp ); ++ ++ while ( it.hasNext() ) ++ { ++ QString test = it.next(); ++ ++ if ( test.trimmed().startsWith( "Ignoring unknown parameter" ) ) ++ { ++ it.remove(); ++ } ++ else ++ { ++ // Do nothing ++ } ++ } ++ ++ stderr = tmp.join( "\n" ); ++ } ++ else ++ { ++ // Do nothing ++ } ++ + if ( !stderr.isEmpty() ) + { + Smb4KNotification *notification = new Smb4KNotification(); +@@ -1665,6 +1749,34 @@ + { + QString stderr = QString::fromUtf8( m_proc->readAllStandardError(), -1 ).trimmed(); + ++ // Remove unimportant warnings ++ if ( stderr.contains( "Ignoring unknown parameter" ) ) ++ { ++ QStringList tmp = stderr.split( '\n' ); ++ ++ QMutableStringListIterator it( tmp ); ++ ++ while ( it.hasNext() ) ++ { ++ QString test = it.next(); ++ ++ if ( test.trimmed().startsWith( "Ignoring unknown parameter" ) ) ++ { ++ it.remove(); ++ } ++ else ++ { ++ // Do nothing ++ } ++ } ++ ++ stderr = tmp.join( "\n" ); ++ } ++ else ++ { ++ // Do nothing ++ } ++ + if ( !stderr.isEmpty() ) + { + if ( stderr.contains( "The username or password was not correct." ) || +@@ -1677,7 +1789,7 @@ + else if ( stderr.contains( "tdb_transaction_recover:" ) || + stderr.contains( "tdb_log" ) ) + { +- // Suppress debug output/information sent to stderr ++ // Suppress debug output/information send to stderr + qDebug() << stderr; + } + else +@@ -2109,6 +2221,38 @@ + { + QString stderr = QString::fromUtf8( m_proc->readAllStandardError(), -1 ).trimmed(); + ++ // Remove unimportant warnings ++ if ( stderr.contains( "Ignoring unknown parameter" ) ) ++ { ++ QStringList tmp = stderr.split( '\n' ); ++ ++ QMutableStringListIterator it( tmp ); ++ ++ while ( it.hasNext() ) ++ { ++ QString test = it.next(); ++ ++ if ( test.trimmed().startsWith( "Ignoring unknown parameter" ) ) ++ { ++ it.remove(); ++ } ++ else if ( test.contains( "creating lame", Qt::CaseSensitive ) ) ++ { ++ it.remove(); ++ } ++ else ++ { ++ // Do nothing ++ } ++ } ++ ++ stderr = tmp.join( "\n" ); ++ } ++ else ++ { ++ // Do nothing ++ } ++ + if ( !stderr.isEmpty() ) + { + if ( stderr.contains( "The username or password was not correct." ) || +@@ -2125,15 +2269,8 @@ + } + else + { +- if ( !stderr.contains( "creating lame", Qt::CaseSensitive ) ) +- { +- Smb4KNotification *notification = new Smb4KNotification(); +- notification->retrievingSharesFailed( &m_host, stderr ); +- } +- else +- { +- // Do nothing +- } ++ Smb4KNotification *notification = new Smb4KNotification(); ++ notification->retrievingSharesFailed( &m_host, stderr ); + } + } + else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-1.0.6/password_dialog_crash.diff new/smb4k-1.0.7/password_dialog_crash.diff --- old/smb4k-1.0.6/password_dialog_crash.diff 1970-01-01 01:00:00.000000000 +0100 +++ new/smb4k-1.0.7/password_dialog_crash.diff 2013-05-12 14:45:15.000000000 +0200 @@ -0,0 +1,53 @@ +Index: core/smb4kmounter_p.cpp +=================================================================== +--- core/smb4kmounter_p.cpp (Revision 1330241) ++++ core/smb4kmounter_p.cpp (Arbeitskopie) +@@ -764,7 +764,6 @@ + /* authentication error */ ) + { + m_auth_errors << Smb4KShare( *share ); +- emit authError( this ); + } + else if ( (stderr.contains( "mount error 6" ) || stderr.contains( "mount error(6)" )) /* bad share name */ && + share->shareName().contains( "_", Qt::CaseSensitive ) ) +@@ -772,7 +771,6 @@ + QString share_name = share->shareName(); + share->setShareName( share_name.replace( "_", " " ) ); + m_retries << *share; +- emit retry( this ); + } + else if ( stderr.contains( "mount error 101" ) || stderr.contains( "mount error(101)" ) /* network unreachable */ ) + { +@@ -782,7 +780,6 @@ + if ( stderr.contains( "Authentication error" ) ) + { + m_auth_errors << *share; +- emit authError( this ); + } + #endif + else +@@ -814,6 +811,24 @@ + + if ( m_processed == m_shares.size() ) + { ++ if ( !m_auth_errors.isEmpty() ) ++ { ++ emit authError( this ); ++ } ++ else ++ { ++ // Do nothing ++ } ++ ++ if ( !m_retries.isEmpty() ) ++ { ++ emit retry( this ); ++ } ++ else ++ { ++ // Do nothing ++ } ++ + // Give the operating system some time to process the mounts + // before we invoke KMountPoint::currentMountPoints(). + QTimer::singleShot( 100, this, SLOT( slotFinishJob() ) ); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
