Showing hidden/ignored files prefs were not properly saved since the
self.pref Preferences object gets overwritten every time
refresh/refresh_left() is performed.

Jasper

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: [EMAIL PROTECTED]
# target_branch: https://code.launchpad.net/~bzr-gtk/bzr-gtk/trunk
# testament_sha1: c28df0da6263a5d1a564d32fcb7a4a1580b4847e
# timestamp: 2008-08-17 16:06:30 +0200
# source_branch: https://code.launchpad.net/~bzr-gtk/bzr-gtk/trunk
# base_revision_id: [EMAIL PROTECTED]
# 
# Begin patch
=== modified file 'olive/__init__.py'
--- olive/__init__.py	2008-08-05 23:21:16 +0000
+++ olive/__init__.py	2008-08-17 14:06:12 +0000
@@ -660,7 +660,6 @@
             remove.hide()
         
             if response == gtk.RESPONSE_OK:
-                self.set_path(self.path)
                 self.refresh_right()
             
             remove.destroy()
@@ -703,12 +702,14 @@
     def on_menuitem_view_show_hidden_files_activate(self, widget):
         """ View/Show hidden files menu handler. """
         self.pref.set_preference('dotted_files', widget.get_active())
+        self.pref.write()
         if self.path is not None:
             self.refresh_right()
 
     def on_menuitem_view_show_ignored_files_activate(self, widget):
         """ Hide/Show ignored files menu handler. """
         self.pref.set_preference('ignored_files', widget.get_active())
+        self.pref.write()
         if self.path is not None:
             self.refresh_right()
             
@@ -949,20 +950,20 @@
         if not self.remote:
             # We're local
             from bzrlib.workingtree import WorkingTree
-    
+            
             path = self.get_path()
             
             # Get ListStore and clear it
             liststore = self.window.filelist
             liststore.clear()
-    
+            
             dirs = []
             files = []
-    
+            
             # Fill the appropriate lists
             dotted_files = self.pref.get_preference('dotted_files', 'bool')
             ignored_files = self.pref.get_preference('ignored_files', 'bool')
-
+            
             for item in os.listdir(path):
                 if not dotted_files and item[0] == '.':
                     continue
@@ -977,7 +978,7 @@
                     tree1 = WorkingTree.open_containing(os.path.realpath(path))[0]
                     branch = tree1.branch
                     tree2 = tree1.branch.repository.revision_tree(branch.last_revision())
-                
+                    
                     delta = tree1.changes_from(tree2, want_unchanged=True)
                     
                     # Show Status column

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWl7jGwAAdH/gERQQABRa///
cpBIAL////BQBD3N7KqXZz2Hred3glEQpm0p+iniank0NR6I9R6Rpo0aBoBpJkNMKaZNHqNNAAaA
AA0AkiEyJgiemhT1Gg8ppoeoH6o9QGQEiiZU09TeiRo0epp6gDIAAA0eoJJTTTSYNJhMkwmNU9T0
gNAyANNBMWTJfQeIK/XLqM+ulrJjVj251zqkVMFdB47o73DjOXGewSIpdcPnvOk2ZkEvog/cZ47N
ahrlgzs7EBlFsWg0WP1ppjezPp12f3X1l/JcXeqkC2L0jZ2yuYpqqd8RqxsQqiwYU/XhS1y5m3uW
zcIyvpaITXTFTMS1WaCw3w1mVCC4T7eHRXvugI7bg+6YtNnGNsniFrWxadbWBmE174chkL8kSZxN
y7iuSkLPvjEQyCBE4RMjMkd12CRXR5UqOFsKPrqFyxnZnWWr6nyL4loolWrAkl1CeX4lpr7bhQkg
TGQnRyqa2LjCR4wsB0JqQZRquVhebJg5UZE31SLV4isgivAz0uOkyyU8giityZ2QuS2ngIzIHGe6
kaI8ji+0ke0Gwy2l57Yi3Tu7LUxY4nIQYzckrFvVIBMVKrqUL6yeEqnMikvyXh3ClvhQRpSGZAzg
taq6TI4kgto6gpbbhJQVHcWAUMat9ZiFt61Ts4hmzEVLOYBKi95vYXRjdbIuL2zaL8mXHQ9dsJuV
M8KecRbFsbfs803bpVqqo8WNVSUQ4olVIkbHxm/ukjKM0Eo8Hnp3HA2CMyNg4P2ndNm3gIhgX6o0
i/P8Uiho8tNgpCZxocj19RHB/JIxNBjcMP7VCMupsHPP1uoW2FfOOM2DEV0mdNaMDqWdlw8ek5Cj
HomBNrNQ+zZVtH20aYr4RTbE61dJiFZhmkNxBQSOgB8ziUdhTKeUNpFD4AYrSBEhtac9t55hGIZi
ci1DGyaBpiCinXE3lioU5FqxbngZxUMygGMS4rNZLYePGsqGVdpAPU8l7xSzdiglX4uWkceeEg5g
9Jo1fHf/r8EEPQ4GJs+SOpMbh/t3olUS48wrtfSvLi+ecBiIEVGxcs4NzXuz2rkLcaw75ysQwihY
GgjmoMdA90a0L0x8eerIKq2Hh2+SRnqspkPKLu7sLgQIScIuJF5MvMRpB4Sshlzx+r7TTaI+bTgc
Xi0DfZUDUgkSTNxSQIkfDnOJt4QiIJSsg2hJIWsGOUY4AlTmPTPA5hFAfeoxs2WYW2MnsCordMpt
RnW6znUIhmwlREiTTT62TvIdIjwgVDdxhYsC+CmoFCJYA9F7I7ZqaOkOeO7n3qKazlMvXO0yOyKf
ExK6J7+p5uJtQUrk1TEGVQ7kKd54HTCh0BT12UqSX4DAcOYlE3icBkMpksO86Mc6XCGRIMtd6Nat
SLRSTib0y1f4u5IpwoSDS9xjYA==

Attachment: signature.asc
Description: OpenPGP digital signature

-- 
bzr-gtk mailing list
[email protected]
Modify settings or unsubscribe at: 
https://lists.canonical.com/mailman/listinfo/bzr-gtk

Reply via email to