From 9c7c2349ea443045a03855219bbb18e35c3a04e3 Mon Sep 17 00:00:00 2001
From: jlew <jlew.blackout@gmail.com>
Date: Sun, 27 Mar 2011 17:08:46 +0000
Subject: Merge branch 'master' of gitorious.org:jlew/xo-file-distro

---
diff --git a/FileShare.activity/GuiView.py b/FileShare.activity/GuiView.py
index f9357cd..cbf782b 100644
--- a/FileShare.activity/GuiView.py
+++ b/FileShare.activity/GuiView.py
@@ -17,13 +17,14 @@
 import gtk
 import FileInfo
 import threading
+import os
 from gettext import gettext as _
 
 
 from sugar.activity.activity import ActivityToolbox
 from sugar.graphics.toolbutton import ToolButton
 from sugar.graphics.objectchooser import ObjectChooser
-from sugar.graphics.alert import NotifyAlert, Alert
+from sugar.graphics.alert import NotifyAlert
 
 from MyExceptions import InShareException, FileUploadFailure, ServerRequestFailure, NoFreeTubes
 import logging
@@ -39,7 +40,7 @@ class GuiHandler():
     def requestAddFile(self, widget, data=None):
         _logger.info('Requesting to add file')
 
-        chooser = ObjectChooser()
+        chooser = ObjectChooser(parent=self.activity)
         if chooser.run() == gtk.RESPONSE_ACCEPT:
             # get object and build file
             jobject = chooser.get_selected_object()
diff --git a/FileShare.activity/activity/activity.info b/FileShare.activity/activity/activity.info
index 47daba5..6929387 100644
--- a/FileShare.activity/activity/activity.info
+++ b/FileShare.activity/activity/activity.info
@@ -1,8 +1,8 @@
 [Activity]
 name = FileShare
 service_name = org.laptop.sugar.FileShareActivity
-activity_version = 9
+activity_version = 10
 host_version = 1
 icon = fileshare-icon
-class = FileShareActivity.FileShareActivity
+exec = sugar-activity FileShareActivity.FileShareActivity
 show_launcher = yes
--
cgit v0.9.1