/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 bzr-handle-patch

  • Committer: Curtis Hovey
  • Date: 2011-07-31 16:50:29 UTC
  • mto: This revision was merged to the branch mainline in revision 741.
  • Revision ID: sinzui.is@verizon.net-20110731165029-9gixuqypi3lwapzm
Removed import_pygtk because gi does not impicitly call Main(). Inlined checks for gtk availablility.

Show diffs side-by-side

added added

removed removed

Lines of Context:
31
31
                controller = MergeDirectiveController(path, directive)
32
32
        window = controller.window
33
33
        window.show()
34
 
        gtk = open_display()
 
34
        Gtk = open_display()
35
35
        window.connect("destroy", gtk.main_quit)
36
36
except Exception, e:
37
37
        from bzrlib.plugins.gtk.dialog import error_dialog