respin (workaround hal failure too)
Probably should perform a halectomy here
This commit is contained in:
parent
50500ac68f
commit
ece602dfcc
|
@ -1,6 +1,21 @@
|
||||||
diff -up kdelibs-4.9.4/solid/solid/backends/udisks2/udisksstorageaccess.cpp.solid_qt_no_debug_output kdelibs-4.9.4/solid/solid/backends/udisks2/udisksstorageaccess.cpp
|
diff -up kdelibs-4.9.90/solid/solid/backends/hal/halstorageaccess.cpp.solid_qt_no_debug_output kdelibs-4.9.90/solid/solid/backends/hal/halstorageaccess.cpp
|
||||||
--- kdelibs-4.9.4/solid/solid/backends/udisks2/udisksstorageaccess.cpp.solid_qt_no_debug_output 2012-12-12 14:52:52.199346662 -0600
|
--- kdelibs-4.9.90/solid/solid/backends/hal/halstorageaccess.cpp.solid_qt_no_debug_output 2012-11-14 09:58:29.000000000 -0600
|
||||||
+++ kdelibs-4.9.4/solid/solid/backends/udisks2/udisksstorageaccess.cpp 2012-12-12 15:44:40.854085494 -0600
|
+++ kdelibs-4.9.90/solid/solid/backends/hal/halstorageaccess.cpp 2012-12-12 16:18:25.817495558 -0600
|
||||||
|
@@ -340,9 +340,11 @@ bool StorageAccess::requestPassphrase()
|
||||||
|
returnService, m_lastReturnObject,
|
||||||
|
wId, appId);
|
||||||
|
m_passphraseRequested = reply.isValid();
|
||||||
|
+#ifndef QT_NO_DEBUG_STREAM
|
||||||
|
if (!m_passphraseRequested) {
|
||||||
|
qWarning() << "Failed to call the SolidUiServer, D-Bus said:" << reply.error();
|
||||||
|
}
|
||||||
|
+#endif
|
||||||
|
return m_passphraseRequested;
|
||||||
|
}
|
||||||
|
|
||||||
|
diff -up kdelibs-4.9.90/solid/solid/backends/udisks2/udisksstorageaccess.cpp.solid_qt_no_debug_output kdelibs-4.9.90/solid/solid/backends/udisks2/udisksstorageaccess.cpp
|
||||||
|
--- kdelibs-4.9.90/solid/solid/backends/udisks2/udisksstorageaccess.cpp.solid_qt_no_debug_output 2012-11-14 09:58:29.000000000 -0600
|
||||||
|
+++ kdelibs-4.9.90/solid/solid/backends/udisks2/udisksstorageaccess.cpp 2012-12-12 16:17:36.922022895 -0600
|
||||||
@@ -341,9 +341,10 @@ bool StorageAccess::requestPassphrase()
|
@@ -341,9 +341,10 @@ bool StorageAccess::requestPassphrase()
|
||||||
QDBusReply<void> reply = soliduiserver.call("showPassphraseDialog", udi, returnService,
|
QDBusReply<void> reply = soliduiserver.call("showPassphraseDialog", udi, returnService,
|
||||||
m_lastReturnObject, wId, appId);
|
m_lastReturnObject, wId, appId);
|
||||||
|
@ -13,10 +28,10 @@ diff -up kdelibs-4.9.4/solid/solid/backends/udisks2/udisksstorageaccess.cpp.soli
|
||||||
return m_passphraseRequested;
|
return m_passphraseRequested;
|
||||||
}
|
}
|
||||||
|
|
||||||
diff -up kdelibs-4.9.4/solid/solid/CMakeLists.txt.solid_qt_no_debug_output kdelibs-4.9.4/solid/solid/CMakeLists.txt
|
diff -up kdelibs-4.9.90/solid/solid/CMakeLists.txt.solid_qt_no_debug_output kdelibs-4.9.90/solid/solid/CMakeLists.txt
|
||||||
--- kdelibs-4.9.4/solid/solid/CMakeLists.txt.solid_qt_no_debug_output 2012-12-12 14:52:52.194346712 -0600
|
--- kdelibs-4.9.90/solid/solid/CMakeLists.txt.solid_qt_no_debug_output 2012-11-14 09:58:29.000000000 -0600
|
||||||
+++ kdelibs-4.9.4/solid/solid/CMakeLists.txt 2012-12-12 14:52:52.203346619 -0600
|
+++ kdelibs-4.9.90/solid/solid/CMakeLists.txt 2012-12-12 16:17:36.922022895 -0600
|
||||||
@@ -240,7 +240,7 @@ if(NOT WIN32 AND NOT APPLE)
|
@@ -268,7 +268,7 @@ if(NOT WIN32 AND NOT APPLE)
|
||||||
|
|
||||||
if ( WITH_SOLID_UDISKS2 )
|
if ( WITH_SOLID_UDISKS2 )
|
||||||
message(STATUS "Building Solid UDisks2 backend." )
|
message(STATUS "Building Solid UDisks2 backend." )
|
||||||
|
|
Loading…
Reference in New Issue