~ubuntu-branches/ubuntu/karmic/quodlibet/karmic

« back to all changes in this revision

Viewing changes to quodlibet/qltk/dbus_.py

  • Committer: Bazaar Package Importer
  • Author(s): Andres Rodriguez
  • Date: 2009-07-27 14:02:54 UTC
  • mfrom: (2.1.6 sid)
  • Revision ID: james.westby@ubuntu.com-20090727140254-zxutnf2kkhtpubnp
Tags: 2.1-2ubuntu1
* Resync from debian unstable (LP: #401965)
* debian/patches:
  - fix-context-crashes.patch: Dropped. Included Upstream.
  - 60-popen2-deprecated.patch: Dropped. Included Upstream.
* debian/quodlibet-ext.install: Changed 'site-packages' to '*-packages'.
* debian/rules: Changed 'site-packages' to '*-packages'.

Show diffs side-by-side

added added

removed removed

Lines of Context:
34
34
        dict = {}
35
35
        for key, value in (song or {}).items():
36
36
            if isinstance(value, unicode):
37
 
                dict[key] = value.encode('utf-8')
 
37
                if '\x00' not in value:
 
38
                    dict[key] = value.encode('utf-8')
38
39
            elif not isinstance(value, str):
39
40
                dict[key] = str(value)
40
41
        return dict