Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Schampijer <simon@schampijer.de>2011-03-16 20:16:24 (GMT)
committer Simon Schampijer <simon@schampijer.de>2011-03-22 21:06:02 (GMT)
commit4ba1e8ba60225fe8032087ff5e579e1cd9911f37 (patch)
treea66eff1650a44349c98b4ca17139f13e654d05a9
parent88dd52a1fdc5ed4015c300cdf9fd2a9789144227 (diff)
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 <simon@laptop.org> Acked-By: Sascha Silbe <silbe@activitycentral.com>
-rw-r--r--src/buddy.py7
1 files changed, 1 insertions, 6 deletions
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