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

Restore get_id/get_service_name, didn't realize they was used by subclasses.

Browse Source
This commit is contained in:
Marco Pesenti Gritti 2007-06-03 22:12:47 +02:00
parent aab18a866d
commit b2980d7bd6
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sugar/activity/activity.py
View File

@ -209,7 +209,7 @@ class Activity(Window, gtk.Container):
logging.debug('Creating a jobject.') logging.debug('Creating a jobject.')
self._jobject = datastore.create() self._jobject = datastore.create()
self._jobject.metadata['title'] = '%s %s' % (get_bundle_name(), 'Activity') self._jobject.metadata['title'] = '%s %s' % (get_bundle_name(), 'Activity')
self._jobject.metadata['activity'] = self._get_service_name() self._jobject.metadata['activity'] = self.get_service_name()
self._jobject.metadata['keep'] = '0' self._jobject.metadata['keep'] = '0'
self._jobject.metadata['buddies'] = '' self._jobject.metadata['buddies'] = ''
self._jobject.metadata['preview'] = '' self._jobject.metadata['preview'] = ''
@ -232,6 +232,12 @@ class Activity(Window, gtk.Container):
if pspec.name == 'active': if pspec.name == 'active':
return self._active return self._active
def get_id(self):
return self._activity_id
def get_service_name(self):
return os.environ['SUGAR_BUNDLE_SERVICE_NAME']
def set_canvas(self, canvas): def set_canvas(self, canvas):
Window.set_canvas(self, canvas) Window.set_canvas(self, canvas)
canvas.connect('map', self._canvas_map_cb) canvas.connect('map', self._canvas_map_cb)
@ -316,11 +322,8 @@ class Activity(Window, gtk.Container):
"""Execute the given command with args""" """Execute the given command with args"""
return False return False
def _get_service_name(self):
return os.environ['SUGAR_BUNDLE_SERVICE_NAME']
def _realize_cb(self, window): def _realize_cb(self, window):
wm.set_bundle_id(window.window, self._get_service_name()) wm.set_bundle_id(window.window, self.get_service_name())
wm.set_activity_id(window.window, self._activity_id) wm.set_activity_id(window.window, self._activity_id)
def _destroy_cb(self, window): def _destroy_cb(self, window):