Merge branch 'master' of git+ssh://guillaume@dev.laptop.org/git/sugar

2007-03-08 15:47:40 +01:00
parent 2262b5fd49 66b1c48211
commit 2312aa6a99
17 changed files with 48 additions and 48 deletions
@@ -358,9 +358,6 @@ 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")