diff options
author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-09-22 17:39:44 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-09-22 17:39:44 (GMT) |
commit | 9b9d939e45f388b13d9874ddeca3d138378a5932 (patch) | |
tree | d043aafa59cae0df79a574e8bee99f90fa245403 | |
parent | 2d11fad1aa7b3144f51c9849f0f72f094583b4eb (diff) | |
parent | 801d02005893601a8037f392bb290038c21bd051 (diff) |
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
-rw-r--r-- | shell/model/Friends.py | 17 | ||||
-rw-r--r-- | sugar/simulator.py | 5 |
2 files changed, 15 insertions, 7 deletions
diff --git a/shell/model/Friends.py b/shell/model/Friends.py index b90f9d9..4a2298c 100644 --- a/shell/model/Friends.py +++ b/shell/model/Friends.py @@ -5,6 +5,7 @@ import gobject from model.BuddyModel import BuddyModel from sugar import env +import logging class Friends(gobject.GObject): __gsignals__ = { @@ -45,12 +46,16 @@ class Friends(gobject.GObject): def load(self): cp = ConfigParser() - if cp.read([self._path]): - for name in cp.sections(): - buddy = BuddyModel() - buddy.set_name(name) - buddy.set_color(cp.get(name, 'color')) - self.add_friend(buddy) + try: + success = cp.read([self._path]) + if success: + for name in cp.sections(): + buddy = BuddyModel() + buddy.set_name(name) + buddy.set_color(cp.get(name, 'color')) + self.add_friend(buddy) + except Exception, exc: + logging.error("Error parsing friends file: %s" % exc) def save(self): cp = ConfigParser() diff --git a/sugar/simulator.py b/sugar/simulator.py index b46b9c3..271d5ed 100644 --- a/sugar/simulator.py +++ b/sugar/simulator.py @@ -99,7 +99,10 @@ class Bot: self._pservice = PresenceService.get_instance() - gtk.main() + try: + gtk.main() + except KeyboardInterrupt: + pass def add_action(self, action, minutes): self._timeline.add(action, minutes) |