diff options
author | Luca Dariz <luca.dariz@gmail.com> | 2009-09-05 20:56:22 +0200 |
---|---|---|
committer | Luca Dariz <luca.dariz@gmail.com> | 2009-09-05 20:56:22 +0200 |
commit | ca8106f73e55a33acdf9b908f67464907eb779a2 (patch) | |
tree | 516af1b890949e9a1297a15fc57d92ddff15c7fb | |
parent | f6b2e978b350e24397ebba4065e590ebaa15b3fb (diff) |
Added semicolons, fix papyon.profile.Profile's attribute _client_id and fix setting capabilities in papyon.profile.ClientCapabilities
-rw-r--r-- | papyon/profile.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/papyon/profile.py b/papyon/profile.py index 36ce8b6..919c0f9 100644 --- a/papyon/profile.py +++ b/papyon/profile.py @@ -185,8 +185,8 @@ class ClientCapabilities(gobject.GObject): extra = int(caps[1]) else: extra = 0 - object.__setattr__(self, 'capabilities', self.MSNC[msnc] | capabilities) - object.__setattr__(self, 'extra', extra) + gobject.GObject.__setattr__(self, 'capabilities', self.MSNC[msnc] | capabilities) + gobject.GObject.__setattr__(self, 'extra', extra) def __getattr__(self, name): if name in self._CAPABILITIES: @@ -204,19 +204,19 @@ class ClientCapabilities(gobject.GObject): mask = self._CAPABILITIES[name] old_value = bool(self.capabilities & mask) if value: - object.__setattr__(self, 'capabilities', self.capabilities | mask) + gobject.GObject.__setattr__(self, 'capabilities', self.capabilities | mask) else: - object.__setattr__(self, 'capabilities', self.capabilities & ~mask) - if value != old_value + gobject.GObject.__setattr__(self, 'capabilities', self.capabilities & ~mask) + if value != old_value: self.emit('capability-changed', name, value) elif name in self._EXTRA: mask = self._EXTRA[name] old_value = bool(self.extra & mask) if value: - object.__setattr__(self, 'extra', self.extra | mask) + gobject.GObject.__setattr__(self, 'extra', self.extra | mask) else: - object.__setattr__(self, 'extra', self.extra & ~mask) - if value != old_value + gobject.GObject.__setattr__(self, 'extra', self.extra & ~mask) + if value != old_value: self.emit('capability-changed', name, value) else: raise AttributeError("object 'ClientCapabilities' has no attribute '%s'" % name) @@ -404,8 +404,8 @@ class Profile(gobject.GObject): self._signature_sound = None self._end_point_name = "" - self.client_id = ClientCapabilities(10) - self.client_id.supports_sip_invite = True + self._client_id = ClientCapabilities(10) + self._client_id.supports_sip_invite = True #self.client_id.supports_tunneled_sip = True self._client_id.connect("capability-changed", self._client_capability_changed) |