Merge lp:~roadmr/checkbox/apport-integration into lp:checkbox

[Daniel Manrique]

This code fixes apport integration, broken due to gi introspection and Apport related API changes.

A small issue remains where checkbox "freezes" for about 30 seconds after closing the browser used for bug reporting. I'll be tackling this next week, but I wanted to get this code out there for review and inclusion into trunk. The freezing problem appears to be orthogonal and can be fixed separately.

[Brendan Donegan (brendan-donegan)]

Is the freezing problem potentially a seperate bug then? As in, if this code does what it say, should it be merged and the bugs linked above set to Fix Commited, or should it wait for a fix for that?

[Daniel Manrique (roadmr)]

The freezing problem gives a totally different trace, I guess we could file a separate bug about that and merge this code (which makes apport integration work but checkbox freeze for a bit afterwards), as opposed to not merging and waiting (which means apport integration doesn't really work at all) :)

[Brendan Donegan (brendan-donegan)]

I think that makes sense, I'll give this a once over and merge it if it's all okay

[Brendan Donegan (brendan-donegan)]

Looks good and does what it claims to, so I approve. Merging.

review: Approve

=== modified file 'checkbox_gtk/gtk_interface.py'
--- checkbox_gtk/gtk_interface.py	2011-09-06 20:37:13 +0000
+++ checkbox_gtk/gtk_interface.py	2011-09-23 21:43:43 +0000
@@ -302,7 +302,8 @@
         vbox = self._get_widget("vbox_options_list")
         for option in options:
             label = "_%s%s" % (option[0].upper(), option[1:])
-            check_button = Gtk.CheckButton(label)
+            check_button = Gtk.CheckButton(label = label,
+                                           use_underline = True)
             check_button.get_child().set_line_wrap(True)
             check_button.show()
             option_table[option] = check_button
@@ -348,7 +349,9 @@
         vbox = self._get_widget("vbox_options_list")
         for option in options:
             label = "_%s%s" % (option[0].upper(), option[1:])
-            radio_button = Gtk.RadioButton(option_group, label)
+            radio_button = Gtk.RadioButton(group = option_group,
+                                           label = label,
+                                           use_underline = True)
             radio_button.get_child().set_line_wrap(True)
             radio_button.show()
             option_table[option] = radio_button

=== modified file 'debian/changelog'
--- debian/changelog	2011-09-23 16:29:43 +0000
+++ debian/changelog	2011-09-23 21:43:43 +0000
@@ -16,6 +16,10 @@
     screens (LP: #852204)
   * Remove memory/test from the Ubuntu Friendly whitelist (LP: #853799)
   * Use diff instead of grep, better comparing of empty files (LP: #852014)
+  * Apport integration: new mandatory "tag" value in ApportOptions 
+    (LP: #852201)
+  * Apport integration: Fix instantiation of Gtk.RadioButton, needed due 
+    to PyGI related API changes (LP: #805679)
 
   [ Evan Broder ]
   * Replace resolution_test with an implementation which uses GdkScreen to

=== modified file 'plugins/apport_prompt.py'
--- plugins/apport_prompt.py	2011-07-01 11:49:38 +0000
+++ plugins/apport_prompt.py	2011-09-23 21:43:43 +0000
@@ -55,6 +55,8 @@
         self.symptom = symptom
         self.pid = None
         self.save = False
+        self.tag = '' #Additional tags to add to reports filed
+                      #through this tool 
 
 
 class ApportUserInterface(UserInterface):