diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2007-03-06 16:22:33 (GMT) |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2007-03-06 16:22:33 (GMT) |
| commit | a0230ba78483424d4a06a5bcc78ab36eed66a510 (patch) | |
| tree | 008192534797f318ef5aa17cc36548d54ac47cc2 /services | |
| parent | b310f177b6db7dd96ff8c9d4cb1abd084d6c7801 (diff) | |
move dirty hacks to declare interfaces in init_connections to avoid warnings
Diffstat (limited to 'services')
| -rw-r--r-- | services/presence2/server_plugin.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/services/presence2/server_plugin.py b/services/presence2/server_plugin.py index a5c57e6..105b216 100644 --- a/services/presence2/server_plugin.py +++ b/services/presence2/server_plugin.py @@ -157,6 +157,10 @@ class ServerPlugin(gobject.GObject): # hack conn._valid_interfaces.add(CONN_INTERFACE_PRESENCE) + conn._valid_interfaces.add(CONN_INTERFACE_BUDDY_INFO) + conn._valid_interfaces.add(CONN_INTERFACE_AVATARS) + conn._valid_interfaces.add(CONN_INTERFACE_ALIASING) + conn[CONN_INTERFACE_PRESENCE].connect_to_signal('PresenceUpdate', self._presence_update_cb) @@ -199,8 +203,6 @@ class ServerPlugin(gobject.GObject): # request subscriptions from people subscribed to us if we're not subscribed to them subscribe[CHANNEL_INTERFACE_GROUP].AddMembers([self_handle], '') - # hack - self._conn._valid_interfaces.add(CONN_INTERFACE_BUDDY_INFO) if CONN_INTERFACE_BUDDY_INFO not in self._conn.get_valid_interfaces(): print 'OLPC information not available' self.cleanup() @@ -209,12 +211,8 @@ class ServerPlugin(gobject.GObject): self._conn[CONN_INTERFACE_BUDDY_INFO].connect_to_signal('PropertiesChanged', self._properties_changed_cb) self._conn[CONN_INTERFACE_BUDDY_INFO].connect_to_signal('ActivitiesChanged', self._activities_changed_cb) - # hack - self._conn._valid_interfaces.add(CONN_INTERFACE_AVATARS) self._conn[CONN_INTERFACE_AVATARS].connect_to_signal('AvatarUpdated', self._avatar_updated_cb) - # hack - self._conn._valid_interfaces.add(CONN_INTERFACE_ALIASING) # FIXME: we need to use PEP to store the nick. We aren't notified when # vcards are changed #self._conn[CONN_INTERFACE_ALIASING].connect_to_signal('AliasesChanged', self._alias_changed_cb) |