[Reportbug-commits] [SCM] Reportbug - reports bugs in the Debian distribution branch, master, updated. 4.2-4-g6fc8e5c

[Luca Bruno]

The following commit has been merged in the master branch:
commit a20959e902c9ba224e4c52c036232d5ecbba5c2f
Author: Luca Bruno <lethalman88 at gmail.com>
Date:   Sun Apr 26 18:48:41 2009 +0200

    Order of menu items can contain non-existing options (e.g. for severities). Fix that.

diff --git a/debian/changelog b/debian/changelog
index 51552f2..f61486f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+reportbug (4.3) UNRELEASED; urgency=low
+
+  * reportbug/ui/gtk2_ui.py:
+    - fix crash when showing menu options
+
+ -- Luca Bruno <lethalman88 at gmail.com>  Thu, 07 May 2009 21:38:45 +0200
+
 reportbug (4.2) unstable; urgency=low
 
   [ Sandro Tosi ]
diff --git a/reportbug/ui/gtk2_ui.py b/reportbug/ui/gtk2_ui.py
index 4a4c9ca..754cac2 100644
--- a/reportbug/ui/gtk2_ui.py
+++ b/reportbug/ui/gtk2_ui.py
@@ -798,9 +798,10 @@ class MenuPage (TreePage):
         if isinstance (options, dict):
             if order:
                 for option in order:
-                    iter = self.model.append ((highlight (option), options[option]))
-                    if option == default:
-                        default_iter = iter
+                    if option in options:
+                        iter = self.model.append ((highlight (option), options[option]))
+                        if option == default:
+                            default_iter = iter
             else:
                 for option, desc in options.iteritems ():
                     iter = self.model.append ((highlight (option), desc))

-- 
Reportbug - reports bugs in the Debian distribution