Ubuntu Software Center

Merge lp:~mvo/software-center/5.4-fix-threading into lp:software-center/5.4

  1. 5.4-fix-threading
  2. Merge into 5.4
Proposed by Michael Vogt on 2012-11-27
Status: Merged
Merged at revision: 3239
Proposed branch: lp:~mvo/software-center/5.4-fix-threading
Merge into: lp:software-center/5.4
Diff against target: 26 lines (+3/-2)
2 files modified
debian/control (+1/-1)
utils/submit_review_gtk3.py (+2/-1)
To merge this branch: bzr merge lp:~mvo/software-center/5.4-fix-threading
Reviewer Review Type Date Requested Status
software-store-developers 2012-11-27 Pending
Review via email: mp+136475@code.launchpad.net

Description of the Change

This branch fixes a hang when trying to submit a review or a usefulness report. It needs a fixed python-gi that is also in the quantal-proposed queue now.

To post a comment you must log in.
Martin Pitt (pitti) wrote :

Looks good to me.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2012-08-15 12:00:33 +0000
3+++ debian/control 2012-11-27 18:00:31 +0000
4@@ -31,7 +31,7 @@
5 gir1.2-gtk-3.0,
6 gir1.2-gmenu-3.0 (>= 3.1.5),
7 gir1.2-webkit-3.0,
8- python-gi,
9+ python-gi (>= 3.4.0-1ubuntu0.1),
10 python-gi-cairo,
11 python-xapian,
12 python-apt (>= 0.8.3ubuntu4),
13
14=== modified file 'utils/submit_review_gtk3.py'
15--- utils/submit_review_gtk3.py 2012-10-04 15:53:20 +0000
16+++ utils/submit_review_gtk3.py 2012-11-27 18:00:31 +0000
17@@ -19,7 +19,8 @@
18 # this program; if not, write to the Free Software Foundation, Inc.,
19 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20
21-from gi.repository import Gtk
22+from gi.repository import Gtk, GObject
23+GObject.threads_init()
24
25 import gettext
26 import locale

Subscribers

People subscribed via source and target branches