diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2009-06-12 12:36:12 +0100 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2009-06-12 12:36:12 +0100 |
| commit | 71bcbbc3e804beb010d47bbf00a0b00e92f6553e (patch) | |
| tree | 78b47a1ae083be571edfb1fab2af319fa037cd45 /examples | |
| parent | f2fd057c9cfae12be84ab5b8946bf9fabbc267dd (diff) | |
use generated constants and interface
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/tube-dbus-muc.py | 15 | ||||
| -rw-r--r-- | examples/tubeconn.py | 4 |
2 files changed, 6 insertions, 13 deletions
diff --git a/examples/tube-dbus-muc.py b/examples/tube-dbus-muc.py index 75a08de..859ae26 100644 --- a/examples/tube-dbus-muc.py +++ b/examples/tube-dbus-muc.py @@ -12,13 +12,16 @@ from telepathy.client import ( Connection, Channel) from telepathy.interfaces import ( CONN_INTERFACE, CHANNEL_INTERFACE_GROUP, CHANNEL_TYPE_TUBES, - CHANNEL_TYPE_TEXT, CHANNEL_INTERFACE, CONNECTION_INTERFACE_REQUESTS) + CHANNEL_TYPE_TEXT, CHANNEL_INTERFACE, CONNECTION_INTERFACE_REQUESTS, + CHANNEL_INTERFACE_TUBE, CHANNEL_TYPE_DBUS_TUBE) from telepathy.constants import ( CONNECTION_HANDLE_TYPE_CONTACT, CONNECTION_HANDLE_TYPE_ROOM, CONNECTION_STATUS_CONNECTED, CONNECTION_STATUS_DISCONNECTED, CONNECTION_STATUS_CONNECTING, TUBE_TYPE_DBUS, TUBE_TYPE_STREAM, TUBE_STATE_LOCAL_PENDING, - TUBE_STATE_REMOTE_PENDING, TUBE_STATE_OPEN, SOCKET_ACCESS_CONTROL_CREDENTIALS) + TUBE_STATE_REMOTE_PENDING, TUBE_STATE_OPEN, SOCKET_ACCESS_CONTROL_CREDENTIALS, + TUBE_CHANNEL_STATE_LOCAL_PENDING, TUBE_CHANNEL_STATE_REMOTE_PENDING, + TUBE_CHANNEL_STATE_OPEN, TUBE_CHANNEL_STATE_NOT_OFFERED) from account import connection_from_file from tubeconn import TubeConnection @@ -27,14 +30,6 @@ SERVICE = "org.freedesktop.Telepathy.Tube.Test" IFACE = SERVICE PATH = "/org/freedesktop/Telepathy/Tube/Test" -# TODO: import when tube API is stable -CHANNEL_INTERFACE_TUBE = CHANNEL_INTERFACE + ".Interface.Tube" -CHANNEL_TYPE_DBUS_TUBE = CHANNEL_INTERFACE + ".Type.DBusTube" - -TUBE_CHANNEL_STATE_LOCAL_PENDING = 0 -TUBE_CHANNEL_STATE_REMOTE_PENDING = 1 -TUBE_CHANNEL_STATE_OPEN = 2 -TUBE_CHANNEL_STATE_NOT_OFFERED = 3 tube_state = {TUBE_CHANNEL_STATE_LOCAL_PENDING : 'local pending',\ TUBE_CHANNEL_STATE_REMOTE_PENDING : 'remote pending',\ diff --git a/examples/tubeconn.py b/examples/tubeconn.py index f5ff0a9..ce950fd 100644 --- a/examples/tubeconn.py +++ b/examples/tubeconn.py @@ -26,12 +26,10 @@ import logging from dbus.connection import Connection from dbus import PROPERTIES_IFACE -from telepathy.interfaces import CHANNEL_INTERFACE +from telepathy.interfaces import CHANNEL_INTERFACE, CHANNEL_TYPE_DBUS_TUBE logger = logging.getLogger('telepathy.tubeconn') -# TODO: import when tube API is stable -CHANNEL_TYPE_DBUS_TUBE = CHANNEL_INTERFACE + ".Type.DBusTube" class TubeConnection(Connection): |