[Reportbug-commits] [SCM] Reportbug - reports bugs in the Debian distribution branch, master, updated. 4.9-53-g9b7f94a

[Luca Bruno]

The following commit has been merged in the master branch:
commit d4924fb7437e1b5d39451ec1cdc2392f3c344634
Author: Luca Bruno <lethalman88 at gmail.com>
Date:   Sat Jan 30 22:20:44 2010 +0100

    fix focus stealing issues; thanks to Eduard Bloch for the report;
    Closes: #564418

diff --git a/debian/changelog b/debian/changelog
index 04d067c..bb15180 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,10 @@ reportbug (4.10.3) UNRELEASED; urgency=low
       thanks to Éric Araujo for the report; Closes: #564447
     - wrap text to be 79 chars width in the editor; thanks to Mark Brown for
       the report; Closes: #562878
+    - fix focus stealing issues; thanks to Eduard Bloch for the report;
+      Closes: #564418
 
- -- Luca Bruno <lethalman88 at gmail.com>  Sat, 30 Jan 2010 22:15:13 +0100
+ -- Luca Bruno <lethalman88 at gmail.com>  Sat, 30 Jan 2010 22:19:36 +0100
 
 reportbug (4.10.2) unstable; urgency=low
 
diff --git a/reportbug/ui/gtk2_ui.py b/reportbug/ui/gtk2_ui.py
index 7676fd2..b44bdeb 100644
--- a/reportbug/ui/gtk2_ui.py
+++ b/reportbug/ui/gtk2_ui.py
@@ -123,6 +123,7 @@ class CustomDialog (gtk.Dialog):
         label.set_line_wrap (True)
         label.set_justify (gtk.JUSTIFY_FILL)
         label.set_selectable (True)
+        label.set_property ("can-focus", False)
         hbox.pack_start (label, expand=False)
 
         self.setup_dialog (vbox, *args, **kwargs)
@@ -598,6 +599,7 @@ class GetStringPage (Page):
         self.label.set_line_wrap (True)
         self.label.set_justify (gtk.JUSTIFY_FILL)
         self.label.set_selectable (True)
+        self.label.set_property ("can-focus", False)
         self.entry = gtk.Entry ()
         vbox.pack_start (self.label, expand=False)
         vbox.pack_start (self.entry, expand=False)
@@ -645,6 +647,7 @@ class GetMultilinePage (Page):
         self.label.set_line_wrap (True)
         self.label.set_justify (gtk.JUSTIFY_FILL)
         self.label.set_selectable (True)
+        self.label.set_property ("can-focus", False)
         vbox.pack_start (self.label, expand=False)
 
         self.view = gtk.TextView ()
@@ -1060,6 +1063,7 @@ class LongMessagePage (Page):
         self.label.set_line_wrap (True)
         self.label.set_justify (gtk.JUSTIFY_FILL)
         self.label.set_selectable (True)
+        self.label.set_property ("can-focus", False)
         eb = gtk.EventBox ()
         eb.add (self.label)
         return eb
@@ -1111,6 +1115,7 @@ class EditorPage (Page):
             label.set_use_markup (True)
             label.set_line_wrap (True)
             label.set_selectable (True)
+            label.set_property ("can-focus", False)
             box.add (label)
             box.modify_bg (gtk.STATE_NORMAL, self.WARNING_COLOR)
             box.connect ('button-press-event', lambda *args: box.destroy ())
@@ -1333,7 +1338,7 @@ class ReportbugAssistant (gtk.Assistant):
         if self.showing_page == self.progress_page:
             self.progress_page.reset_label ()
 
-        self.showing_page.setup_focus ()
+        gobject.idle_add (self.showing_page.setup_focus)
 
     def close (self, *args):
         sys.exit (0)

-- 
Reportbug - reports bugs in the Debian distribution