diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-05-24 16:39:13 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-05-24 16:39:16 +0100 |
| commit | d6962024d7686e40cc012905581cb31c6999b856 (patch) | |
| tree | f2e676574aa691b49c3c0886f7b59d156c453db5 /dbus | |
| parent | 4093246a1593ccc7bf02b5097254df163ab33b8b (diff) | |
| parent | cbc3f71cebc313b988f8ecc461031c828bfd2302 (diff) | |
Merge branch 'fd-passing'
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30812
Tested-by: Elvis Pfützenreuter <epx@signove.com>
Diffstat (limited to 'dbus')
| -rw-r--r-- | dbus/types.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/dbus/types.py b/dbus/types.py index cc4a678..d638a8e 100644 --- a/dbus/types.py +++ b/dbus/types.py @@ -1,9 +1,10 @@ __all__ = ('ObjectPath', 'ByteArray', 'Signature', 'Byte', 'Boolean', 'Int16', 'UInt16', 'Int32', 'UInt32', 'Int64', 'UInt64', 'Double', 'String', 'Array', 'Struct', 'Dictionary', - 'UTF8String') + 'UTF8String', 'UnixFd') from _dbus_bindings import ObjectPath, ByteArray, Signature, Byte,\ Int16, UInt16, Int32, UInt32,\ Int64, UInt64, Dictionary, Array, \ - String, Boolean, Double, Struct, UTF8String + String, Boolean, Double, Struct, UTF8String, \ + UnixFd |