Ubuntu One for Rhythmbox

Merge lp:~dobey/rhythmbox-ubuntuone/update-4-0 into lp:rhythmbox-ubuntuone/stable-4-0

  1. update-4-0
  2. Merge into stable-4-0
Proposed by dobey on 2012-09-10
Status: Merged
Approved by: dobey on 2012-09-10
Approved revision: 124
Merged at revision: 124
Proposed branch: lp:~dobey/rhythmbox-ubuntuone/update-4-0
Merge into: lp:rhythmbox-ubuntuone/stable-4-0
Diff against target: 34 lines (+9/-9)
1 file modified
ubuntuone/MusicStoreWidget.py (+9/-9)
To merge this branch: bzr merge lp:~dobey/rhythmbox-ubuntuone/update-4-0
Reviewer Review Type Date Requested Status
Roberto Alsina (community) 2012-09-10 Approve on 2012-09-10
Review via email: mp+123636@code.launchpad.net

Commit Message

[Rodney Dawes]

    Must cast gsignals/properties to str with unicode_literals.

To post a comment you must log in.
Roberto Alsina (ralsina) :
review: Approve
Roberto Alsina (ralsina) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntuone/MusicStoreWidget.py'
2--- ubuntuone/MusicStoreWidget.py 2012-08-24 19:36:25 +0000
3+++ ubuntuone/MusicStoreWidget.py 2012-09-10 20:24:37 +0000
4@@ -161,21 +161,21 @@
5 """A Rhythmbox source widget for the U1 Music Store."""
6 # gproperties required so that rb.Source is instantiable
7 __gproperties__ = {
8- 'plugin': (GObject.GObject, 'plugin', 'plugin',
9- GObject.PARAM_WRITABLE | GObject.PARAM_CONSTRUCT_ONLY),
10+ str('plugin'): (GObject.GObject, str('plugin'), str('plugin'),
11+ GObject.PARAM_WRITABLE | GObject.PARAM_CONSTRUCT_ONLY),
12 }
13 # we have the preview-mp3 signal; we receive it from the widget, and
14 # re-emit it so that the plugin gets it, because the plugin actually
15 # plays the mp3
16 __gsignals__ = {
17- "preview-mp3": (GObject.SIGNAL_RUN_FIRST,
18- GObject.TYPE_NONE, (str, str)),
19- "play-library": (GObject.SIGNAL_RUN_FIRST,
20- GObject.TYPE_NONE, (str,)),
21- "download-finished": (GObject.SIGNAL_RUN_FIRST,
22+ str("preview-mp3"): (GObject.SIGNAL_RUN_FIRST,
23+ GObject.TYPE_NONE, (str, str)),
24+ str("play-library"): (GObject.SIGNAL_RUN_FIRST,
25 GObject.TYPE_NONE, (str,)),
26- "url-loaded": (GObject.SIGNAL_RUN_FIRST,
27- GObject.TYPE_NONE, (str,)),
28+ str("download-finished"): (GObject.SIGNAL_RUN_FIRST,
29+ GObject.TYPE_NONE, (str,)),
30+ str("url-loaded"): (GObject.SIGNAL_RUN_FIRST,
31+ GObject.TYPE_NONE, (str,)),
32 }
33
34 def __init__(self):

Subscribers

People subscribed via source and target branches

to all changes: