[Telepathy-commits] [telepathy-haze/master] Presence: implement Contacts interface hooks

[Simon McVittie]

---
 src/connection-presence.c |    5 +++--
 src/connection-presence.h |    2 +-
 src/connection.c          |    2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/connection-presence.c b/src/connection-presence.c
index cb031bb..f393bc2 100644
--- a/src/connection-presence.c
+++ b/src/connection-presence.c
@@ -325,8 +325,9 @@ haze_connection_presence_class_init (GObjectClass *object_class)
 }
 
 void
-haze_connection_presence_init (HazeConnection *self)
+haze_connection_presence_init (GObject *object)
 {
-    tp_presence_mixin_init (G_OBJECT (self), G_STRUCT_OFFSET (HazeConnection,
+    tp_presence_mixin_init (object, G_STRUCT_OFFSET (HazeConnection,
         presence));
+    tp_presence_mixin_simple_presence_register_with_contacts_mixin (object);
 }
diff --git a/src/connection-presence.h b/src/connection-presence.h
index 8ebbbaf..9f248c0 100644
--- a/src/connection-presence.h
+++ b/src/connection-presence.h
@@ -25,7 +25,7 @@
 #include "connection.h"
 
 void haze_connection_presence_class_init (GObjectClass *object_class);
-void haze_connection_presence_init (HazeConnection *self);
+void haze_connection_presence_init (GObject *object);
 
 void
 haze_connection_presence_account_status_changed (PurpleAccount *account,
diff --git a/src/connection.c b/src/connection.c
index caa909b..84caae8 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -582,7 +582,7 @@ haze_connection_init (HazeConnection *self)
     self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, HAZE_TYPE_CONNECTION,
                                               HazeConnectionPrivate);
 
-    haze_connection_presence_init (self);
+    haze_connection_presence_init ((GObject *) self);
 }
 
 static PurpleAccountUiOps
-- 
1.5.6.5