Merge lp:~cr3/checkbox/959463 into lp:checkbox

[Marc Tardif]

[Daniel Manrique (roadmr)]

Looks good, merging. Thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-19 14:53:43 +0000
+++ debian/changelog	2012-03-19 16:34:05 +0000
@@ -31,6 +31,7 @@
 
   [Marc Tardif]
   * Linted qt_interface which had a few syntax errors (LP: #949957)
+  * Fixed apport integration was producing a trace (LP: #959463)
 
   [Daniel Manrique]
   * Bumpted revision number to 0.13.5 in trunk
 
=== modified file 'plugins/apport_prompt.py'
--- plugins/apport_prompt.py	2011-12-15 15:56:02 +0000
+++ plugins/apport_prompt.py	2012-03-19 16:34:05 +0000
@@ -125,7 +125,7 @@
         self.interface.show_progress_stop()
 
     def ui_present_report_details(self, *args):
-        return "full"
+        return dict(report=1)
 
     def ui_question_choice(self, text, options, multiple):
         self.interface.show_progress_stop()
@@ -224,9 +224,8 @@
             return
 
         if test.get("suite"):
-            failed_test_message = _("Test %(name)s from suite %(suite)s failed.") % {
-                                   'name' : test["name"], 
-                                   'suite:' : test["suite"]}
+            failed_test_message = _("Test %(name)s failed.") % {
+                                   'name' : test["name"]}
         else:
             failed_test_message = _("Test %s failed.") % test["name"]
         failed_test_message += "\n" + _("Do you want to report a bug?")