Merge lp:~dobey/rhythmbox-ubuntuone/fix-1042769 into lp:rhythmbox-ubuntuone

Proposed by dobey on 2012-08-28
Status: Merged
Approved by: dobey on 2012-08-28
Approved revision: 119
Merged at revision: 119
Proposed branch: lp:~dobey/rhythmbox-ubuntuone/fix-1042769
Merge into: lp:rhythmbox-ubuntuone
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/fix-1042769
Reviewer Review Type Date Requested Status
Mike McCracken (community) Approve on 2012-08-28
Eric Casteleijn (community) 2012-08-28 Approve on 2012-08-28
Review via email: mp+121627@code.launchpad.net

Commit message

Must cast gsignals/properties to str with unicode_literals.

To post a comment you must log in.
Eric Casteleijn (thisfred) :
review: Approve
Mike McCracken (mikemc) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'ubuntuone/MusicStoreWidget.py'
--- ubuntuone/MusicStoreWidget.py 2012-08-24 19:36:25 +0000
+++ ubuntuone/MusicStoreWidget.py 2012-08-28 14:32:20 +0000
@@ -161,21 +161,21 @@
161 """A Rhythmbox source widget for the U1 Music Store."""161 """A Rhythmbox source widget for the U1 Music Store."""
162 # gproperties required so that rb.Source is instantiable162 # gproperties required so that rb.Source is instantiable
163 __gproperties__ = {163 __gproperties__ = {
164 'plugin': (GObject.GObject, 'plugin', 'plugin',164 str('plugin'): (GObject.GObject, str('plugin'), str('plugin'),
165 GObject.PARAM_WRITABLE | GObject.PARAM_CONSTRUCT_ONLY),165 GObject.PARAM_WRITABLE | GObject.PARAM_CONSTRUCT_ONLY),
166 }166 }
167 # we have the preview-mp3 signal; we receive it from the widget, and167 # we have the preview-mp3 signal; we receive it from the widget, and
168 # re-emit it so that the plugin gets it, because the plugin actually168 # re-emit it so that the plugin gets it, because the plugin actually
169 # plays the mp3169 # plays the mp3
170 __gsignals__ = {170 __gsignals__ = {
171 "preview-mp3": (GObject.SIGNAL_RUN_FIRST,171 str("preview-mp3"): (GObject.SIGNAL_RUN_FIRST,
172 GObject.TYPE_NONE, (str, str)),172 GObject.TYPE_NONE, (str, str)),
173 "play-library": (GObject.SIGNAL_RUN_FIRST,173 str("play-library"): (GObject.SIGNAL_RUN_FIRST,
174 GObject.TYPE_NONE, (str,)),
175 "download-finished": (GObject.SIGNAL_RUN_FIRST,
176 GObject.TYPE_NONE, (str,)),174 GObject.TYPE_NONE, (str,)),
177 "url-loaded": (GObject.SIGNAL_RUN_FIRST,175 str("download-finished"): (GObject.SIGNAL_RUN_FIRST,
178 GObject.TYPE_NONE, (str,)),176 GObject.TYPE_NONE, (str,)),
177 str("url-loaded"): (GObject.SIGNAL_RUN_FIRST,
178 GObject.TYPE_NONE, (str,)),
179 }179 }
180180
181 def __init__(self):181 def __init__(self):

Subscribers

People subscribed via source and target branches