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

List:       kde-commits
Subject:    =?utf-8?q?=5Bkdelibs/KDE/4=2E6=5D_solid/solid/backends/udisks=3A?=
From:       Ozan Çağlayan <ozan () pardus ! org ! tr>
Date:       2011-04-21 12:13:48
Message-ID: 20110421121348.94776A60A4 () git ! kde ! org
[Download RAW message or body]

Git commit 6315b732cd8c775892d442c5709349e0f66d1f12 by Ozan Çağlayan.
Committed on 21/04/2011 at 09:33.
Pushed by ozan into branch 'KDE/4.6'.

Really wait until the slave filesystem is really mounted

Backport:
When you first attempt to mount an encrypted container and provide
the passphrase, udisks doesn't correctly wait for mount completion.

Fix this so that dolphin points the mounted slave filesystem instead
of the Home directory.

REVIEW:101160
BUG:271156
FIXED-IN:4.6.3
(cherry picked from commit bdf3cc8ac328e907e88de36d698bba6a7f0e2c7f)

M  +6    -3    solid/solid/backends/udisks/udisksstorageaccess.cpp     

http://commits.kde.org/kdelibs/6315b732cd8c775892d442c5709349e0f66d1f12

diff --git a/solid/solid/backends/udisks/udisksstorageaccess.cpp \
b/solid/solid/backends/udisks/udisksstorageaccess.cpp index 8a51f25..463045f 100644
--- a/solid/solid/backends/udisks/udisksstorageaccess.cpp
+++ b/solid/solid/backends/udisks/udisksstorageaccess.cpp
@@ -149,10 +149,13 @@ void UDisksStorageAccess::slotDBusReply( const QDBusMessage & \
                reply )
         if (isLuksDevice() && !isAccessible())  // unlocked device, now mount it
             mount();
 
-        m_setupInProgress = false;
-        m_device->broadcastActionDone("setup");
+        else // Don't broadcast setupDone unless the setup is really done. (Fix \
kde#271156) +        {
+            m_setupInProgress = false;
+            m_device->broadcastActionDone("setup");
 
-        slotChanged();
+            slotChanged();
+        }
     }
     else if (m_teardownInProgress)
     {


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