Hello community, here is the log from the commit of package smb4k for openSUSE:Factory checked in at 2012-06-10 23:02:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/smb4k (Old) and /work/SRC/openSUSE:Factory/.smb4k.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "smb4k", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/smb4k/smb4k.changes 2012-03-26 11:07:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.smb4k.new/smb4k.changes 2012-06-10 23:04:54.000000000 +0200 @@ -1,0 +2,24 @@ +Fri Jun 8 18:03:39 UTC 2012 - [email protected] + +- Update to version 1.0.2: + * Fixed two potential crashes in class Smb4KHomesSharesHandler. + * Fixed a wrong comparision between QString and QByteArray in + Smb4KMountJob::slotActionFinished(). + * Fixed a wrong comparision between QString and QByteArray and a double + declaration in Smb4KUnmountJob::slotActionFinished(). + * Fixed wrong assumption that qreal equals double in Smb4KShare class. + Patch by Rex Dieter from the Fedora Project. + * Fixed missing assignments of the IP address in Smb4KAuthInfo::setHost() + and Smb4KAuthInfo::setShare(). + * When prompting for a password for a 'homes' share, use the UNC of the + user's home directory and not //SERVER/homes. + * When mounting a 'homes' share, show the UNC of the user's home directory + in the mainwindow's status bar instead of //SERVER/homes. + * Fixed a crash in Smb4KMountJob::slotActionFinished() reported by + Peter Trenholme. + * Fixed unmounting on exit. Many thanks go to Peter Trenholme for reporting + this issue. +- Keep only the english documentation in the smb4k-doc subpackage. Move other + languages in the smb4k-lang subpackage. + +------------------------------------------------------------------- Old: ---- smb4k-1.0.1.tar.bz2 New: ---- smb4k-1.0.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ smb4k.spec ++++++ --- /var/tmp/diff_new_pack.KulbaV/_old 2012-06-10 23:04:56.000000000 +0200 +++ /var/tmp/diff_new_pack.KulbaV/_new 2012-06-10 23:04:56.000000000 +0200 @@ -17,7 +17,7 @@ Name: smb4k -Version: 1.0.1 +Version: 1.0.2 Release: 0 Summary: Advanced Network Neighborhood Browser for KDE License: GPL-2.0+ @@ -107,17 +107,9 @@ %files lang -f %{name}.lang %defattr(-,root,root,-) %exclude %{_kde4_htmldir}/en/smb4k/ -%exclude %{_kde4_htmldir}/fr/smb4k/ -%exclude %{_kde4_htmldir}/pt/smb4k/ -%exclude %{_kde4_htmldir}/sv/smb4k/ -%exclude %{_kde4_htmldir}/uk/smb4k/ %files doc %defattr(-,root,root,-) %doc %lang(en) %{_kde4_htmldir}/en/smb4k/ -%doc %lang(fr) %{_kde4_htmldir}/fr/smb4k/ -%doc %lang(pt) %{_kde4_htmldir}/pt/smb4k/ -%doc %lang(sv) %{_kde4_htmldir}/sv/smb4k/ -%doc %lang(uk) %{_kde4_htmldir}/uk/smb4k/ %changelog ++++++ smb4k-1.0.1.tar.bz2 -> smb4k-1.0.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-1.0.1/CMakeLists.txt new/smb4k-1.0.2/CMakeLists.txt --- old/smb4k-1.0.1/CMakeLists.txt 2012-03-11 16:33:45.000000000 +0100 +++ new/smb4k-1.0.2/CMakeLists.txt 2012-05-30 22:01:49.000000000 +0200 @@ -1,17 +1,17 @@ project( smb4k ) -set( VERSION 1.0.1 ) +set( VERSION 1.0.2 ) set( VERSION_MAJOR 1 ) set( VERSION_MINOR 0 ) -set( VERSION_PATCH 1 ) +set( VERSION_PATCH 2 ) cmake_minimum_required( VERSION 2.6 ) set( QT_MIN_VERSION 4.7.0 ) set( KDE_MIN_VERSION 4.4.0 ) find_package( KDE4 REQUIRED ) -find_package( Msgfmt REQUIRED ) -find_package( Gettext REQUIRED ) +find_package(Msgfmt REQUIRED) +find_package(Gettext REQUIRED) include(KDE4Defaults) include(MacroLibrary) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-1.0.1/ChangeLog new/smb4k-1.0.2/ChangeLog --- old/smb4k-1.0.1/ChangeLog 2012-03-11 16:33:45.000000000 +0100 +++ new/smb4k-1.0.2/ChangeLog 2012-05-30 22:01:49.000000000 +0200 @@ -1,3 +1,22 @@ +Smb4K 1.0.2 (2012-05-30): +- Fixed two potential crashes in class Smb4KHomesSharesHandler. +- Fixed a wrong comparision between QString and QByteArray in + Smb4KMountJob::slotActionFinished(). +- Fixed a wrong comparision between QString and QByteArray and a double + declaration in Smb4KUnmountJob::slotActionFinished(). +- Fixed wrong assumption that qreal equals double in Smb4KShare class. + Patch by Rex Dieter from the Fedora Project. +- Fixed missing assignments of the IP address in Smb4KAuthInfo::setHost() + and Smb4KAuthInfo::setShare(). +- When prompting for a password for a 'homes' share, use the UNC of the + user's home directory and not //SERVER/homes. +- When mounting a 'homes' share, show the UNC of the user's home directory + in the mainwindow's status bar instead of //SERVER/homes. +- Fixed a crash in Smb4KMountJob::slotActionFinished() reported by + Peter Trenholme. +- Fixed unmounting on exit. Many thanks go to Peter Trenholme for reporting + this issue. + Smb4K 1.0.1 (2012-03-11): - Fixed potential crash in Smb4KWalletManager::init(). - Fixed KDEInit complaining when Smb4K is started from a desktop icon diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-1.0.1/core/CMakeLists.txt new/smb4k-1.0.2/core/CMakeLists.txt --- old/smb4k-1.0.1/core/CMakeLists.txt 2012-03-11 16:33:45.000000000 +0100 +++ new/smb4k-1.0.2/core/CMakeLists.txt 2012-05-30 22:01:50.000000000 +0200 @@ -55,7 +55,7 @@ ${KDE4_KIO_LIBS} ${KDE4_SOLID_LIBS} ) -set_target_properties( smb4kcore PROPERTIES VERSION 4.0.0 SOVERSION 4 ) +set_target_properties( smb4kcore PROPERTIES VERSION 4.0.1 SOVERSION 4 ) install( TARGETS smb4kcore DESTINATION ${LIB_INSTALL_DIR} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-1.0.1/core/smb4kauthinfo.cpp new/smb4k-1.0.2/core/smb4kauthinfo.cpp --- old/smb4k-1.0.1/core/smb4kauthinfo.cpp 2012-03-11 16:33:45.000000000 +0100 +++ new/smb4k-1.0.2/core/smb4kauthinfo.cpp 2012-05-30 22:01:50.000000000 +0200 @@ -83,6 +83,7 @@ m_workgroup = host->workgroupName(); m_homes_share = false; m_url = host->url(); + m_ip = host->ip(); } @@ -102,6 +103,8 @@ { m_url = share->homeURL(); } + + m_ip = share->hostIP(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-1.0.1/core/smb4khomesshareshandler.cpp new/smb4k-1.0.2/core/smb4khomesshareshandler.cpp --- old/smb4k-1.0.1/core/smb4khomesshareshandler.cpp 2012-03-11 16:33:45.000000000 +0100 +++ new/smb4k-1.0.2/core/smb4khomesshareshandler.cpp 2012-05-30 22:01:50.000000000 +0200 @@ -316,20 +316,27 @@ Q_ASSERT( share ); Q_ASSERT( users ); - for ( int i = 0; i < m_homes_users.size(); ++i ) + if ( !m_homes_users.isEmpty() ) { - if ( QString::compare( share->unc(), m_homes_users.at( i ).share.unc(), Qt::CaseInsensitive ) == 0 && - ((m_homes_users.at( i ).share.workgroupName().isEmpty() || share->workgroupName().isEmpty()) || - QString::compare( share->workgroupName(), m_homes_users.at( i ).share.workgroupName(), Qt::CaseInsensitive ) == 0) ) + for ( int i = 0; i < m_homes_users.size(); ++i ) { - *users = m_homes_users.at( i ).users; - break; - } - else - { - continue; + if ( QString::compare( share->unc(), m_homes_users.at( i ).share.unc(), Qt::CaseInsensitive ) == 0 && + ((m_homes_users.at( i ).share.workgroupName().isEmpty() || share->workgroupName().isEmpty()) || + QString::compare( share->workgroupName(), m_homes_users.at( i ).share.workgroupName(), Qt::CaseInsensitive ) == 0) ) + { + *users = m_homes_users.at( i ).users; + break; + } + else + { + continue; + } } } + else + { + // Do nothing + } } @@ -340,30 +347,37 @@ bool found = false; - for ( int i = 0; i < m_homes_users.size(); ++i ) + if ( !m_homes_users.isEmpty() ) { - if ( QString::compare( share->unc(), m_homes_users.at( i ).share.unc(), Qt::CaseInsensitive ) == 0 && - ((m_homes_users.at( i ).share.workgroupName().isEmpty() || share->workgroupName().isEmpty()) || - QString::compare( share->workgroupName(), m_homes_users.at( i ).share.workgroupName(), Qt::CaseInsensitive ) == 0) ) + for ( int i = 0; i < m_homes_users.size(); ++i ) { - m_homes_users[i].users = *users; - found = true; - break; + if ( QString::compare( share->unc(), m_homes_users.at( i ).share.unc(), Qt::CaseInsensitive ) == 0 && + ((m_homes_users.at( i ).share.workgroupName().isEmpty() || share->workgroupName().isEmpty()) || + QString::compare( share->workgroupName(), m_homes_users.at( i ).share.workgroupName(), Qt::CaseInsensitive ) == 0) ) + { + m_homes_users[i].users = *users; + found = true; + break; + } + else + { + continue; + } + } + + if ( !found ) + { + m_homes_users << Smb4KHomesUsers( *share, *users ); } else { - continue; + // Do nothing } } - - if ( !found ) - { - m_homes_users << Smb4KHomesUsers( *share, *users ); - } else { // Do nothing - } + } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-1.0.1/core/smb4kmounter.cpp new/smb4k-1.0.2/core/smb4kmounter.cpp --- old/smb4k-1.0.1/core/smb4kmounter.cpp 2012-03-11 16:33:45.000000000 +0100 +++ new/smb4k-1.0.2/core/smb4kmounter.cpp 2012-05-30 22:01:50.000000000 +0200 @@ -1031,7 +1031,14 @@ } else { - // Do nothing + if ( p->aboutToQuit() ) + { + continue; + } + else + { + // Do nothing + } } } } @@ -1085,13 +1092,27 @@ addSubjob( job ); - job->start(); + if ( !p->aboutToQuit() ) + { + job->start(); + } + else + { + job->synchronousStart(); + } } void Smb4KMounter::unmountAllShares( QWidget *parent ) { - unmountShares( mountedSharesList(), false, parent ); + if ( !p->aboutToQuit() ) + { + unmountShares( mountedSharesList(), false, parent ); + } + else + { + unmountShares( mountedSharesList(), true, parent ); + } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-1.0.1/core/smb4kmounter_p.cpp new/smb4k-1.0.2/core/smb4kmounter_p.cpp --- old/smb4k-1.0.1/core/smb4kmounter_p.cpp 2012-03-11 16:33:45.000000000 +0100 +++ new/smb4k-1.0.2/core/smb4kmounter_p.cpp 2012-05-30 22:01:50.000000000 +0200 @@ -729,13 +729,13 @@ // Check if the mount process reported an error QString stderr( reply.data()["stderr"].toString() ); - if ( share->canonicalPath() == reply.data()["share_mountpoint"].toByteArray() && !stderr.isEmpty() ) + if ( QString::compare( share->canonicalPath(), reply.data()["share_mountpoint"].toString() ) == 0 && stderr.isEmpty() ) { #ifndef Q_OS_FREEBSD if ( stderr.contains( "mount error 13", Qt::CaseSensitive ) || stderr.contains( "mount error(13)" ) /* authentication error */ ) { - m_auth_errors << *share; + m_auth_errors << Smb4KShare( *share ); emit authError( this ); } else if ( (stderr.contains( "mount error 6" ) || stderr.contains( "mount error(6)" )) /* bad share name */ && @@ -854,6 +854,13 @@ } +void Smb4KUnmountJob::synchronousStart() +{ + m_started = true; + slotStartUnmount(); +} + + void Smb4KUnmountJob::setupUnmount( Smb4KShare *share, bool force, bool silent, QWidget *parent ) { Q_ASSERT( share ); @@ -1013,20 +1020,10 @@ // Check if the unmount process reported an error QString stderr( reply.data()["stderr"].toString() ); - if ( share->canonicalPath() == reply.data()["share_mountpoint"].toByteArray() && !stderr.isEmpty() ) + if ( QString::compare( share->canonicalPath(), reply.data()["share_mountpoint"].toString() ) == 0 && stderr.isEmpty() ) { - // Check if an error occurred. - QString stderr( reply.data().value( "stderr" ).toString() ); - - if ( !stderr.isEmpty() ) - { - Smb4KNotification *notification = new Smb4KNotification(); - notification->unmountingFailed( share, stderr ); - } - else - { - // Do nothing - } + Smb4KNotification *notification = new Smb4KNotification(); + notification->unmountingFailed( share, stderr ); } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-1.0.1/core/smb4kmounter_p.h new/smb4k-1.0.2/core/smb4kmounter_p.h --- old/smb4k-1.0.1/core/smb4kmounter_p.h 2012-03-11 16:33:45.000000000 +0100 +++ new/smb4k-1.0.2/core/smb4kmounter_p.h 2012-05-30 22:01:50.000000000 +0200 @@ -206,6 +206,14 @@ void start(); /** + * Starts the job synchronously. In contrast to the start() function, it + * directly calls slotStartUnmount(). + * + * You should not use this function unless it is really necessary. + */ + void synchronousStart(); + + /** * Set up the job for a single unmount. * * You must run this function before start() is called. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-1.0.1/core/smb4kshare.cpp new/smb4k-1.0.2/core/smb4kshare.cpp --- old/smb4k-1.0.1/core/smb4kshare.cpp 2012-03-11 16:33:45.000000000 +0100 +++ new/smb4k-1.0.2/core/smb4kshare.cpp 2012-05-30 22:01:50.000000000 +0200 @@ -475,7 +475,7 @@ QString total, total_dim = QString(); int exponent = 0; - qreal tmp_factor = 0; + double tmp_factor = 0; qulonglong factor = 0; (void) frexp( m_total * 1024, &exponent ); @@ -532,7 +532,7 @@ QString free, free_dim = QString(); int exponent = 0; - qreal tmp_factor = 0; + double tmp_factor = 0; qulonglong factor = 0; (void) frexp( m_free * 1024, &exponent ); @@ -589,7 +589,7 @@ QString used, used_dim = QString(); int exponent = 0; - qreal tmp_factor = 0; + double tmp_factor = 0; qulonglong factor = 0; (void) frexp( m_used * 1024, &exponent ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-1.0.1/core/smb4kwalletmanager.cpp new/smb4k-1.0.2/core/smb4kwalletmanager.cpp --- old/smb4k-1.0.1/core/smb4kwalletmanager.cpp 2012-03-11 16:33:45.000000000 +0100 +++ new/smb4k-1.0.2/core/smb4kwalletmanager.cpp 2012-05-30 22:01:50.000000000 +0200 @@ -914,8 +914,15 @@ dlg.setUsername( share->login() ); dlg.setPassword( share->password() ); } - - dlg.setPrompt( i18n( "<qt>Please enter a username and a password for the share <b>%1</b>.</qt>", share->unc() ) ); + + if ( !share->isHomesShare() ) + { + dlg.setPrompt( i18n( "<qt>Please enter a username and a password for the share <b>%1</b>.</qt>", share->unc() ) ); + } + else + { + dlg.setPrompt( i18n( "<qt>Please enter a username and a password for the share <b>%1</b>.</qt>", share->homeUNC() ) ); + } // Execute the password dialog, retrieve the new authentication // information and save it. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-1.0.1/smb4k/smb4kmainwindow.cpp new/smb4k-1.0.2/smb4k/smb4kmainwindow.cpp --- old/smb4k-1.0.1/smb4k/smb4kmainwindow.cpp 2012-03-11 16:33:45.000000000 +0100 +++ new/smb4k-1.0.2/smb4k/smb4kmainwindow.cpp 2012-05-30 22:01:49.000000000 +0200 @@ -831,7 +831,14 @@ { case Smb4KMounter::MountShare: { - statusBar()->showMessage( i18n( "Mounting share %1..." ).arg( share->unc() ), 0 ); + if ( !share->isHomesShare() ) + { + statusBar()->showMessage( i18n( "Mounting share %1..." ).arg( share->unc() ), 0 ); + } + else + { + statusBar()->showMessage( i18n( "Mounting share %1..." ).arg( share->homeUNC() ), 0 ); + } break; } case Smb4KMounter::UnmountShare: -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
