diff options
| author | Simon Schampijer <simon@schampijer.de> | 2009-08-12 07:13:21 (GMT) |
|---|---|---|
| committer | Simon Schampijer <simon@schampijer.de> | 2009-08-12 07:13:21 (GMT) |
| commit | c8016588eaefed5a55daf6e2387087a202cd5179 (patch) | |
| tree | 5c723e24aa89c0c4ce6ebe54f6a93a7acf51ff8c /src/jarabe/journal | |
| parent | f0d5242a11e5a6f5430629420c5e64d74734ac92 (diff) | |
| parent | 0224153536d2fbdbd318211173171074f38251cb (diff) | |
Merge branch 'master' of gitorious@git.sugarlabs.org:sugar/mainline
Diffstat (limited to 'src/jarabe/journal')
| -rw-r--r-- | src/jarabe/journal/__init__.py | 15 | ||||
| -rw-r--r-- | src/jarabe/journal/listview.py | 2 | ||||
| -rw-r--r-- | src/jarabe/journal/objectchooser.py | 6 |
3 files changed, 19 insertions, 4 deletions
diff --git a/src/jarabe/journal/__init__.py b/src/jarabe/journal/__init__.py index e69de29..6373228 100644 --- a/src/jarabe/journal/__init__.py +++ b/src/jarabe/journal/__init__.py @@ -0,0 +1,15 @@ +# Copyright (C) 2007, One Laptop Per Child +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA diff --git a/src/jarabe/journal/listview.py b/src/jarabe/journal/listview.py index 4b325f9..5e20577 100644 --- a/src/jarabe/journal/listview.py +++ b/src/jarabe/journal/listview.py @@ -246,7 +246,7 @@ class BaseListView(gtk.Bin): def __destroy_cb(self, widget): if self._model is not None: - self._model.destroy() + self._model.stop() def __favorite_set_data_cb(self, column, cell, tree_model, tree_iter): favorite = self._model[tree_iter][ListModel.COLUMN_FAVORITE] diff --git a/src/jarabe/journal/objectchooser.py b/src/jarabe/journal/objectchooser.py index 0e6de27..827f228 100644 --- a/src/jarabe/journal/objectchooser.py +++ b/src/jarabe/journal/objectchooser.py @@ -128,9 +128,9 @@ class ObjectChooser(gtk.Window): def __query_changed_cb(self, toolbar, query): self._list_view.update_with_query(query) - def __volume_changed_cb(self, volume_toolbar, volume_id): - logging.debug('Selected volume: %r.' % volume_id) - self._toolbar.set_volume_id(volume_id) + def __volume_changed_cb(self, volume_toolbar, mount_point): + logging.debug('Selected volume: %r.' % mount_point) + self._toolbar.set_mount_point(mount_point) def __visibility_notify_event_cb(self, window, event): logging.debug('visibility_notify_event_cb %r' % self) |