diff options
| -rw-r--r-- | activities/browser/BrowserActivity.py | 11 | ||||
| -rw-r--r-- | activities/terminal/TerminalActivity.py | 2 | ||||
| -rw-r--r-- | sugar/activity/Activity.py | 6 |
3 files changed, 6 insertions, 13 deletions
diff --git a/activities/browser/BrowserActivity.py b/activities/browser/BrowserActivity.py index 2ff0e50..c507b7e 100644 --- a/activities/browser/BrowserActivity.py +++ b/activities/browser/BrowserActivity.py @@ -20,14 +20,9 @@ class BrowserActivity(Activity): FOLLOWING = 2 LEADING = 3 - def __init__(self, service, args): + def __init__(self, service): Activity.__init__(self, service) - if len(args) > 0: - self.uri = args[0] - else: - self.uri = 'http://www.google.com' - self._mode = BrowserActivity.SOLO self._share_service = None self._model_service = None @@ -44,10 +39,8 @@ class BrowserActivity(Activity): self.embed = geckoembed.Browser() self.embed.connect("title", self.__title_cb) - vbox.pack_start(self.embed) - + vbox.pack_start(self.embed) self.embed.show() - self.embed.load_address(self.uri) nav_toolbar = NavigationToolbar(self) vbox.pack_start(nav_toolbar, False) diff --git a/activities/terminal/TerminalActivity.py b/activities/terminal/TerminalActivity.py index c9ee525..0c1fde1 100644 --- a/activities/terminal/TerminalActivity.py +++ b/activities/terminal/TerminalActivity.py @@ -51,7 +51,7 @@ class Terminal(gtk.HBox): pass class TerminalActivity(Activity): - def __init__(self, service, args): + def __init__(self, service): Activity.__init__(self, service) self.set_title("Terminal") diff --git a/sugar/activity/Activity.py b/sugar/activity/Activity.py index 4815d35..dbefdc9 100644 --- a/sugar/activity/Activity.py +++ b/sugar/activity/Activity.py @@ -54,14 +54,14 @@ class ActivityFactory(dbus.service.Object): def create_with_service(self, service_path): pservice = PresenceService() service = pservice.get(service_path) - activity = self._class(service, []) + activity = self._class(service) @dbus.service.method("com.redhat.Sugar.ActivityFactory") def create(self): - activity = self._class(None, []) + activity = self._class(None) activity.set_default_type(self._default_type) -def create(activity_name, service = None, args = None): +def create(activity_name, service = None): """Create a new activity from his name.""" bus = dbus.SessionBus() |