/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: Curtis Hovey
  • Date: 2011-09-03 13:46:52 UTC
  • mto: This revision was merged to the branch mainline in revision 741.
  • Revision ID: sinzui.is@verizon.net-20110903134652-foz5thvhwg0kcolr
Removed unused code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
merge.py
37
37
    
38
38
    def __init__(self, wt, wtpath, default_branch_path=None, parent=None):
39
39
        """ Initialize the Merge dialog. """
40
 
        super(MergeDialog, self).__init__(
41
 
            title="Merge changes", parent=parent, flags=0,
42
 
            buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL))
 
40
        Gtk.Dialog.__init__(self, title="Merge changes",
 
41
                                  parent=parent,
 
42
                                  flags=0,
 
43
                                  buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL))
43
44
        self.set_icon_from_file(icon_path("bzr-icon-64.png"))
44
45
        # Get arguments
45
46
        self.wt = wt