Adapt to activity api change

shell/model/homeactivity.py

@@ -82,7 +82,7 @@ class HomeActivity(gobject.GObject):
         act_id = self._service.get_id()
         if act_id != self._id:
             raise RuntimeError("Activity's real ID (%s) didn't match expected (%s)." % (act_id, self._id))
-        act_type = self._service.get_type()
+        act_type = self._service.get_service_name()
         if act_type != self._type:
             raise RuntimeError("Activity's real type (%s) didn't match expected (%s)." % (act_type, self._type))
 

sugar/activity/activity.py

@@ -16,6 +16,7 @@
 # Boston, MA 02111-1307, USA.
 
 import logging
+import os
 
 import gtk