[Reportbug-commits] [SCM] Reportbug - reports bugs in the Debian distribution branch, master, updated. 6.0-74-g9f50e5e

[Sandro Tosi]

The following commit has been merged in the master branch:
commit 9f50e5e5357f53ceab425574616f79f303934118
Author: Sandro Tosi <morph at debian.org>
Date:   Sat Nov 5 16:42:09 2011 +0100

    rename the 'Cancel' button to 'Quit', so that it's clear it will close reportbug, also Alt+<code> will select the right button; thanks to Nathan A. Stine and Éric Araujo for the reports; Closes: #586475, #614160

diff --git a/debian/changelog b/debian/changelog
index bc644ad..a434404 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,8 +27,12 @@ reportbug (6.3) UNRELEASED; urgency=low
     - show if the bug is already closed (it usually happens when the bug was
       closed recently and it's not archived yet); thanks to Elora HRanma for the
       report; Closes: #586155
+  * reportbug/ui/gtk2_ui.py
+    - rename the 'Cancel' button to 'Quit', so that it's clear it will close
+      reportbug, also Alt+<code> will select the right button; thanks to Nathan
+      A. Stine and Éric Araujo for the reports; Closes: #586475, #614160
 
- -- Sandro Tosi <morph at debian.org>  Sat, 05 Nov 2011 13:17:21 +0100
+ -- Sandro Tosi <morph at debian.org>  Sat, 05 Nov 2011 16:41:25 +0100
 
 reportbug (6.2.2) unstable; urgency=low
 
diff --git a/reportbug/ui/gtk2_ui.py b/reportbug/ui/gtk2_ui.py
index 856b948..66f0c8c 100644
--- a/reportbug/ui/gtk2_ui.py
+++ b/reportbug/ui/gtk2_ui.py
@@ -1321,6 +1321,12 @@ class ReportbugAssistant (gtk.Assistant):
             if widget.get_label() == 'gtk-go-back':
                 widget.connect ('show', self.on_back_show)
                 return
+            if widget.get_label() == 'gtk-cancel':
+                image = gtk.image_new_from_stock(gtk.STOCK_QUIT,
+                                                 gtk.ICON_SIZE_BUTTON)
+                widget.set_label("_Quit")
+                widget.set_image(image)
+                return
             if widget.get_label() == 'gtk-go-forward':
                 image = gtk.image_new_from_stock (gtk.STOCK_GO_FORWARD, gtk.ICON_SIZE_BUTTON)
                 widget.set_label ("_Continue")

-- 
Reportbug - reports bugs in the Debian distribution