Friends

Merge lp:~robru/friends/fix-threads-init into lp:friends

  1. fix-threads-init
  2. Merge into trunk
Proposed by Robert Bruce Park
Status: Merged
Approved by: Robert Bruce Park
Approved revision: 202
Merged at revision: 202
Proposed branch: lp:~robru/friends/fix-threads-init
Merge into: lp:friends
Diff against target: 25 lines (+2/-2)
2 files modified
friends/main.py (+1/-1)
friends/utils/authentication.py (+1/-1)
To merge this branch: bzr merge lp:~robru/friends/fix-threads-init
Reviewer Review Type Date Requested Status
Ken VanDine Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+162692@code.launchpad.net

Commit message

Fixes startup TypeError (LP: #1177047)

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:202
http://jenkins.qa.ubuntu.com/job/friends-ci/43/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/friends-raring-amd64-ci/43

Click here to trigger a rebuild:
http://s-jenkins:8080/job/friends-ci/43/rebuild

review: Approve (continuous-integration)
Revision history for this message
Ken VanDine (ken-vandine) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'friends/main.py'
2--- friends/main.py 2013-03-29 22:59:53 +0000
3+++ friends/main.py 2013-05-07 00:43:27 +0000
4@@ -58,7 +58,7 @@
5 # Continue with normal loading...
6 from gi.repository import Gio, GObject
7
8-GObject.threads_init(None)
9+GObject.threads_init()
10
11 from friends.service.dispatcher import Dispatcher, DBUS_INTERFACE
12 from friends.utils.base import Base, initialize_caches, _publish_lock
13
14=== modified file 'friends/utils/authentication.py'
15--- friends/utils/authentication.py 2013-04-17 23:11:06 +0000
16+++ friends/utils/authentication.py 2013-05-07 00:43:27 +0000
17@@ -28,7 +28,7 @@
18 from friends.errors import AuthorizationError
19
20
21-GObject.threads_init(None)
22+GObject.threads_init()
23
24
25 log = logging.getLogger(__name__)

Subscribers

People subscribed via source and target branches