Fixed activity code, now works fine in XO again

4 files changed, 20 insertions, 8 deletions

diff --git a/MANIFEST b/MANIFEST
index ea982ee..8101b42 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -79,7 +79,7 @@ libs/olpcgames/util.py
 libs/olpcgames/video.py
 
 COPYING
-GambiarraActivity.py
+activity.py
 gambiarra.py
 MANIFEST
 NEWS
diff --git a/GambiarraActivity.py b/activity.py
index 038f559..4243485 100644
--- a/GambiarraActivity.py
+++ b/activity.py
@@ -19,12 +19,20 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-import olpcgames
+import sys
+import os.path
+
+# add the libs subdir to the path
+basedir = os.path.abspath(os.curdir)
+libdir = os.path.join(basedir, "libs")
+
+sys.path.insert(0, libdir)
 
 import logging
 
-class GambiarraActivity(olpcgames.PyGameActivity):
-    print "iniciou atividade"
-    game_name = 'Gambiarra.gambiarra:main'
+from olpcgames import activity
+
+class GambiarraActivity(activity.PyGameActivity):
+    game_name = 'gambiarra:main'
     game_title = "Gambiarra"
     game_size = (1200, 900)
diff --git a/activity/activity.info b/activity/activity.info
index bf438a5..c1a0314 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -2,6 +2,7 @@
 name = Gambiarra
 activity_version = 1
 host_version = 1
-service_name = org.laptop.Gambiarra
+service_name = org.laptop.community.Gambiarra
 icon = activity-gambiarra
-class = GambiarraActivity
\ No newline at end of file
+exec = sugar-activity activity.GambiarraActivity
+
diff --git a/gambiarra.py b/gambiarra.py
index ca1f2b8..62c94c9 100644
--- a/gambiarra.py
+++ b/gambiarra.py
@@ -22,6 +22,9 @@
 
 from Gambiarra.gambiarra import Game
 
-if __name__ == "__main__":
+def main():
     game = Game()
     game.run()
+
+if __name__ == "__main__":
+    main()