aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/greeter.cpp6
-rw-r--r--src/usb-manager.cpp7
-rw-r--r--src/usb-snap.cpp7
3 files changed, 1 insertions, 19 deletions
diff --git a/src/greeter.cpp b/src/greeter.cpp
index ed210b0..962a01d 100644
--- a/src/greeter.cpp
+++ b/src/greeter.cpp
@@ -50,7 +50,6 @@ private:
void set_state(const State& state)
{
-g_message("%s setting state to %s", G_STRLOC, state_str(state));
m_state.set(state);
}
@@ -109,7 +108,6 @@ g_message("%s setting state to %s", G_STRLOC, state_str(state));
const char* name_owner,
gpointer gself)
{
-g_message("%s %s appared on bus, owned by %s", G_STRLOC, name, name_owner);
auto self = static_cast<Impl*>(gself);
self->m_owner = name_owner;
@@ -134,7 +132,6 @@ g_message("%s %s appared on bus, owned by %s", G_STRLOC, name, name_owner);
const char* name,
gpointer gself)
{
-g_message("%s %s disappeared from bus", G_STRLOC, name);
auto self = static_cast<Impl*>(gself);
self->m_owner.clear();
@@ -146,7 +143,6 @@ g_message("%s %s disappeared from bus", G_STRLOC, name);
GAsyncResult* res,
gpointer gself)
{
-g_message("%s", G_STRLOC);
GError* error {};
auto v = g_dbus_connection_call_finish(G_DBUS_CONNECTION(source), res, &error);
if (error != nullptr) {
@@ -154,7 +150,6 @@ g_message("%s", G_STRLOC);
g_warning("Greeter: Error getting IsActive property: %s", error->message);
g_clear_error(&error);
} else {
-g_message("%s got '%s'", G_STRLOC, g_variant_print(v, true));
GVariant* is_active {};
g_variant_get_child(v, 0, "v", &is_active);
static_cast<Impl*>(gself)->set_state(g_variant_get_boolean(is_active) ? State::ACTIVE : State::INACTIVE);
@@ -173,7 +168,6 @@ g_message("%s got '%s'", G_STRLOC, g_variant_print(v, true));
gpointer gself)
{
auto self = static_cast<Impl*>(gself);
-g_message("%s on_properties_changed got %s", G_STRLOC, g_variant_print(parameters, true));
g_return_if_fail(!g_strcmp0(sender_name, self->m_owner.c_str()));
g_return_if_fail(!g_strcmp0(object_path, DBusNames::UnityGreeter::PATH));
diff --git a/src/usb-manager.cpp b/src/usb-manager.cpp
index ce546fe..cf3330d 100644
--- a/src/usb-manager.cpp
+++ b/src/usb-manager.cpp
@@ -50,9 +50,7 @@ public:
});
m_greeter->state().changed().connect([this](Greeter::State /*state*/) {
-g_message("%s clearing old snap, if any", G_STRLOC);
clear_snap();
-g_message("%s greeter state changed; calling maybe_snap()", G_STRLOC);
maybe_snap();
});
@@ -91,7 +89,7 @@ private:
m_adbd_client.reset(new GAdbdClient{m_socket_path});
m_adbd_client->on_pk_request().connect(
[this](const AdbdClient::PKRequest& req) {
- g_message("%s got pk request: %s, calling maybe_snap()", G_STRLOC, req.fingerprint.c_str());
+ g_debug("%s got pk request: %s, calling maybe_snap()", G_STRLOC, req.fingerprint.c_str());
m_req = req;
maybe_snap();
}
@@ -100,17 +98,14 @@ private:
void maybe_snap()
{
-g_message("%s m_req.public_key [%s]", G_STRLOC, m_req.public_key.c_str());
// only prompt if there's something to prompt about
if (m_req.public_key.empty())
return;
-g_message("%s m_greeter->state() %s", G_STRLOC, Greeter::state_str(m_greeter->state().get()));
// only prompt in an unlocked session
if (m_greeter->state().get() != Greeter::State::INACTIVE)
return;
-g_message("%s calling snap!", G_STRLOC);
snap();
}
diff --git a/src/usb-snap.cpp b/src/usb-snap.cpp
index 629898b..53db6c4 100644
--- a/src/usb-snap.cpp
+++ b/src/usb-snap.cpp
@@ -119,7 +119,6 @@ private:
g_variant_builder_add(&hints_builder, "{sv}", "x-canonical-snap-decisions", g_variant_new_string("true"));
g_variant_builder_add(&hints_builder, "{sv}", "x-canonical-private-affirmative-tint", g_variant_new_string("true"));
-g_message("%s calling notification notify", G_STRLOC);
auto args = g_variant_new("(susssasa{sv}i)",
"",
uint32_t(0),
@@ -154,7 +153,6 @@ g_message("%s calling notification notify", G_STRLOC);
g_warning("UsbSnap: Error calling Notify: %s", error->message);
g_clear_error(&error);
} else {
-g_message("%s on_notify reply %s", G_STRLOC, g_variant_print(reply, true));
uint32_t id {};
g_variant_get(reply, "(u)", &id);
static_cast<Impl*>(gself)->on_notify_reply(id);
@@ -164,7 +162,6 @@ g_message("%s on_notify reply %s", G_STRLOC, g_variant_print(reply, true));
void on_notify_reply(uint32_t id)
{
-g_message("%s setting m_notification_id to %d", G_STRLOC, int(id));
m_notification_id = id;
}
@@ -180,7 +177,6 @@ g_message("%s setting m_notification_id to %d", G_STRLOC, int(id));
g_return_if_fail(!g_strcmp0(interface_name, DBusNames::Notify::INTERFACE));
auto self = static_cast<Impl*>(gself);
-g_message("%s got signal %s with parameters %s", G_STRLOC, signal_name, g_variant_print(parameters, true));
if (!g_strcmp0(signal_name, DBusNames::Notify::ActionInvoked::NAME))
{
@@ -212,17 +208,14 @@ g_message("%s got signal %s with parameters %s", G_STRLOC, signal_name, g_varian
const bool remember_this_choice = response == AdbdClient::PKResponse::ALLOW;
m_on_user_response(response, remember_this_choice);
-g_message("%s clearing m_notification_id", G_STRLOC);
m_notification_id = 0;
}
void on_notification_closed(uint32_t close_reason)
{
-g_message("%s closed with reason %d", G_STRLOC, int(close_reason));
if (close_reason == DBusNames::Notify::NotificationClosed::Reason::EXPIRED)
m_on_user_response(AdbdClient::PKResponse::DENY, false);
-g_message("%s clearing m_notification_id", G_STRLOC);
m_notification_id = 0;
}