diff options
author | Tomeu Vizoso <tomeu@tomeuvizoso.net> | 2007-03-04 09:53:14 (GMT) |
---|---|---|
committer | Tomeu Vizoso <tomeu@tomeuvizoso.net> | 2007-03-04 09:53:14 (GMT) |
commit | 559d21d4d26da6bb4d42389852a447a562eab15a (patch) | |
tree | 18f06ce48bc9c73648fb84db1c874d0e5691ede6 /services | |
parent | d0277612092074a7fdebbaa42b3a958f1f2cb14f (diff) | |
parent | 4d0c540f8542fc5d0fdf6ee83d77b84ea9193918 (diff) |
Merge branch 'master' of git://dev.laptop.org/sugar
Diffstat (limited to 'services')
-rw-r--r-- | services/presence2/buddy.py | 6 | ||||
-rw-r--r-- | services/presence2/server_plugin.py | 40 |
2 files changed, 39 insertions, 7 deletions
diff --git a/services/presence2/buddy.py b/services/presence2/buddy.py index a49e178..f9946b5 100644 --- a/services/presence2/buddy.py +++ b/services/presence2/buddy.py @@ -141,7 +141,7 @@ class Buddy(DBusGObject): def GetIcon(self): if not self.props.icon: return "" - return self.props.icon + return dbus.ByteArray(self.props.icon) @dbus.service.method(_BUDDY_INTERFACE, in_signature="", out_signature="ao") @@ -158,9 +158,7 @@ class Buddy(DBusGObject): props['nick'] = self.props.nick props['owner'] = self.props.owner props['key'] = self.props.key - color = self.props.color - if color: - props['color'] = color + props['color'] = self.props.color return props # methods diff --git a/services/presence2/server_plugin.py b/services/presence2/server_plugin.py index 9990c19..a0c03b8 100644 --- a/services/presence2/server_plugin.py +++ b/services/presence2/server_plugin.py @@ -96,6 +96,8 @@ class ServerPlugin(gobject.GObject): self._conn = self._init_connection() + self._reconnect_id = 0 + def _get_account_info(self): account_info = {} @@ -210,7 +212,12 @@ class ServerPlugin(gobject.GObject): # vcards are changed #self._conn[CONN_INTERFACE_ALIASING].connect_to_signal('AliasesChanged', self._alias_changed_cb) - self._set_self_buddy_info() + try: + self._set_self_buddy_info() + except RuntimeError, e: + print e + self.cleanup() + return # Request presence for everyone on the channel self._conn[CONN_INTERFACE_PRESENCE].GetPresence(subscribe_handles) @@ -220,7 +227,11 @@ class ServerPlugin(gobject.GObject): props = {} props['color'] = profile.get_color().to_string() props['key'] = profile.get_pubkey() - self._conn[CONN_INTERFACE_BUDDY_INFO].SetProperties(props) + try: + self._conn[CONN_INTERFACE_BUDDY_INFO].SetProperties(props) + except dbus.DBusException, e: + if str(e).find("Server does not support PEP") >= 0: + raise RuntimeError("Server does not support PEP") name = profile.get_nick_name() self_handle = self._conn[CONN_INTERFACE].GetSelfHandle() @@ -249,12 +260,14 @@ class ServerPlugin(gobject.GObject): elif state == CONNECTION_STATUS_DISCONNECTED: print 'disconnected: %r' % reason self.emit('status', state, int(reason)) + self._conn = None if reason == CONNECTION_STATUS_REASON_AUTHENTICATION_FAILED: # FIXME: handle connection failure; retry later? pass return False def start(self): + print "Trying to connect..." # If the connection is already connected query initial contacts conn_status = self._conn[CONN_INTERFACE].GetStatus() if conn_status == CONNECTION_STATUS_CONNECTED: @@ -265,9 +278,26 @@ class ServerPlugin(gobject.GObject): elif conn_status == CONNECTION_STATUS_CONNECTING: pass else: - self._conn[CONN_INTERFACE].Connect() + self._conn[CONN_INTERFACE].Connect(reply_handler=self._connect_reply_cb, + error_handler=self._connect_error_cb) + + def _connect_reply_cb(self): + if self._reconnect_id > 0: + gobject.source_remove(self._reconnect_id) + + def _reconnect(self): + self._reconnect_id = 0 + self.start() + return False + + def _connect_error_cb(self, exception): + print "Connect error: %s" % exception + if not self._reconnect_id: + self._reconnect_id = gobject.timeout_add(10000, self._reconnect) def cleanup(self): + if not self._conn: + return self._conn[CONN_INTERFACE].Disconnect() def _contact_offline(self, handle): @@ -280,6 +310,10 @@ class ServerPlugin(gobject.GObject): except dbus.DBusException, e: if str(e).startswith("org.freedesktop.DBus.Error.NoReply"): raise InvalidBuddyError("couldn't get properties") + except KeyError, e: + if str(e) == "'%s'" % CONN_INTERFACE_BUDDY_INFO: + raise InvalidBuddyError("server doesn't support BuddyInfo interface") + if not props.has_key('color'): raise InvalidBuddyError("no color") if not props.has_key('key'): |