aboutsummaryrefslogtreecommitdiff
path: root/src/adbd-client.cpp
diff options
context:
space:
mode:
authorRobert Tari <robert@tari.in>2021-08-04 17:08:17 +0200
committerRobert Tari <robert@tari.in>2021-08-04 17:08:17 +0200
commit53bab0ef23c8396dd6e3473593ffe027cb2d5fc4 (patch)
tree8413072aa2b936f1bdf9ed07ad5c645472161245 /src/adbd-client.cpp
parent4d6d205398bec86a702ed4af9c7834b950f67c8c (diff)
parent3336228bccde7de599e7f56b4b8b67b8552c6a95 (diff)
downloadayatana-indicator-display-53bab0ef23c8396dd6e3473593ffe027cb2d5fc4.tar.gz
ayatana-indicator-display-53bab0ef23c8396dd6e3473593ffe027cb2d5fc4.tar.bz2
ayatana-indicator-display-53bab0ef23c8396dd6e3473593ffe027cb2d5fc4.zip
Merge branch 'sunweaver-pr/travis-ci'
Attributes GH PR #15: https://github.com/AyatanaIndicators/ayatana-indicator-display/pull/15
Diffstat (limited to 'src/adbd-client.cpp')
-rw-r--r--src/adbd-client.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/adbd-client.cpp b/src/adbd-client.cpp
index 47914cb..f4f419f 100644
--- a/src/adbd-client.cpp
+++ b/src/adbd-client.cpp
@@ -107,7 +107,7 @@ private:
void on_public_key_response(PKResponse response)
{
- g_debug("%s thread %p got response %d", G_STRLOC, g_thread_self(), int(response));
+ g_debug("%s thread %p got response %d", G_STRLOC, (void*)g_thread_self(), int(response));
// set m_pkresponse and wake up the waiting worker thread
m_pkresponse = response;
@@ -125,11 +125,11 @@ private:
while (!g_cancellable_is_cancelled(m_cancellable))
{
- g_debug("%s thread %p creating a client socket to '%s'", G_STRLOC, g_thread_self(), socket_path.c_str());
+ g_debug("%s thread %p creating a client socket to '%s'", G_STRLOC, (void*)g_thread_self(), socket_path.c_str());
auto socket = create_client_socket(socket_path);
bool got_valid_req = false;
- g_debug("%s thread %p calling read_request", g_thread_self(), G_STRLOC);
+ g_debug("%s thread %p calling read_request", G_STRLOC, (void*)g_thread_self());
std::string reqstr;
if (socket != nullptr)
reqstr = read_request(socket);
@@ -139,7 +139,7 @@ private:
if (reqstr.substr(0,2) == "PK") {
PKResponse response = PKResponse::DENY;
const auto public_key = reqstr.substr(2);
- g_debug("%s thread %p got pk [%s]", G_STRLOC, g_thread_self(), public_key.c_str());
+ g_debug("%s thread %p got pk [%s]", G_STRLOC, (void*)g_thread_self(), public_key.c_str());
if (!public_key.empty()) {
got_valid_req = true;
std::unique_lock<std::mutex> lk(m_pkresponse_mutex);
@@ -151,7 +151,7 @@ private:
});
response = m_pkresponse;
g_debug("%s thread %p got response '%d', is-cancelled %d", G_STRLOC,
- g_thread_self(),
+ (void*)g_thread_self(),
int(response),
int(g_cancellable_is_cancelled(m_cancellable)));
}