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

[Sandro Tosi]

The following commit has been merged in the master branch:
commit b4905ece665c131aef3e0861917fea29458db54c
Author: Sandro Tosi <morph at debian.org>
Date:   Sun Nov 6 15:04:02 2011 +0100

    remove reference to Ctrl+c when asking for subject: it won't work in GTK+ UI; thanks to Mark Brown for the report; Closes: #562876

diff --git a/debian/changelog b/debian/changelog
index aa18605..c8cd621 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,8 @@ reportbug (6.3) UNRELEASED; urgency=low
     - 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
+    - remove reference to Ctrl+c when asking for subject: it won't work in GTK+
+      UI; thanks to Mark Brown for the report; Closes: #562876
   * debian/control
     - set 2.6 as minimum python version
   * reportbug/debbugs.py, bin/reportbug
@@ -44,7 +46,7 @@ reportbug (6.3) UNRELEASED; urgency=low
     the bug report, refer to README.developers for additional details; thanks to
     Niels Thykier for the report; Closes: #611341
 
- -- Sandro Tosi <morph at debian.org>  Sun, 06 Nov 2011 11:22:29 +0100
+ -- Sandro Tosi <morph at debian.org>  Sun, 06 Nov 2011 15:02:09 +0100
 
 reportbug (6.2.2) unstable; urgency=low
 
diff --git a/reportbug/ui/gtk2_ui.py b/reportbug/ui/gtk2_ui.py
index 70f8b92..2a39b66 100644
--- a/reportbug/ui/gtk2_ui.py
+++ b/reportbug/ui/gtk2_ui.py
@@ -615,7 +615,8 @@ class GetStringPage (Page):
         return self.entry.get_text ()
 
     def execute (self, prompt, options=None, force_prompt=False, default=''):
-        self.label.set_text (prompt)
+        # Hackish: remove the text needed for textual UIs...
+        self.label.set_text (prompt.replace(' (enter Ctrl+c to exit reportbug without reporting a bug)', ''))
         self.entry.set_text (default)
 
         if options:

-- 
Reportbug - reports bugs in the Debian distribution