From 4ba1e8ba60225fe8032087ff5e579e1cd9911f37 Mon Sep 17 00:00:00 2001 From: Simon Schampijer Date: Wed, 16 Mar 2011 20:16:24 +0000 Subject: Make PS not dependent on buddy-icon.jpg to be around OLPC #10739 We did remove the creation of the buddy-icon.jpg in the Sugar profile c38e03f641e2f409464340bf67826809cf2f94dc. We have to adopt the PS to that change. The PS is used at the moment by Etoys exclusively. Signed-off-by: Simon Schampijer Acked-By: Sascha Silbe --- diff --git a/src/buddy.py b/src/buddy.py index f221a8f..f5ba268 100644 --- a/src/buddy.py +++ b/src/buddy.py @@ -862,14 +862,9 @@ class ShellOwner(GenericOwner): if not isinstance(nick, unicode): nick = unicode(nick, 'utf-8') - icon_file = os.path.join(env.get_profile_path(), "buddy-icon.jpg") - f = open(icon_file, "r") - icon = f.read() - f.close() - GenericOwner.__init__(self, ps, bus, 'keyid/' + psutils.pubkey_to_keyid(key), - key=key, nick=nick, color=color, icon=icon, key_hash=key_hash, + key=key, nick=nick, color=color, icon=None, key_hash=key_hash, tags=tags) # Ask to get notifications on Owner object property changes in the -- cgit v0.9.1