[Pkg-bazaar-commits] ./bzr-gtk/unstable r314: Moved branch locking into treeview.

[Daniel Schierbeck]

------------------------------------------------------------
revno: 314
committer: Daniel Schierbeck <daniel.schierbeck at gmail.com>
branch nick: revhistoryview
timestamp: Sun 2007-10-21 18:09:12 +0200
message:
  Moved branch locking into treeview.
modified:
  viz/branchwin.py
  viz/treeview.py
-------------- next part --------------
=== modified file 'viz/branchwin.py'
--- a/viz/branchwin.py	2007-10-21 12:08:32 +0000
+++ b/viz/branchwin.py	2007-10-21 16:09:12 +0000
@@ -36,7 +36,6 @@
         self._parent = parent
 
         self.connect('key-press-event', self._on_key_pressed)
-        self.connect("destroy", lambda w: self.branch.unlock())
 
         # Use three-quarters of the screen by default
         screen = self.get_screen()
@@ -150,7 +149,6 @@
         treeview itself.
         """
         self.branch = branch
-        self.branch.lock_read()
         self.set_title(branch.nick + " - revision history")
         self.treeview.set_branch(branch, start, maxnum)
     

=== modified file 'viz/treeview.py'
--- a/viz/treeview.py	2007-10-21 12:11:30 +0000
+++ b/viz/treeview.py	2007-10-21 16:09:12 +0000
@@ -6,6 +6,8 @@
 __copyright__ = "Copyright ? 2005 Canonical Ltd."
 __author__    = "Daniel Schierbeck <daniel.schierbeck at gmail.com>"
 
+import sys
+import string
 import gtk
 import gobject
 import pango
@@ -39,6 +41,8 @@
         self.children = None
         self.parents  = None
 
+        self.connect('destroy', lambda w: self.branch.unlock())
+
     def get_revision(self):
         return self.revision
 
@@ -54,6 +58,7 @@
 
     def set_branch(self, branch, start, maxnum):
         self.branch = branch
+        self.branch.lock_read()
 
         gobject.idle_add(self.populate, start, maxnum)