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

[Edward Ari Bichetero]

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.

[Jelmer Vernooij (jelmer)]

review: Approve (code)

=== modified file 'dialog.py'
--- dialog.py	2008-07-27 07:59:23 +0000
+++ dialog.py	2011-02-24 10:13:57 +0000
@@ -33,7 +33,7 @@
     dialog = gtk.MessageDialog(flags=gtk.DIALOG_MODAL, type=type, parent=parent,
                                buttons=buttons)
     dialog.set_markup('<big><b>' + primary + '</b></big>')
-    dialog.format_secondary_markup(secondary)
+    dialog.format_secondary_text(secondary)
     response = dialog.run()
     dialog.destroy()
     return response