/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: 2012-02-04 14:05:59 UTC
  • mfrom: (772.2.5 handle-patch)
  • Revision ID: sinzui.is@verizon.net-20120204140559-307aeiy47rieqxsf
Merged bzr-handle-patch gtk3 fix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzr-handle-patch
2
2
 
3
3
from bzrlib import errors, merge_directive
4
4
from bzrlib.plugin import load_plugins
 
5
load_plugins()
5
6
from bzrlib.plugins.gtk.commands import open_display
6
7
 
7
 
load_plugins()
8
 
 
9
8
import sys
10
9
 
11
10
if len(sys.argv) < 2:
32
31
        window = controller.window
33
32
        window.show()
34
33
        Gtk = open_display()
35
 
        window.connect("destroy", gtk.main_quit)
 
34
        window.connect("destroy", Gtk.main_quit)
36
35
except Exception, e:
37
36
        from bzrlib.plugins.gtk.dialog import error_dialog
38
37
        error_dialog('Error', str(e))
39
38
        raise
40
 
gtk.main()
 
39
 
 
40
if len(sys.argv) == 3 and sys.argv[2] == 'test':
 
41
    sys.exit(0)
 
42
 
 
43
Gtk.main()