From bd92ae9d2c400c26e87389052225dc31eb33fe28 Mon Sep 17 00:00:00 2001
From: Aleksey Lim <alsroot@member.fsf.org>
Date: Sun, 23 Aug 2009 14:57:49 +0000
Subject: Remove redundant update signal

---
(limited to 'src')

diff --git a/src/jarabe/journal/lazymodel.py b/src/jarabe/journal/lazymodel.py
index 44522a2..221a5d2 100644
--- a/src/jarabe/journal/lazymodel.py
+++ b/src/jarabe/journal/lazymodel.py
@@ -166,24 +166,19 @@ class LazyModel(gtk.GenericTreeModel):
 
         self._update_columns()
 
-        count = self._source.get_count()
-
         # TODO how to handle large update,
         #      commented for now since in TableView
         #      it works fine w/o these updates
+        #
         #for i in range(self._last_count, count):
         #    self.emit('row-inserted', (i, ), self.get_iter((i, )))
         #for i in reversed(range(count, self._last_count)):
         #    self.emit('row-deleted', (i, ))
-        if self._last_count != count:
-            self.emit('rows-reordered', (0, ), self.get_iter((0, )), None)
 
+        count = self._source.get_count()
         if self._frame[0] >= count:
             self._frame = (0, -1)
         elif self._frame[1] >= count:
-            for i in range(count, self._frame[1]):
-                if i in self._cache:
-                    del self._cache[i]
             self._frame = (self._frame[0], count-1)
 
         self._cache = {}
diff --git a/src/jarabe/journal/tableview.py b/src/jarabe/journal/tableview.py
index 57273cd..7e69928 100644
--- a/src/jarabe/journal/tableview.py
+++ b/src/jarabe/journal/tableview.py
@@ -46,6 +46,7 @@ class TableView(SmoothTable):
         self._model = None
         self._hover_selection = False
         self._selected_cell = None
+        self._row_changed_id = None
 
     def get_cursor(self):
         return (self.frame[0], )
@@ -60,15 +61,14 @@ class TableView(SmoothTable):
         if self._model == model:
             return
 
-        if self._model is not None:
-            self._model.disconnect_by_func(self.__row_changed_cb)
-            self._model.disconnect_by_func(self.__table_resized_cb)
+        if self._row_changed_id is not None:
+            self._model.disconnect(self._row_changed_id)
 
         self._model = model
 
         if model is not None:
-            self._model.connect('row-changed', self.__row_changed_cb)
-            self._model.connect('rows-reordered', self.__table_resized_cb)
+            self._row_changed_id = \
+                    self._model.connect('row-changed', self.__row_changed_cb)
 
         self._resize()
 
@@ -170,6 +170,3 @@ class TableView(SmoothTable):
 
         row = self._model.get_row(path)
         self._do_fill_in(canvas, y, x, row)
-
-    def __table_resized_cb(self, model=None, path=None, iterator=None, a=None):
-        self._resize()
--
cgit v0.9.1