sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move activity service registration in Activity

Browse Source
This commit is contained in:
Marco Pesenti Gritti 2006-08-07 16:42:36 +02:00
parent 9274f9707f
commit 544e47cbe0
2 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
activities/browser/BrowserActivity.py
View File

@ -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()

6
sugar/activity/Activity.py
View File

@ -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)