From 19506296905cddb9a286921a0d56ab22c404aa12 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 20 Apr 2016 15:09:44 -0500 Subject: debug tracers --- src/greeter.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src/greeter.cpp') diff --git a/src/greeter.cpp b/src/greeter.cpp index f9cd965..a064ec2 100644 --- a/src/greeter.cpp +++ b/src/greeter.cpp @@ -66,6 +66,8 @@ private: void on_bus_ready(GDBusConnection* bus) { + g_message("%s bus is ready", G_STRLOC); + m_bus = G_DBUS_CONNECTION(g_object_ref(G_OBJECT(bus))); g_dbus_connection_call(m_bus, @@ -95,6 +97,7 @@ private: static void on_get_is_active_ready(GObject* source, 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) { @@ -102,6 +105,7 @@ private: g_warning("UsbSnap: Error getting session bus: %s", error->message); g_clear_error(&error); } else { + g_message("%s v is %s", G_STRLOC, g_variant_print(v, true)); GVariant* is_active {}; g_variant_get_child(v, 0, "v", &is_active); static_cast(gself)->m_is_active.set(g_variant_get_boolean(is_active)); @@ -124,10 +128,13 @@ private: g_return_if_fail(g_variant_is_of_type(parameters, G_VARIANT_TYPE(DBusNames::Properties::PropertiesChanged::ARGS_VARIANT_TYPE))); auto v = g_variant_get_child_value (parameters, 1); + if (v != nullptr) + g_message("%s v is %s", G_STRLOC, g_variant_print(v, true)); + gboolean is_active {}; if (g_variant_lookup(v, "IsActive", "b", &is_active)) { - g_debug("%s is_active changed to %d", G_STRLOC, int(is_active)); + g_message("%s is_active changed to %d", G_STRLOC, int(is_active)); static_cast(gself)->m_is_active.set(is_active); } g_clear_pointer(&v, g_variant_unref); -- cgit v1.2.3 From e683501043c00810558db55461b49c66ecf1aa0b Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 20 Apr 2016 16:36:10 -0500 Subject: more tracers --- src/greeter.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/greeter.cpp') diff --git a/src/greeter.cpp b/src/greeter.cpp index a064ec2..d2e34a0 100644 --- a/src/greeter.cpp +++ b/src/greeter.cpp @@ -29,6 +29,7 @@ public: Impl(): m_cancellable{g_cancellable_new()} { + g_message("%s getting bus", G_STRLOC); g_bus_get(G_BUS_TYPE_SESSION, m_cancellable, on_bus_ready_static, this); } @@ -52,6 +53,7 @@ private: static void on_bus_ready_static(GObject* /*source*/, GAsyncResult* res, gpointer gself) { + g_message("%s %s", G_STRLOC, G_STRFUNC); GError* error {}; auto bus = g_bus_get_finish (res, &error); if (error != nullptr) { @@ -122,6 +124,8 @@ private: GVariant* parameters, gpointer gself) { + g_message("%s", G_STRLOC); + g_return_if_fail(!g_strcmp0(object_path, DBusNames::UnityGreeter::PATH)); g_return_if_fail(!g_strcmp0(interface_name, DBusNames::Properties::INTERFACE)); g_return_if_fail(!g_strcmp0(signal_name, DBusNames::Properties::PropertiesChanged::NAME)); -- cgit v1.2.3 From cb46051005d5d9d1f21d7cb82b9fffd21f88c4c9 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 20 Apr 2016 17:09:14 -0500 Subject: watch for the Greeter to appear on the bus --- src/greeter.cpp | 144 ++++++++++++++++++++++++++++++++------------------------ 1 file changed, 82 insertions(+), 62 deletions(-) (limited to 'src/greeter.cpp') diff --git a/src/greeter.cpp b/src/greeter.cpp index d2e34a0..9d331d7 100644 --- a/src/greeter.cpp +++ b/src/greeter.cpp @@ -26,21 +26,40 @@ class UnityGreeter::Impl { public: - Impl(): + explicit Impl(GDBusConnection* connection): + m_bus(G_DBUS_CONNECTION(g_object_ref(connection))), m_cancellable{g_cancellable_new()} { - g_message("%s getting bus", G_STRLOC); - g_bus_get(G_BUS_TYPE_SESSION, m_cancellable, on_bus_ready_static, this); +g_message("%s %s", G_STRLOC, G_STRFUNC); + + m_watcher_id = g_bus_watch_name_on_connection( + m_bus, + DBusNames::UnityGreeter::NAME, + G_BUS_NAME_WATCHER_FLAGS_AUTO_START, + on_greeter_appeared, + on_greeter_vanished, + this, + nullptr); + + m_subscription_id = g_dbus_connection_signal_subscribe( + m_bus, + DBusNames::UnityGreeter::NAME, + DBusNames::Properties::INTERFACE, + DBusNames::Properties::PropertiesChanged::NAME, + DBusNames::UnityGreeter::PATH, + DBusNames::UnityGreeter::INTERFACE, + G_DBUS_SIGNAL_FLAGS_NONE, + on_properties_changed_signal, + this, + nullptr); } ~Impl() { g_cancellable_cancel(m_cancellable); g_clear_object(&m_cancellable); - - if (m_subscription_id != 0) - g_dbus_connection_signal_unsubscribe (m_bus, m_subscription_id); - + g_bus_unwatch_name(m_watcher_id); + g_dbus_connection_signal_unsubscribe(m_bus, m_subscription_id); g_clear_object(&m_bus); } @@ -51,60 +70,55 @@ public: private: - static void on_bus_ready_static(GObject* /*source*/, GAsyncResult* res, gpointer gself) + static void on_greeter_appeared( + GDBusConnection* /*session_bus*/, + const char* /*name*/, + const char* name_owner, + gpointer gself) { g_message("%s %s", G_STRLOC, G_STRFUNC); - GError* error {}; - auto bus = g_bus_get_finish (res, &error); - if (error != nullptr) { - if (!g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) - g_warning("UsbSnap: Error getting session bus: %s", error->message); - g_clear_error(&error); - } else { - static_cast(gself)->on_bus_ready(bus); - } - g_clear_object(&bus); + auto self = static_cast(gself); + + self->m_owner = name_owner; + + g_dbus_connection_call( + self->m_bus, + DBusNames::UnityGreeter::NAME, + DBusNames::UnityGreeter::PATH, + DBusNames::Properties::INTERFACE, + "Get", + g_variant_new("(ss)", DBusNames::UnityGreeter::INTERFACE, "IsActive"), + G_VARIANT_TYPE("(v)"), + G_DBUS_CALL_FLAGS_NONE, + -1, + self->m_cancellable, + on_get_is_active_ready, + gself); } - void on_bus_ready(GDBusConnection* bus) + static void on_greeter_vanished( + GDBusConnection* /*session_bus*/, + const char* /*name*/, + gpointer gself) { - g_message("%s bus is ready", G_STRLOC); - - m_bus = G_DBUS_CONNECTION(g_object_ref(G_OBJECT(bus))); - - g_dbus_connection_call(m_bus, - DBusNames::UnityGreeter::NAME, - DBusNames::UnityGreeter::PATH, - DBusNames::Properties::INTERFACE, - "Get", - g_variant_new("(ss)", DBusNames::UnityGreeter::INTERFACE, "IsActive"), - G_VARIANT_TYPE("(v)"), - G_DBUS_CALL_FLAGS_NONE, - -1, - m_cancellable, - on_get_is_active_ready, - this); - - m_subscription_id = g_dbus_connection_signal_subscribe(m_bus, - DBusNames::UnityGreeter::NAME, - DBusNames::Properties::INTERFACE, - DBusNames::Properties::PropertiesChanged::NAME, - DBusNames::UnityGreeter::PATH, - DBusNames::UnityGreeter::INTERFACE, - G_DBUS_SIGNAL_FLAGS_NONE, - on_properties_changed_signal, - this, - nullptr); + g_message("%s %s", G_STRLOC, G_STRFUNC); + auto self = static_cast(gself); + + self->m_owner.clear(); + self->m_is_active.set(false); } - static void on_get_is_active_ready(GObject* source, GAsyncResult* res, gpointer gself) + static void on_get_is_active_ready( + GObject* source, + 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) { if (!g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) - g_warning("UsbSnap: Error getting session bus: %s", error->message); + g_warning("Greeter: Error getting IsActive property: %s", error->message); g_clear_error(&error); } else { g_message("%s v is %s", G_STRLOC, g_variant_print(v, true)); @@ -116,22 +130,24 @@ private: g_clear_pointer(&v, g_variant_unref); } - static void on_properties_changed_signal(GDBusConnection* /*connection*/, - const gchar* /*sender_name*/, - const gchar* object_path, - const gchar* interface_name, - const gchar* signal_name, - GVariant* parameters, - gpointer gself) + static void on_properties_changed_signal( + GDBusConnection* /*connection*/, + const gchar* sender_name, + const gchar* object_path, + const gchar* interface_name, + const gchar* signal_name, + GVariant* parameters, + gpointer gself) { - g_message("%s", G_STRLOC); + auto self = static_cast(gself); + g_return_if_fail(!g_strcmp0(sender_name, self->m_owner.c_str())); g_return_if_fail(!g_strcmp0(object_path, DBusNames::UnityGreeter::PATH)); g_return_if_fail(!g_strcmp0(interface_name, DBusNames::Properties::INTERFACE)); g_return_if_fail(!g_strcmp0(signal_name, DBusNames::Properties::PropertiesChanged::NAME)); g_return_if_fail(g_variant_is_of_type(parameters, G_VARIANT_TYPE(DBusNames::Properties::PropertiesChanged::ARGS_VARIANT_TYPE))); - auto v = g_variant_get_child_value (parameters, 1); + auto v = g_variant_get_child_value(parameters, 1); if (v != nullptr) g_message("%s v is %s", G_STRLOC, g_variant_print(v, true)); @@ -139,15 +155,19 @@ private: if (g_variant_lookup(v, "IsActive", "b", &is_active)) { g_message("%s is_active changed to %d", G_STRLOC, int(is_active)); - static_cast(gself)->m_is_active.set(is_active); + self->m_is_active.set(is_active); } g_clear_pointer(&v, g_variant_unref); + } - core::Property m_is_active; - GCancellable* m_cancellable {}; + core::Property m_is_active {false}; + GDBusConnection* m_bus {}; + GCancellable* m_cancellable {}; + guint m_watcher_id {}; unsigned int m_subscription_id {}; + std::string m_owner; }; /*** @@ -158,8 +178,8 @@ Greeter::Greeter() =default; Greeter::~Greeter() =default; -UnityGreeter::UnityGreeter(): - impl{new Impl{}} +UnityGreeter::UnityGreeter(GDBusConnection* connection): + impl{new Impl{connection}} { } -- cgit v1.2.3 From e1284eb774d75f96d61787f116b0d79328b27286 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 20 Apr 2016 17:32:17 -0500 Subject: remove tracers --- src/greeter.cpp | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'src/greeter.cpp') diff --git a/src/greeter.cpp b/src/greeter.cpp index 9d331d7..903bd2a 100644 --- a/src/greeter.cpp +++ b/src/greeter.cpp @@ -30,8 +30,6 @@ public: m_bus(G_DBUS_CONNECTION(g_object_ref(connection))), m_cancellable{g_cancellable_new()} { -g_message("%s %s", G_STRLOC, G_STRFUNC); - m_watcher_id = g_bus_watch_name_on_connection( m_bus, DBusNames::UnityGreeter::NAME, @@ -76,7 +74,6 @@ private: const char* name_owner, gpointer gself) { - g_message("%s %s", G_STRLOC, G_STRFUNC); auto self = static_cast(gself); self->m_owner = name_owner; @@ -101,7 +98,6 @@ private: const char* /*name*/, gpointer gself) { - g_message("%s %s", G_STRLOC, G_STRFUNC); auto self = static_cast(gself); self->m_owner.clear(); @@ -113,7 +109,6 @@ private: 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) { @@ -121,7 +116,6 @@ private: g_warning("Greeter: Error getting IsActive property: %s", error->message); g_clear_error(&error); } else { - g_message("%s v is %s", G_STRLOC, g_variant_print(v, true)); GVariant* is_active {}; g_variant_get_child(v, 0, "v", &is_active); static_cast(gself)->m_is_active.set(g_variant_get_boolean(is_active)); @@ -148,13 +142,11 @@ private: g_return_if_fail(g_variant_is_of_type(parameters, G_VARIANT_TYPE(DBusNames::Properties::PropertiesChanged::ARGS_VARIANT_TYPE))); auto v = g_variant_get_child_value(parameters, 1); - if (v != nullptr) - g_message("%s v is %s", G_STRLOC, g_variant_print(v, true)); gboolean is_active {}; if (g_variant_lookup(v, "IsActive", "b", &is_active)) { - g_message("%s is_active changed to %d", G_STRLOC, int(is_active)); + g_debug("%s is_active changed to %d", G_STRLOC, int(is_active)); self->m_is_active.set(is_active); } g_clear_pointer(&v, g_variant_unref); -- cgit v1.2.3 From 3b84a37b2caae0c7c971b3c7cc5df9be1319a5ac Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Thu, 21 Apr 2016 09:19:25 -0500 Subject: don't pass a GDBusConnection to the Greeter ctor --- src/greeter.cpp | 109 +++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 68 insertions(+), 41 deletions(-) (limited to 'src/greeter.cpp') diff --git a/src/greeter.cpp b/src/greeter.cpp index 903bd2a..7f79bf9 100644 --- a/src/greeter.cpp +++ b/src/greeter.cpp @@ -26,40 +26,20 @@ class UnityGreeter::Impl { public: - explicit Impl(GDBusConnection* connection): - m_bus(G_DBUS_CONNECTION(g_object_ref(connection))), - m_cancellable{g_cancellable_new()} + explicit Impl() { - m_watcher_id = g_bus_watch_name_on_connection( - m_bus, - DBusNames::UnityGreeter::NAME, - G_BUS_NAME_WATCHER_FLAGS_AUTO_START, - on_greeter_appeared, - on_greeter_vanished, - this, - nullptr); - - m_subscription_id = g_dbus_connection_signal_subscribe( - m_bus, - DBusNames::UnityGreeter::NAME, - DBusNames::Properties::INTERFACE, - DBusNames::Properties::PropertiesChanged::NAME, - DBusNames::UnityGreeter::PATH, - DBusNames::UnityGreeter::INTERFACE, - G_DBUS_SIGNAL_FLAGS_NONE, - on_properties_changed_signal, - this, - nullptr); + m_cancellable.reset( + g_cancellable_new(), + [](GCancellable* c){ + g_cancellable_cancel(c); + g_clear_object(&c); + } + ); + + g_bus_get(G_BUS_TYPE_SESSION, m_cancellable.get(), on_bus_ready, this); } - ~Impl() - { - g_cancellable_cancel(m_cancellable); - g_clear_object(&m_cancellable); - g_bus_unwatch_name(m_watcher_id); - g_dbus_connection_signal_unsubscribe(m_bus, m_subscription_id); - g_clear_object(&m_bus); - } + ~Impl() =default; core::Property& is_active() { @@ -68,8 +48,57 @@ public: private: + static void on_bus_ready( + GObject* /*source*/, + GAsyncResult* res, + gpointer gself) + { + GError* error {}; + auto bus = g_bus_get_finish(res, &error); + if (error != nullptr) + { + if (!g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) + g_warning("Greeter: Error getting bus: %s", error->message); + g_clear_error(&error); + } + else + { + auto self = static_cast(gself); + + const auto watcher_id = g_bus_watch_name_on_connection( + bus, + DBusNames::UnityGreeter::NAME, + G_BUS_NAME_WATCHER_FLAGS_AUTO_START, + on_greeter_appeared, + on_greeter_vanished, + gself, + nullptr); + + const auto subscription_id = g_dbus_connection_signal_subscribe( + bus, + DBusNames::UnityGreeter::NAME, + DBusNames::Properties::INTERFACE, + DBusNames::Properties::PropertiesChanged::NAME, + DBusNames::UnityGreeter::PATH, + DBusNames::UnityGreeter::INTERFACE, + G_DBUS_SIGNAL_FLAGS_NONE, + on_properties_changed_signal, + gself, + nullptr); + + self->m_bus.reset( + bus, + [watcher_id, subscription_id](GDBusConnection* o){ + g_bus_unwatch_name(watcher_id); + g_dbus_connection_signal_unsubscribe(o, subscription_id); + g_clear_object(&o); + } + ); + } + } + static void on_greeter_appeared( - GDBusConnection* /*session_bus*/, + GDBusConnection* bus, const char* /*name*/, const char* name_owner, gpointer gself) @@ -79,7 +108,7 @@ private: self->m_owner = name_owner; g_dbus_connection_call( - self->m_bus, + bus, DBusNames::UnityGreeter::NAME, DBusNames::UnityGreeter::PATH, DBusNames::Properties::INTERFACE, @@ -88,13 +117,13 @@ private: G_VARIANT_TYPE("(v)"), G_DBUS_CALL_FLAGS_NONE, -1, - self->m_cancellable, + self->m_cancellable.get(), on_get_is_active_ready, gself); } static void on_greeter_vanished( - GDBusConnection* /*session_bus*/, + GDBusConnection* /*bus*/, const char* /*name*/, gpointer gself) { @@ -155,10 +184,8 @@ private: core::Property m_is_active {false}; - GDBusConnection* m_bus {}; - GCancellable* m_cancellable {}; - guint m_watcher_id {}; - unsigned int m_subscription_id {}; + std::shared_ptr m_bus; + std::shared_ptr m_cancellable; std::string m_owner; }; @@ -170,8 +197,8 @@ Greeter::Greeter() =default; Greeter::~Greeter() =default; -UnityGreeter::UnityGreeter(GDBusConnection* connection): - impl{new Impl{connection}} +UnityGreeter::UnityGreeter(): + impl{new Impl{}} { } -- cgit v1.2.3 From d4e82e7d4fa1937d27d1397a036af2b6b03349b3 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Thu, 21 Apr 2016 09:33:08 -0500 Subject: code cleanup to prepare for MR --- src/greeter.cpp | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'src/greeter.cpp') diff --git a/src/greeter.cpp b/src/greeter.cpp index 7f79bf9..d41160f 100644 --- a/src/greeter.cpp +++ b/src/greeter.cpp @@ -26,13 +26,13 @@ class UnityGreeter::Impl { public: - explicit Impl() + Impl() { m_cancellable.reset( g_cancellable_new(), - [](GCancellable* c){ - g_cancellable_cancel(c); - g_clear_object(&c); + [](GCancellable* o){ + g_cancellable_cancel(o); + g_clear_object(&o); } ); @@ -154,7 +154,7 @@ private: } static void on_properties_changed_signal( - GDBusConnection* /*connection*/, + GDBusConnection* /*bus*/, const gchar* sender_name, const gchar* object_path, const gchar* interface_name, @@ -171,7 +171,6 @@ private: g_return_if_fail(g_variant_is_of_type(parameters, G_VARIANT_TYPE(DBusNames::Properties::PropertiesChanged::ARGS_VARIANT_TYPE))); auto v = g_variant_get_child_value(parameters, 1); - gboolean is_active {}; if (g_variant_lookup(v, "IsActive", "b", &is_active)) { @@ -179,13 +178,11 @@ private: self->m_is_active.set(is_active); } g_clear_pointer(&v, g_variant_unref); - } core::Property m_is_active {false}; - - std::shared_ptr m_bus; std::shared_ptr m_cancellable; + std::shared_ptr m_bus; std::string m_owner; }; -- cgit v1.2.3 From ce5234162fa0c534ff9abf3fce3d03f4b01e893e Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Fri, 22 Apr 2016 09:43:44 -0500 Subject: don't prompt when the greeter's not running yet: change greeter's payload from an 'is_active' bool to a three-value state of active, inactive, and unavailable --- src/greeter.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/greeter.cpp') diff --git a/src/greeter.cpp b/src/greeter.cpp index d41160f..317a829 100644 --- a/src/greeter.cpp +++ b/src/greeter.cpp @@ -41,9 +41,9 @@ public: ~Impl() =default; - core::Property& is_active() + core::Property& state() { - return m_is_active; + return m_state; } private: @@ -130,7 +130,7 @@ private: auto self = static_cast(gself); self->m_owner.clear(); - self->m_is_active.set(false); + self->m_state.set(State::UNAVAILABLE); } static void on_get_is_active_ready( @@ -147,7 +147,7 @@ private: } else { GVariant* is_active {}; g_variant_get_child(v, 0, "v", &is_active); - static_cast(gself)->m_is_active.set(g_variant_get_boolean(is_active)); + static_cast(gself)->m_state.set(g_variant_get_boolean(is_active) ? State::ACTIVE : State::INACTIVE); g_clear_pointer(&is_active, g_variant_unref); } g_clear_pointer(&v, g_variant_unref); @@ -175,12 +175,12 @@ private: if (g_variant_lookup(v, "IsActive", "b", &is_active)) { g_debug("%s is_active changed to %d", G_STRLOC, int(is_active)); - self->m_is_active.set(is_active); + self->m_state.set(is_active ? State::ACTIVE : State::INACTIVE); } g_clear_pointer(&v, g_variant_unref); } - core::Property m_is_active {false}; + core::Property m_state {State::UNAVAILABLE}; std::shared_ptr m_cancellable; std::shared_ptr m_bus; std::string m_owner; @@ -201,8 +201,8 @@ UnityGreeter::UnityGreeter(): UnityGreeter::~UnityGreeter() =default; -core::Property& -UnityGreeter::is_active() +core::Property& +UnityGreeter::state() { - return impl->is_active(); + return impl->state(); } -- cgit v1.2.3 From 7d2fac8f46110a84d8396251cd0f38351b92f6ce Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Mon, 25 Apr 2016 11:05:22 +0200 Subject: add tracer log messages --- src/greeter.cpp | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) (limited to 'src/greeter.cpp') diff --git a/src/greeter.cpp b/src/greeter.cpp index 317a829..ed210b0 100644 --- a/src/greeter.cpp +++ b/src/greeter.cpp @@ -48,6 +48,12 @@ public: private: + void set_state(const State& state) + { +g_message("%s setting state to %s", G_STRLOC, state_str(state)); + m_state.set(state); + } + static void on_bus_ready( GObject* /*source*/, GAsyncResult* res, @@ -99,10 +105,11 @@ private: static void on_greeter_appeared( GDBusConnection* bus, - const char* /*name*/, + const char* name, 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(gself); self->m_owner = name_owner; @@ -124,13 +131,14 @@ private: static void on_greeter_vanished( GDBusConnection* /*bus*/, - const char* /*name*/, + const char* name, gpointer gself) { +g_message("%s %s disappeared from bus", G_STRLOC, name); auto self = static_cast(gself); self->m_owner.clear(); - self->m_state.set(State::UNAVAILABLE); + self->set_state(State::UNAVAILABLE); } static void on_get_is_active_ready( @@ -138,6 +146,7 @@ private: 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) { @@ -145,9 +154,10 @@ private: 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(gself)->m_state.set(g_variant_get_boolean(is_active) ? State::ACTIVE : State::INACTIVE); + static_cast(gself)->set_state(g_variant_get_boolean(is_active) ? State::ACTIVE : State::INACTIVE); g_clear_pointer(&is_active, g_variant_unref); } g_clear_pointer(&v, g_variant_unref); @@ -163,6 +173,7 @@ private: gpointer gself) { auto self = static_cast(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)); @@ -173,10 +184,7 @@ private: auto v = g_variant_get_child_value(parameters, 1); gboolean is_active {}; if (g_variant_lookup(v, "IsActive", "b", &is_active)) - { - g_debug("%s is_active changed to %d", G_STRLOC, int(is_active)); - self->m_state.set(is_active ? State::ACTIVE : State::INACTIVE); - } + self->set_state(is_active ? State::ACTIVE : State::INACTIVE); g_clear_pointer(&v, g_variant_unref); } -- cgit v1.2.3 From 020e49163abd558ae095ab9a00b6b69b4fdaef2a Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 27 Apr 2016 10:43:08 +0200 Subject: remove the temporary tracers --- src/greeter.cpp | 6 ------ 1 file changed, 6 deletions(-) (limited to 'src/greeter.cpp') 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(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(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(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(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)); -- cgit v1.2.3 From 6dfd01c5db87f659beb5c53c0c3ea1f57ab0701b Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 27 Apr 2016 10:45:24 +0200 Subject: fix two trivial 'unused parameter' warnings in glib callbacks --- src/greeter.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/greeter.cpp') diff --git a/src/greeter.cpp b/src/greeter.cpp index 962a01d..9bd5db0 100644 --- a/src/greeter.cpp +++ b/src/greeter.cpp @@ -104,7 +104,7 @@ private: static void on_greeter_appeared( GDBusConnection* bus, - const char* name, + const char* /*name*/, const char* name_owner, gpointer gself) { @@ -129,7 +129,7 @@ private: static void on_greeter_vanished( GDBusConnection* /*bus*/, - const char* name, + const char* /*name*/, gpointer gself) { auto self = static_cast(gself); -- cgit v1.2.3 From 7002fc4e6a6496fb5c0d3294540c957787689847 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Fri, 21 Oct 2016 13:32:21 +0200 Subject: add block braces as suggested by dobey --- src/greeter.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/greeter.cpp') diff --git a/src/greeter.cpp b/src/greeter.cpp index 9bd5db0..3d0f347 100644 --- a/src/greeter.cpp +++ b/src/greeter.cpp @@ -146,8 +146,9 @@ private: GError* error {}; auto v = g_dbus_connection_call_finish(G_DBUS_CONNECTION(source), res, &error); if (error != nullptr) { - if (!g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) + if (!g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { g_warning("Greeter: Error getting IsActive property: %s", error->message); + } g_clear_error(&error); } else { GVariant* is_active {}; -- cgit v1.2.3