[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/smb4k/1.0
From:       Alexander Reinholdt <alexander.reinholdt () kdemail ! net>
Date:       2013-01-01 11:31:25
Message-ID: 20130101113125.98529AC80E () svn ! kde ! org
[Download RAW message or body]

SVN commit 1330270 by areinholdt:

Fix unmounting of selected shares.


 M  +3 -1      ChangeLog  
 M  +8 -2      smb4k/sharesview/smb4ksharesview_part.cpp  


--- branches/smb4k/1.0/ChangeLog #1330269:1330270
@@ -1,6 +1,8 @@
 Smb4K 1.0.6 (2013-01-??):
-- Fix crash in Smb4KMounter::slotAuthError() due to signals being emitted
+- Fixed crash in Smb4KMounter::slotAuthError() due to signals being emitted
   from Smb4KMountJob::slotActionFinished() too often.
+- Fixed unmounting of selected shares. Thanks go to Ettore Atalan for 
+  reporting this issue.
 
 Smb4K 1.0.5 (2012-12-26):
 - Fixed hanging of Smb4K if a custom mount prefix without a trailing
--- branches/smb4k/1.0/smb4k/sharesview/smb4ksharesview_part.cpp #1330269:1330270
@@ -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:
[prev in list] [next in list] [prev in thread] [next in thread]