[Pkg-bazaar-commits] ./bzr-gtk/unstable r60: [merge] gannotate fix from Aaron

[Jelmer Vernooij]

------------------------------------------------------------
revno: 60
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: bzr-gtk
timestamp: Thu 2006-06-15 10:51:14 +0200
message:
  [merge] gannotate fix from Aaron
modified:
  annotate/config.py
    ------------------------------------------------------------
    revno: 59.1.1
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: gtk
    timestamp: Wed 2006-06-14 23:01:40 -0400
    message:
      Fix gannotate now that configobj.validator is deleted
    modified:
      annotate/config.py
-------------- next part --------------
=== modified file 'annotate/config.py'
--- a/annotate/config.py	2006-05-19 16:56:46 +0000
+++ b/annotate/config.py	2006-06-15 03:01:40 +0000
@@ -20,7 +20,6 @@
 
 from bzrlib.config import config_dir
 import bzrlib.util.configobj.configobj as configobj
-from bzrlib.util.configobj.validate import Validator
 
 
 gannotate_configspec = (
@@ -55,7 +54,14 @@
         self.span_selector = window.span_selector
         
         self.initial_comment = ["gannotate plugin configuration"]
-        self.validate(Validator())
+        self['window']['width'] = 750
+        self['window']['height'] = 550
+        self['window']['maximized'] = False
+        self['window']['x'] = 0
+        self['window']['y'] = 0
+        self['window']['pane_position'] = 325
+        self['spans']['max_custom_spans'] = 4
+        self['spans']['custom_spans'] = []
 
         self.apply()
         self._connect_signals()