aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2016-09-22 16:33:48 -0500
committerCharles Kerr <charles.kerr@canonical.com>2016-09-22 16:33:48 -0500
commite616541cde47710de062367cc74c9b18821d9a73 (patch)
tree873bc9e5bcf5eb356bc722acb8a61b82e2901569 /src
parentb7c135151300dee6d6cb433cd9df989d4f04935f (diff)
downloadayatana-indicator-display-e616541cde47710de062367cc74c9b18821d9a73.tar.gz
ayatana-indicator-display-e616541cde47710de062367cc74c9b18821d9a73.tar.bz2
ayatana-indicator-display-e616541cde47710de062367cc74c9b18821d9a73.zip
fix tyop
Diffstat (limited to 'src')
-rw-r--r--src/adbd-client.cpp17
-rw-r--r--src/usb-manager.cpp1
2 files changed, 4 insertions, 14 deletions
diff --git a/src/adbd-client.cpp b/src/adbd-client.cpp
index dfa97da..585352c 100644
--- a/src/adbd-client.cpp
+++ b/src/adbd-client.cpp
@@ -190,20 +190,9 @@ g_message("%s %s", G_STRLOC, G_STRFUNC);
m_pkresponse = AdbdClient::PKResponse::DENY;
g_message("%s %s", G_STRLOC, G_STRFUNC);
pass_public_key_to_main_thread(public_key);
-g_message("%s %s", G_STRLOC, G_STRFUNC);
- g_debug("%s thread %p waiting", G_STRLOC, g_thread_self());
-g_message("%s %s", G_STRLOC, G_STRFUNC);
- try {
-g_message("%s %s", G_STRLOC, G_STRFUNC);
- m_pkresponse_cv.wait(lk, [this](){
-g_message("%s %s", G_STRLOC, G_STRFUNC);
- return m_pkresponse_ready || g_cancellable_is_cancelled(m_cancellable);
- });
- } catch (std::system_error& e) {
-g_message("%s %s", G_STRLOC, G_STRFUNC);
- g_critical("%s thread %p unable to wait for response because of unexpected error '%s'", G_STRLOC, g_thread_self(), e.what());
- }
-g_message("%s %s", G_STRLOC, G_STRFUNC);
+ m_pkresponse_cv.wait(lk, [this](){
+ return m_pkresponse_ready || g_cancellable_is_cancelled(m_cancellable);
+ });
response = m_pkresponse;
g_debug("%s thread %p got response '%d', is-cancelled %d", G_STRLOC,
g_thread_self(),
diff --git a/src/usb-manager.cpp b/src/usb-manager.cpp
index 81c1b9d..ee9b463 100644
--- a/src/usb-manager.cpp
+++ b/src/usb-manager.cpp
@@ -80,6 +80,7 @@ g_message("%s %s", G_STRLOC, G_STRFUNC);
maybe_snap();
}
);
+ }
~Impl()
{