Merge lp:~toshio/bzr-gtk/handle-patch-fix into lp:bzr-gtk/gtk2

Proposed by Toshio Kuratomi
Status: Merged
Merged at revision: not available
Proposed branch: lp:~toshio/bzr-gtk/handle-patch-fix
Merge into: lp:bzr-gtk/gtk2
Diff against target: 12 lines (+1/-1)
1 file modified
bzr-handle-patch (+1/-1)
To merge this branch: bzr merge lp:~toshio/bzr-gtk/handle-patch-fix
Reviewer Review Type Date Requested Status
Robert Collins (community) Approve
Jelmer Vernooij (community) Approve
Review via email: mp+14843@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Toshio Kuratomi (toshio) wrote :

Fixes a traceback when attempting to import the error_dialog

https://bugzilla.redhat.com/show_bug.cgi?id=532077

Revision history for this message
Jelmer Vernooij (jelmer) wrote :

  review approve

review: Approve
Revision history for this message
Robert Collins (lifeless) wrote :

Looks good - Jelmer, could you land it?

review: Approve

Updating diff...

An updated diff will be available in a few minutes. Reload to see the changes.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bzr-handle-patch'
2--- bzr-handle-patch 2008-06-27 16:53:56 +0000
3+++ bzr-handle-patch 2009-11-13 19:15:20 +0000
4@@ -33,7 +33,7 @@
5 gtk = open_display()
6 window.connect("destroy", gtk.main_quit)
7 except Exception, e:
8- from dialog import error_dialog
9+ from bzrlib.plugins.gtk.dialog import error_dialog
10 error_dialog('Error', str(e))
11 raise
12 gtk.main()

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: