[telepathy-gabble/master] GabbleConnection: hook up Avatars properties from telepathy-spec 0.17.22

Simon McVittie simon.mcvittie at collabora.co.uk
Wed Mar 25 11:23:59 PDT 2009


---
 src/conn-avatars.c |    4 ++--
 src/conn-avatars.h |    2 +-
 src/connection.c   |    7 +++++++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/conn-avatars.c b/src/conn-avatars.c
index bdac777..943faba 100644
--- a/src/conn-avatars.c
+++ b/src/conn-avatars.c
@@ -891,7 +891,7 @@ conn_avatars_iface_init (gpointer g_iface, gpointer iface_data)
 #undef IMPLEMENT
 }
 
-static const TpDBusPropertiesMixinPropImpl props[] = {
+static TpDBusPropertiesMixinPropImpl props[] = {
       { "MinimumAvatarWidth", GUINT_TO_POINTER (AVATAR_MIN_PX), NULL },
       { "RecommendedAvatarWidth", GUINT_TO_POINTER (AVATAR_REC_PX), NULL },
       { "MaximumAvatarWidth", GUINT_TO_POINTER (AVATAR_MAX_PX), NULL },
@@ -903,7 +903,7 @@ static const TpDBusPropertiesMixinPropImpl props[] = {
       { "SupportedAvatarMIMETypes", NULL, NULL },
       { NULL }
 };
-const TpDBusPropertiesMixinPropImpl *conn_avatars_properties = props;
+TpDBusPropertiesMixinPropImpl *conn_avatars_properties = props;
 
 void
 conn_avatars_properties_getter (GObject *object,
diff --git a/src/conn-avatars.h b/src/conn-avatars.h
index c1d03f1..0e2899f 100644
--- a/src/conn-avatars.h
+++ b/src/conn-avatars.h
@@ -28,7 +28,7 @@ G_BEGIN_DECLS
 void conn_avatars_init (GabbleConnection *conn);
 void conn_avatars_iface_init (gpointer g_iface, gpointer iface_data);
 
-extern const TpDBusPropertiesMixinPropImpl *conn_avatars_properties;
+extern TpDBusPropertiesMixinPropImpl *conn_avatars_properties;
 void conn_avatars_properties_getter (GObject *object, GQuark interface,
     GQuark name, GValue *value, gpointer getter_data);
 
diff --git a/src/connection.c b/src/connection.c
index fa30de5..8fd6780 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -567,9 +567,16 @@ gabble_connection_class_init (GabbleConnectionClass *gabble_connection_class)
           conn_location_properties_setter,
           location_props,
         },
+        { TP_IFACE_CONNECTION_INTERFACE_AVATARS,
+          conn_avatars_properties_getter,
+          NULL,
+          NULL,
+        },
         { NULL }
   };
 
+  prop_interfaces[2].props = conn_avatars_properties;
+
   DEBUG("Initializing (GabbleConnectionClass *)%p", gabble_connection_class);
 
   object_class->get_property = gabble_connection_get_property;
-- 
1.5.6.5




More information about the telepathy-commits mailing list