Bazaar GTK+ Frontends

Merge lp:~ebichete/bzr-gtk/bugfix_lp656641 into lp:bzr-gtk/gtk2

  1. bugfix_lp656641
  2. Merge into gtk2
Proposed by Edward Ari Bichetero
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: 715
Merged at revision: 715
Proposed branch: lp:~ebichete/bzr-gtk/bugfix_lp656641
Merge into: lp:bzr-gtk/gtk2
Diff against target: 12 lines (+1/-1)
1 file modified
dialog.py (+1/-1)
To merge this branch: bzr merge lp:~ebichete/bzr-gtk/bugfix_lp656641
Reviewer Review Type Date Requested Status
Jelmer Vernooij (community) code Approve
Review via email: mp+51097@code.launchpad.net

Description of the change

The message dialog code would crash if our secondary text (normally bzr messages/errors) included markup-like sequences that were not actually valid Pango markup (like "<email address hidden>"). This would cause the bzr-gtk commands to report "Unknown Error" instead of displaying the proper bzr message/error to the user.

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'dialog.py'
2--- dialog.py 2008-07-27 07:59:23 +0000
3+++ dialog.py 2011-02-24 10:13:57 +0000
4@@ -33,7 +33,7 @@
5 dialog = gtk.MessageDialog(flags=gtk.DIALOG_MODAL, type=type, parent=parent,
6 buttons=buttons)
7 dialog.set_markup('<big><b>' + primary + '</b></big>')
8- dialog.format_secondary_markup(secondary)
9+ dialog.format_secondary_text(secondary)
10 response = dialog.run()
11 dialog.destroy()
12 return response

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: