/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to merge.py

  • Committer: Gary van der Merwe
  • Date: 2007-08-12 16:12:33 UTC
  • mto: (256.2.37 gtk)
  • mto: This revision was merged to the branch mainline in revision 262.
  • Revision ID: garyvdm@gmail.com-20070812161233-yhv1vafcxtsvpugj
Fix for bug Bug #132017 : olive no longer able to find bzrlib location.

Show diffs side-by-side

added added

removed removed

Lines of Context:
merge.py
35
35
 
36
36
class MergeDialog:
37
37
    """ Display the Merge dialog and perform the needed actions. """
38
 
    def __init__(self, wt, wtpath,default_branch_path=None):
 
38
    def __init__(self, wt, wtpath):
39
39
        """ Initialize the Merge dialog. """
40
40
        self.glade = gtk.glade.XML(GLADEFILENAME, 'window_merge', 'olive-gtk')
41
41
        
54
54
        
55
55
        # Get some widgets
56
56
        self.entry = self.glade.get_widget('entry_merge')
57
 
        if default_branch_path:
58
 
            self.entry.set_text(default_branch_path)
59
57
 
60
58
    def display(self):
61
59
        """ Display the Add file(s) dialog. """