diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2009-08-21 12:40:55 +0100 |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2009-08-24 20:08:45 +0100 |
commit | b7f4197b0264949c2c37507f32e5e98a2b2f6662 (patch) | |
tree | daacedcc5bb490d7e7c51d35d84ddca63fce12d0 /src/conn-olpc.c | |
parent | 0041a6fc8d2ec2a7efd30019208be2678fb2a530 (diff) | |
download | telepathy-gabble-b7f4197b0264949c2c37507f32e5e98a2b2f6662.tar.gz |
gabble_connection_ensure_capabilities: use capability sets
Diffstat (limited to 'src/conn-olpc.c')
-rw-r--r-- | src/conn-olpc.c | 32 |
1 files changed, 24 insertions, 8 deletions
diff --git a/src/conn-olpc.c b/src/conn-olpc.c index ee4d866d8..7623a4ea1 100644 --- a/src/conn-olpc.c +++ b/src/conn-olpc.c @@ -393,7 +393,9 @@ olpc_buddy_info_get_properties (GabbleSvcOLPCBuddyInfo *iface, DEBUG ("called"); - gabble_connection_ensure_capabilities (conn, PRESENCE_CAP_OLPC_1); + gabble_connection_ensure_capabilities (conn, + gabble_capabilities_get_olpc_notify ()); + if (!check_pep (conn, context)) return; @@ -451,7 +453,9 @@ transmit_properties (GabbleConnection *conn, LmMessage *msg; LmMessageNode *publish; - gabble_connection_ensure_capabilities (conn, PRESENCE_CAP_OLPC_1); + gabble_connection_ensure_capabilities (conn, + gabble_capabilities_get_olpc_notify ()); + if (!check_pep (conn, context)) return; @@ -938,7 +942,9 @@ olpc_buddy_info_get_activities (GabbleSvcOLPCBuddyInfo *iface, DEBUG ("called"); - gabble_connection_ensure_capabilities (conn, PRESENCE_CAP_OLPC_1); + gabble_connection_ensure_capabilities (conn, + gabble_capabilities_get_olpc_notify ()); + if (!check_pep (conn, context)) return; @@ -1042,7 +1048,9 @@ olpc_buddy_info_set_activities (GabbleSvcOLPCBuddyInfo *iface, DEBUG ("called"); - gabble_connection_ensure_capabilities (conn, PRESENCE_CAP_OLPC_1); + gabble_connection_ensure_capabilities (conn, + gabble_capabilities_get_olpc_notify ()); + if (!check_pep (conn, context)) return; @@ -1353,7 +1361,9 @@ olpc_buddy_info_get_current_activity (GabbleSvcOLPCBuddyInfo *iface, DEBUG ("called for contact#%u", contact); - gabble_connection_ensure_capabilities (conn, PRESENCE_CAP_OLPC_1); + gabble_connection_ensure_capabilities (conn, + gabble_capabilities_get_olpc_notify ()); + if (!check_pep (conn, context)) return; @@ -1442,7 +1452,9 @@ olpc_buddy_info_set_current_activity (GabbleSvcOLPCBuddyInfo *iface, DEBUG ("called"); - gabble_connection_ensure_capabilities (conn, PRESENCE_CAP_OLPC_1); + gabble_connection_ensure_capabilities (conn, + gabble_capabilities_get_olpc_notify ()); + if (!check_pep (conn, context)) return; @@ -1727,7 +1739,9 @@ olpc_activity_properties_set_properties (GabbleSvcOLPCActivityProperties *iface, DEBUG ("called"); - gabble_connection_ensure_capabilities (conn, PRESENCE_CAP_OLPC_1); + gabble_connection_ensure_capabilities (conn, + gabble_capabilities_get_olpc_notify ()); + if (!check_pep (conn, context)) return; @@ -1841,7 +1855,9 @@ olpc_activity_properties_get_properties (GabbleSvcOLPCActivityProperties *iface, DEBUG ("called"); - gabble_connection_ensure_capabilities (conn, PRESENCE_CAP_OLPC_1); + gabble_connection_ensure_capabilities (conn, + gabble_capabilities_get_olpc_notify ()); + if (!check_pep (conn, context)) return; |