sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

services/presence/buddy: Set attributes more concisely, improve docstrings

Browse Source
This commit is contained in:
Simon McVittie 2007-05-25 12:24:32 +01:00
parent 56b95264cf
commit 1fa97c3d93
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
services/presence/buddy.py
View File

@ -510,18 +510,9 @@ class GenericOwner(Buddy):
calls Buddy.__init__ calls Buddy.__init__
""" """
self._ps = ps self._ps = ps
self._server = 'olpc.collabora.co.uk' self._server = kwargs.pop("server", "olpc.collabora.co.uk")
self._key_hash = None self._key_hash = kwargs.pop("key_hash", None)
self._registered = False self._registered = kwargs.pop("registered", False)
if kwargs.has_key("server"):
self._server = kwargs["server"]
del kwargs["server"]
if kwargs.has_key("key_hash"):
self._key_hash = kwargs["key_hash"]
del kwargs["key_hash"]
if kwargs.has_key("registered"):
self._registered = kwargs["registered"]
del kwargs["registered"]
self._ip4_addr_monitor = psutils.IP4AddressMonitor.get_instance() self._ip4_addr_monitor = psutils.IP4AddressMonitor.get_instance()
self._ip4_addr_monitor.connect("address-changed", self._ip4_addr_monitor.connect("address-changed",
@ -544,11 +535,13 @@ class GenericOwner(Buddy):
return self._registered return self._registered
def get_server(self): def get_server(self):
"""Retrieve presence server (XXX url??)""" """Retrieve XMPP server hostname (used by the server plugin)"""
return self._server return self._server
def get_key_hash(self): def get_key_hash(self):
"""Retrieve the user's private-key hash""" """Retrieve the user's private-key hash (used by the server plugin
as a password)
"""
return self._key_hash return self._key_hash
def set_registered(self, registered): def set_registered(self, registered):