From 544e47cbe0fc73f153f4572051bd88b688af2533 Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Mon, 7 Aug 2006 16:42:36 +0200 Subject: [PATCH] Move activity service registration in Activity --- activities/browser/BrowserActivity.py | 14 ++------------ sugar/activity/Activity.py | 6 +----- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/activities/browser/BrowserActivity.py b/activities/browser/BrowserActivity.py index c507b7ef..ac1fc963 100644 --- a/activities/browser/BrowserActivity.py +++ b/activities/browser/BrowserActivity.py @@ -1,6 +1,3 @@ -import logging -import xml.sax.saxutils - import gtk import geckoembed @@ -109,16 +106,9 @@ class BrowserActivity(Activity): return self.embed def share(self): - escaped_title = xml.sax.saxutils.escape(self.embed.get_title()) - escaped_url = xml.sax.saxutils.escape(self.embed.get_address()) + Activity.share(self) - # Share this activity with others - properties = {_SERVICE_URI_TAG: escaped_url, _SERVICE_TITLE_TAG: escaped_title} - self._share_service = self._pservice.share_activity(self, - stype=self._default_type, properties=properties) - - # Create our activity-specific browser sharing service - self._model = LocalModel(self, self._pservice, self._share_service) + self._model = LocalModel(self, self._pservice, self._service) self._model.set_value('owner', self._pservice.get_owner().get_name()) self._update_shared_location() diff --git a/sugar/activity/Activity.py b/sugar/activity/Activity.py index dbefdc9a..f540b2a1 100644 --- a/sugar/activity/Activity.py +++ b/sugar/activity/Activity.py @@ -209,10 +209,6 @@ class Activity(gtk.Window): def get_id(self): return self._activity_id - ############################################################# - # Pure Virtual methods that subclasses may/may not implement - ############################################################# - def share(self): """Called to request the activity to share itself on the network.""" - pass + self._service = self._pservice.share_activity(self, self._default_type)