No need for a dedicated signal, the changed signal of the highlighted property is sufficient.

As a result, the GObject private member code is not needed. (bzr r3669.3.3)

2 files changed, 4 insertions, 26 deletions

diff --git a/plugins/unityshell/src/unity-session-button-accessible.cpp b/plugins/unityshell/src/unity-session-button-accessible.cpp
index 33b2dee49..40f56522c 100644
--- a/plugins/unityshell/src/unity-session-button-accessible.cpp
+++ b/plugins/unityshell/src/unity-session-button-accessible.cpp
@@ -57,7 +57,7 @@ static const gchar* unity_session_button_accessible_get_name(AtkAction *action,
 gint i);
 
 /* private/utility methods*/
-static void on_focus_change_cb(UnitySessionButtonAccessible* accessible);
+static void on_focus_change_cb(bool const& value, UnitySessionButtonAccessible* accessible);
 
 G_DEFINE_TYPE_WITH_CODE(UnitySessionButtonAccessible,
 unity_session_button_accessible,
@@ -65,15 +65,6 @@ G_DEFINE_TYPE_WITH_CODE(UnitySessionButtonAccessible,
 G_IMPLEMENT_INTERFACE(ATK_TYPE_ACTION,
 atk_action_interface_init))
 
-#define UNITY_SESSION_BUTTON_ACCESSIBLE_GET_PRIVATE(obj) \
- (G_TYPE_INSTANCE_GET_PRIVATE ((obj), UNITY_TYPE_SESSION_BUTTON_ACCESSIBLE, \
- UnitySessionButtonAccessiblePrivate))
-
-struct _UnitySessionButtonAccessiblePrivate
-{
- sigc::connection on_focus_change;
-};
-
 static void
 unity_session_button_accessible_class_init(UnitySessionButtonAccessibleClass* klass)
 {
@@ -87,17 +78,11 @@ unity_session_button_accessible_class_init(UnitySessionButtonAccessibleClass* kl
 atk_class->initialize = unity_session_button_accessible_initialize;
 atk_class->get_name = unity_session_button_accessible_get_name;
 atk_class->ref_state_set = unity_session_button_accessible_ref_state_set;
-
- g_type_class_add_private(gobject_class, sizeof(UnitySessionButtonAccessiblePrivate));
 }
 
 static void
 unity_session_button_accessible_init(UnitySessionButtonAccessible* session_button_accessible)
 {
- UnitySessionButtonAccessiblePrivate* priv =
- UNITY_SESSION_BUTTON_ACCESSIBLE_GET_PRIVATE(session_button_accessible);
-
- session_button_accessible->priv = priv;
 }
 
 static void
@@ -109,10 +94,6 @@ unity_session_button_accessible_dispose(GObject* object)
 static void
 unity_session_button_accessible_finalize(GObject* object)
 {
- UnitySessionButtonAccessible* self = UNITY_SESSION_BUTTON_ACCESSIBLE(object);
-
- self->priv->on_focus_change.disconnect();
-
 G_OBJECT_CLASS(unity_session_button_accessible_parent_class)->finalize(object);
 }
 
@@ -151,7 +132,8 @@ unity_session_button_accessible_initialize(AtkObject* accessible,
 
 button = dynamic_cast<Button*>(nux_object);
 
- self->priv->on_focus_change = button->highlight_change.connect(sigc::bind(sigc::ptr_fun(on_focus_change_cb), self));
+ button->highlighted.changed.connect(sigc::bind(sigc::ptr_fun(on_focus_change_cb),
+ UNITY_SESSION_BUTTON_ACCESSIBLE(self)));
 }
 
 static const gchar*
@@ -213,7 +195,7 @@ unity_session_button_accessible_ref_state_set(AtkObject* obj)
 
 /* private methods */
 static void
-on_focus_change_cb(UnitySessionButtonAccessible* accessible)
+on_focus_change_cb(bool const& value, UnitySessionButtonAccessible* accessible)
 {
 nux::Object* nux_object = NULL;
 Button* button = NULL;
diff --git a/plugins/unityshell/src/unity-session-button-accessible.h b/plugins/unityshell/src/unity-session-button-accessible.h
index b14cb51bd..9653c843e 100644
--- a/plugins/unityshell/src/unity-session-button-accessible.h
+++ b/plugins/unityshell/src/unity-session-button-accessible.h
@@ -34,14 +34,10 @@ G_BEGIN_DECLS
 
 typedef struct _UnitySessionButtonAccessible UnitySessionButtonAccessible;
 typedef struct _UnitySessionButtonAccessibleClass UnitySessionButtonAccessibleClass;
-typedef struct _UnitySessionButtonAccessiblePrivate UnitySessionButtonAccessiblePrivate;
 
 struct _UnitySessionButtonAccessible
 {
 NuxObjectAccessible parent;
-
- /*< private >*/
- UnitySessionButtonAccessiblePrivate* priv;
 };
 
 struct _UnitySessionButtonAccessibleClass