Hello community,

here is the log from the commit of package smb4k for openSUSE:Factory checked 
in at 2013-03-18 07:17:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/smb4k (Old)
 and      /work/SRC/openSUSE:Factory/.smb4k.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "smb4k", Maintainer is "kde-maintain...@suse.de"

Changes:
--------
--- /work/SRC/openSUSE:Factory/smb4k/smb4k.changes      2012-12-31 
14:26:43.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.smb4k.new/smb4k.changes 2013-03-18 
07:18:00.000000000 +0100
@@ -1,0 +2,11 @@
+Fri Mar 15 00:34:39 UTC 2013 - hrvoje.sen...@gmail.com
+
+- Update to version 1.0.6:
+  * Fixed crash in Smb4KMounter::slotAuthError() due to signals 
+    being emitted from Smb4KMountJob::slotActionFinished() too 
+    often
+  * Fixed unmounting of selected shares
+  * Removed faulty and useless clean-up code from read function of
+    Smb4KCustomOptionsManager.
+
+-------------------------------------------------------------------

Old:
----
  smb4k-1.0.5.tar.bz2

New:
----
  smb4k-1.0.6.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ smb4k.spec ++++++
--- /var/tmp/diff_new_pack.GIjSQb/_old  2013-03-18 07:18:02.000000000 +0100
+++ /var/tmp/diff_new_pack.GIjSQb/_new  2013-03-18 07:18:02.000000000 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package smb4k
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           smb4k
-Version:        1.0.5
+Version:        1.0.6
 Release:        0
 Summary:        Advanced Network Neighborhood Browser for KDE
 License:        GPL-2.0+

++++++ smb4k-1.0.5.tar.bz2 -> smb4k-1.0.6.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/smb4k-1.0.5/CMakeLists.txt 
new/smb4k-1.0.6/CMakeLists.txt
--- old/smb4k-1.0.5/CMakeLists.txt      2012-12-26 12:51:35.000000000 +0100
+++ new/smb4k-1.0.6/CMakeLists.txt      2013-03-03 11:46:53.000000000 +0100
@@ -1,9 +1,9 @@
 project( smb4k )
 
-set( VERSION 1.0.5 )
+set( VERSION 1.0.6 )
 set( VERSION_MAJOR 1 )
 set( VERSION_MINOR 0 )
-set( VERSION_PATCH 5 )
+set( VERSION_PATCH 6 )
 
 cmake_minimum_required( VERSION 2.6 )
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/smb4k-1.0.5/ChangeLog new/smb4k-1.0.6/ChangeLog
--- old/smb4k-1.0.5/ChangeLog   2012-12-26 10:23:54.000000000 +0100
+++ new/smb4k-1.0.6/ChangeLog   2013-03-03 11:46:53.000000000 +0100
@@ -1,3 +1,11 @@
+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).
+- Fixed unmounting of selected shares. Thanks go to Ettore Atalan for 
+  reporting this issue.
+- Removed faulty and useless clean-up code from read function of
+  Smb4KCustomOptionsManager.
+
 Smb4K 1.0.5 (2012-12-26):
 - Fixed hanging of Smb4K if a custom mount prefix without a trailing
   slash was entered (closes SF ticket #28). Thanks go to Ettore Atalan
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/smb4k-1.0.5/core/smb4kcustomoptionsmanager.cpp 
new/smb4k-1.0.6/core/smb4kcustomoptionsmanager.cpp
--- old/smb4k-1.0.5/core/smb4kcustomoptionsmanager.cpp  2012-02-12 
07:08:45.000000000 +0100
+++ new/smb4k-1.0.6/core/smb4kcustomoptionsmanager.cpp  2013-03-03 
11:46:53.000000000 +0100
@@ -222,12 +222,6 @@
 
 void Smb4KCustomOptionsManager::readCustomOptions()
 {
-  // Clean up.
-  if ( !m_options.isEmpty() )
-  {
-    delete m_options.takeFirst();
-  }
-  
   // Locate the XML file.
   QFile xmlFile( KGlobal::dirs()->locateLocal( "data", 
"smb4k/custom_options.xml", KGlobal::mainComponent() ) );
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/smb4k-1.0.5/core/smb4kmounter_p.cpp 
new/smb4k-1.0.6/core/smb4kmounter_p.cpp
--- old/smb4k-1.0.5/core/smb4kmounter_p.cpp     2012-12-25 21:47:21.000000000 
+0100
+++ new/smb4k-1.0.6/core/smb4kmounter_p.cpp     2013-03-03 11:46:53.000000000 
+0100
@@ -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() ) );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/smb4k-1.0.5/smb4k/sharesview/smb4ksharesview_part.cpp 
new/smb4k-1.0.6/smb4k/sharesview/smb4ksharesview_part.cpp
--- old/smb4k-1.0.5/smb4k/sharesview/smb4ksharesview_part.cpp   2012-02-12 
07:08:44.000000000 +0100
+++ new/smb4k-1.0.6/smb4k/sharesview/smb4ksharesview_part.cpp   2013-03-03 
11:46:53.000000000 +0100
@@ -1158,6 +1158,7 @@
     case IconMode:
     {
       QList<QListWidgetItem *> selected_items = m_icon_view->selectedItems();
+      QList<Smb4KShare *> shares;
 
       for ( int i = 0; i < selected_items.size(); ++i )
       {
@@ -1165,7 +1166,7 @@
 
         if ( item )
         {
-          Smb4KMounter::self()->unmountShare( item->shareItem(), false, 
m_icon_view );
+          shares << item->shareItem();
         }
         else
         {
@@ -1173,11 +1174,14 @@
         }
       }
 
+      Smb4KMounter::self()->unmountShares( shares, false, m_icon_view );
+
       break;
     }
     case ListMode:
     {
       QList<QTreeWidgetItem *> selected_items = m_list_view->selectedItems();
+      QList<Smb4KShare *> shares;
 
       for ( int i = 0; i < selected_items.size(); ++i )
       {
@@ -1185,7 +1189,7 @@
 
         if ( item )
         {
-          Smb4KMounter::self()->unmountShare( item->shareItem(), false, 
m_list_view );
+          shares << item->shareItem();
         }
         else
         {
@@ -1193,6 +1197,8 @@
         }
       }
 
+      Smb4KMounter::self()->unmountShares( shares, false, m_list_view );
+
       break;
     }
     default:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/smb4k-1.0.5/svn-commit.tmp 
new/smb4k-1.0.6/svn-commit.tmp
--- old/smb4k-1.0.5/svn-commit.tmp      2012-07-28 17:43:06.000000000 +0200
+++ new/smb4k-1.0.6/svn-commit.tmp      1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-Wait until all shares have been unmounted on exit before closing down.
--- Diese und die folgenden Zeilen werden ignoriert --
-
-M    ChangeLog
-M    core/smb4kmounter.cpp
-M    core/CMakeLists.txt

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to