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

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:

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):