Merge lp:~dobey/rhythmbox-ubuntuone/dbus-mainloop into lp:rhythmbox-ubuntuone

Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 126
Merged at revision: 126
Proposed branch: lp:~dobey/rhythmbox-ubuntuone/dbus-mainloop
Merge into: lp:rhythmbox-ubuntuone
Diff against target: 15 lines (+3/-0)
1 file modified
ubuntuone/ubuntuone.py (+3/-0)
To merge this branch: bzr merge lp:~dobey/rhythmbox-ubuntuone/dbus-mainloop
Reviewer Review Type Date Requested Status
Mike McCracken (community) Approve
Review via email: mp+143340@code.launchpad.net

Commit message

Tell dbus to use the glib main loop for async support and signal handling.

Description of the change

Adds the necessary call to use the glib main loop for dbus async. Unfortunately, there isn't an easy/good way to test this with current test infrastructure.

To post a comment you must log in.
Revision history for this message
Mike McCracken (mikemc) wrote :

Works for me on Q, quiets the warning when running rbox from a shell.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntuone/ubuntuone.py'
2--- ubuntuone/ubuntuone.py 2013-01-14 20:38:35 +0000
3+++ ubuntuone/ubuntuone.py 2013-01-15 16:14:26 +0000
4@@ -19,9 +19,12 @@
5 import os
6
7 from dbus import SessionBus, DBusException
8+from dbus.mainloop.glib import DBusGMainLoop
9 from dirspec.utils import user_home
10 from gi.repository import Gio, GObject, Peas
11
12+DBusGMainLoop(set_as_default=True)
13+
14 U1LIBRARYPATH = os.path.join(user_home, '.ubuntuone',
15 'Purchased from Ubuntu One')
16

Subscribers

People subscribed via source and target branches