[Reportbug-commits] [SCM] Reportbug - reports bugs in the Debian distribution branch, master, updated. 4.6-17-gcdad7ce

[Luca Bruno]

The following commit has been merged in the master branch:
commit 8001400f9c2f8d24ba54f7f0ae4b5fc9137a166f
Author: Luca Bruno <lethalman88 at gmail.com>
Date:   Tue Sep 1 08:40:39 2009 +0200

    fix to menu to always display all menu options

diff --git a/bin/reportbug b/bin/reportbug
index 4e73cc8..79d614f 100755
--- a/bin/reportbug
+++ b/bin/reportbug
@@ -486,7 +486,7 @@ def offer_configuration(options):
     if options.configure or not options.interface:
         interface = ui.menu(
             'Please choose the default interface for reportbug.', AVAILABLE_UIS,
-            'Select interface: ', options.interface, order=['text', 'urwid', 'gtk2'])
+            'Select interface: ', options.interface, order=['text'])
     else:
         interface = options.interface
 
diff --git a/debian/changelog b/debian/changelog
index 09ef5ab..67f17f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,11 +22,11 @@ reportbug (4.7) UNRELEASED; urgency=low
   * reportbug/ui/gtk_ui.py
     - wrap words when editing bug reports
     - workaround possible GTK+ regression to show the intro page
+    - fix to menu to always display all menu options
   * bin/reportbug
     - fallback to text interface if UI can't be initialized; Closes: #534876
-    - set UI order to text, urwid, gtk2
 
- -- Luca Bruno <lethalman88 at gmail.com>  Mon, 31 Aug 2009 12:11:33 +0200
+ -- Luca Bruno <lethalman88 at gmail.com>  Tue, 01 Sep 2009 08:39:20 +0200
 
 reportbug (4.6) unstable; urgency=low
 
diff --git a/reportbug/ui/gtk2_ui.py b/reportbug/ui/gtk2_ui.py
index 894006a..73d5280 100644
--- a/reportbug/ui/gtk2_ui.py
+++ b/reportbug/ui/gtk2_ui.py
@@ -810,8 +810,8 @@ class MenuPage (TreePage):
                         iter = self.model.append ((highlight (option), options[option]))
                         if option == default:
                             default_iter = iter
-            else:
-                for option, desc in options.iteritems ():
+            for option, desc in options.iteritems ():
+                if not order or option not in order:
                     iter = self.model.append ((highlight (option), desc))
                     if option == default:
                         default_iter = iter

-- 
Reportbug - reports bugs in the Debian distribution