From b35dfc63193ac3368dd9b71e269f824d625f2068 Mon Sep 17 00:00:00 2001 From: Gonzalo Odiard Date: Tue, 21 Jun 2011 11:40:25 +0000 Subject: Journal: Do not rescan external device if is not needed - OLPC #10841 Do not rescan if the created item is not part of the currently selected view Signed-off-by: Gonzalo Odiard Acked-By: Simon Schampijer Reviewed-by: Martin Abente Reviewed-by: Sascha Silbe --- diff --git a/src/jarabe/journal/listview.py b/src/jarabe/journal/listview.py index 0aee1b7..0554008 100644 --- a/src/jarabe/journal/listview.py +++ b/src/jarabe/journal/listview.py @@ -117,14 +117,24 @@ class BaseListView(gtk.Bin): model.updated.connect(self.__model_updated_cb) model.deleted.connect(self.__model_deleted_cb) - def __model_created_cb(self, sender, **kwargs): - self._set_dirty() - - def __model_updated_cb(self, sender, **kwargs): - self._set_dirty() - - def __model_deleted_cb(self, sender, **kwargs): - self._set_dirty() + def __model_created_cb(self, sender, signal, object_id): + if self._is_new_item_visible(object_id): + self._set_dirty() + + def __model_updated_cb(self, sender, signal, object_id): + if self._is_new_item_visible(object_id): + self._set_dirty() + + def __model_deleted_cb(self, sender, signal, object_id): + if self._is_new_item_visible(object_id): + self._set_dirty() + + def _is_new_item_visible(self, object_id): + """Check if the created item is part of the currently selected view""" + if self._query['mountpoints'] == ['/']: + return not object_id.startswith('/') + else: + return object_id.startswith(self._query['mountpoints'][0]) def _add_columns(self): cell_favorite = CellRendererFavorite(self.tree_view) -- cgit v0.9.1