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

[dobey]

Must cast gsignals/properties to str with unicode_literals.

[Eric Casteleijn (thisfred)]

review: Approve

[Mike McCracken (mikemc)]

review: Approve

=== 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 @@
     """A Rhythmbox source widget for the U1 Music Store."""
     # gproperties required so that rb.Source is instantiable
     __gproperties__ = {
-      'plugin': (GObject.GObject, 'plugin', 'plugin',
-                 GObject.PARAM_WRITABLE | GObject.PARAM_CONSTRUCT_ONLY),
+      str('plugin'): (GObject.GObject, str('plugin'), str('plugin'),
+                      GObject.PARAM_WRITABLE | GObject.PARAM_CONSTRUCT_ONLY),
       }
     # we have the preview-mp3 signal; we receive it from the widget, and
     # re-emit it so that the plugin gets it, because the plugin actually
     # plays the mp3
     __gsignals__ = {
-      "preview-mp3": (GObject.SIGNAL_RUN_FIRST,
-                      GObject.TYPE_NONE, (str, str)),
-      "play-library": (GObject.SIGNAL_RUN_FIRST,
-                       GObject.TYPE_NONE, (str,)),
-      "download-finished": (GObject.SIGNAL_RUN_FIRST,
+      str("preview-mp3"): (GObject.SIGNAL_RUN_FIRST,
+                           GObject.TYPE_NONE, (str, str)),
+      str("play-library"): (GObject.SIGNAL_RUN_FIRST,
                             GObject.TYPE_NONE, (str,)),
-      "url-loaded": (GObject.SIGNAL_RUN_FIRST,
-                     GObject.TYPE_NONE, (str,)),
+      str("download-finished"): (GObject.SIGNAL_RUN_FIRST,
+                                 GObject.TYPE_NONE, (str,)),
+      str("url-loaded"): (GObject.SIGNAL_RUN_FIRST,
+                          GObject.TYPE_NONE, (str,)),
     }
 
     def __init__(self):