diff options
Diffstat (limited to 'src/sugar/graphics/objectchooser.py')
| -rw-r--r-- | src/sugar/graphics/objectchooser.py | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/sugar/graphics/objectchooser.py b/src/sugar/graphics/objectchooser.py index c4b9daf..9f0368a 100644 --- a/src/sugar/graphics/objectchooser.py +++ b/src/sugar/graphics/objectchooser.py @@ -51,16 +51,14 @@ class ObjectChooser(object): self._parent_xid = parent_xid self._main_loop = None - self._tree_id = None - self._version_id = None + self._object_id = None self._bus = None self._chooser_id = None self._response_code = gtk.RESPONSE_NONE self._what_filter = what_filter def run(self): - self._tree_id = None - self._version_id = None + self._object_id = None self._main_loop = gobject.MainLoop() @@ -95,10 +93,10 @@ class ObjectChooser(object): return self._response_code def get_selected_object(self): - if self._tree_id is None: + if self._object_id is None: return None else: - return datastore.get(self._tree_id, self._version_id) + return datastore.get(self._object_id) def destroy(self): self._cleanup() @@ -109,13 +107,12 @@ class ObjectChooser(object): self._main_loop = None self._bus = None - def __chooser_response_cb(self, chooser_id, tree_id, version_id): + def __chooser_response_cb(self, chooser_id, object_id): if chooser_id != self._chooser_id: return - logging.debug('ObjectChooser.__chooser_response_cb: (%r,%r)' % (tree_id, version_id)) + logging.debug('ObjectChooser.__chooser_response_cb: %r' % (object_id,)) self._response_code = gtk.RESPONSE_ACCEPT - self._tree_id = tree_id - self._version_id = version_id + self._object_id = object_id self._cleanup() def __chooser_cancelled_cb(self, chooser_id): |