lupine/telepathy-padfoot
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Disable the ContactList interface for now

Browse Source
This commit is contained in:
Nick Thomas
2020-05-16 20:19:04 +01:00
parent 64bbaccc3a
commit 52f13a3589
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/padfoot/connection.rs
View File

@@ -286,8 +286,8 @@ impl Connection {
let contacts_iface = let contacts_iface =
telepathy::connection_interface_contacts_server(&f, (), move |_| c_rc3.clone()); telepathy::connection_interface_contacts_server(&f, (), move |_| c_rc3.clone());
let c_rc4 = c_rc.clone(); let _c_rc4 = c_rc.clone();
let contact_list_iface = let _contact_list_iface =
telepathy::connection_interface_contact_list_server(&f, (), move |_| c_rc4.clone()); telepathy::connection_interface_contact_list_server(&f, (), move |_| c_rc4.clone());
let c_rc5 = c_rc.clone(); let c_rc5 = c_rc.clone();
@@ -303,7 +303,7 @@ impl Connection {
.add(conn_iface) .add(conn_iface)
.add(avatars_iface) .add(avatars_iface)
.add(contacts_iface) .add(contacts_iface)
.add(contact_list_iface) // .add(contact_list_iface)
.add(requests_iface) .add(requests_iface)
.add(simple_presence_iface), .add(simple_presence_iface),
); );

2
src/padfoot/connection/connection.rs
View File

@@ -19,7 +19,7 @@ pub fn connection_interfaces() -> Vec<String> {
"org.freedesktop.Telepathy.Connection".to_string(), "org.freedesktop.Telepathy.Connection".to_string(),
"org.freedesktop.Telepathy.Connection.Interface.Avatars".to_string(), "org.freedesktop.Telepathy.Connection.Interface.Avatars".to_string(),
"org.freedesktop.Telepathy.Connection.Interface.Contacts".to_string(), "org.freedesktop.Telepathy.Connection.Interface.Contacts".to_string(),
"org.freedesktop.Telepathy.Connection.Interface.ContactList".to_string(), // "org.freedesktop.Telepathy.Connection.Interface.ContactList".to_string(),
"org.freedesktop.Telepathy.Connection.Interface.Requests".to_string(), "org.freedesktop.Telepathy.Connection.Interface.Requests".to_string(),
"org.freedesktop.Telepathy.Connection.Interface.SimplePresence".to_string(), "org.freedesktop.Telepathy.Connection.Interface.SimplePresence".to_string(),
] ]

6
src/padfoot/connection/contacts.rs
View File

@@ -51,7 +51,7 @@ impl telepathy::ConnectionInterfaceContacts for Connection {
"org.freedesktop.Telepathy.Connection.Interface.Avatars/token".to_string(), "org.freedesktop.Telepathy.Connection.Interface.Avatars/token".to_string(),
Variant(Box::new("".to_string())), Variant(Box::new("".to_string())),
); );
/*
// TODO: we need to publish DBUS services on these endpoints // TODO: we need to publish DBUS services on these endpoints
props.insert( props.insert(
"org.freedesktop.Telepathy.Connection.Interface.ContactList/publish".to_string(), "org.freedesktop.Telepathy.Connection.Interface.ContactList/publish".to_string(),
@@ -62,7 +62,7 @@ impl telepathy::ConnectionInterfaceContacts for Connection {
"org.freedesktop.Telepathy.Connection.Interface.ContactList/subscribe".to_string(), "org.freedesktop.Telepathy.Connection.Interface.ContactList/subscribe".to_string(),
Variant(Box::new(4)), Variant(Box::new(4)),
); );
*/
out.insert(*id, props); out.insert(*id, props);
} }
@@ -89,7 +89,7 @@ impl telepathy::ConnectionInterfaceContacts for Connection {
Ok(vec![ Ok(vec![
"org.freedesktop.Telepathy.Connection".to_string(), "org.freedesktop.Telepathy.Connection".to_string(),
"org.freedesktop.Telepathy.Connection.Interface.Avatars".to_string(), "org.freedesktop.Telepathy.Connection.Interface.Avatars".to_string(),
"org.freedesktop.Telepathy.Connection.Interface.ContactList".to_string(), // "org.freedesktop.Telepathy.Connection.Interface.ContactList".to_string(),
]) ])
} }
} }