/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: Mikkel Kamstrup Erlandsen
  • Date: 2011-09-28 07:45:39 UTC
  • mto: This revision was merged to the branch mainline in revision 740.
  • Revision ID: mikkel.kamstrup@gmail.com-20110928074539-qxl1yn1bkjel6ir0
https://launchpad.net/bugs/861201
Add X-GNOME-Autostart-Delay=30 to bzr-notify.desktop

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
from bzrlib.plugins.gtk.commands import open_display
 
6
 
5
7
load_plugins()
6
 
from bzrlib.plugins.gtk.commands import open_display
7
8
 
8
9
import sys
9
10
 
30
31
                controller = MergeDirectiveController(path, directive)
31
32
        window = controller.window
32
33
        window.show()
33
 
        Gtk = open_display()
34
 
        window.connect("destroy", Gtk.main_quit)
 
34
        gtk = open_display()
 
35
        window.connect("destroy", gtk.main_quit)
35
36
except Exception, e:
36
37
        from bzrlib.plugins.gtk.dialog import error_dialog
37
38
        error_dialog('Error', str(e))
38
39
        raise
39
 
 
40
 
if len(sys.argv) == 3 and sys.argv[2] == 'test':
41
 
    sys.exit(0)
42
 
 
43
 
Gtk.main()
 
40
gtk.main()