diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-05-08 16:07:44 (GMT) |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-05-08 16:07:44 (GMT) |
| commit | 0d1b2bef13d565be5db0d64fee68e9931ec9db91 (patch) | |
| tree | 389909f8d725f8d731b2ab685b45e9f0e57d4671 /sugar | |
| parent | 1f024ff6e402f1a77f7918dd4b5555a846a01ecc (diff) | |
| parent | 28637c098ec6d95ede25cf050e90f64da176674f (diff) | |
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Diffstat (limited to 'sugar')
| -rw-r--r-- | sugar/activity/activityfactory.py | 2 | ||||
| -rw-r--r-- | sugar/p2p/network.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sugar/activity/activityfactory.py b/sugar/activity/activityfactory.py index 06ab280..3368b17 100644 --- a/sugar/activity/activityfactory.py +++ b/sugar/activity/activityfactory.py @@ -46,7 +46,7 @@ def create_activity_id(): found = False activities = pservice.get_activities() for act in activities: - if act_id == act.get_id(): + if act_id == act.props.id: found = True break if not found: diff --git a/sugar/p2p/network.py b/sugar/p2p/network.py index 504638a..2270e16 100644 --- a/sugar/p2p/network.py +++ b/sugar/p2p/network.py @@ -92,7 +92,7 @@ class ChunkedGlibHTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler): if self._file: self._srcid = gobject.io_add_watch(self.wfile, gobject.IO_OUT | gobject.IO_ERR, self._send_next_chunk) else: - f.close() + self._file.close() self._cleanup() def _send_next_chunk(self, source, condition): |