diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-01-25 15:26:14 +0000 |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-01-25 15:26:14 +0000 |
commit | aa992c0e1f615bd0034b4eb64ae1f61840b2cfa6 (patch) | |
tree | c770d259d6ff26e4c9fa3aa2d8edbbb188e9f883 | |
parent | cebe089a394dd9a570f87dd17b0030eb86d2c740 (diff) |
Rename spec XML files to match the node-name (camel-case with underscores).
-rw-r--r-- | spec/Channel_Interface_DTMF.xml (renamed from spec/ChannelInterfaceDTMF.xml) | 0 | ||||
-rw-r--r-- | spec/Channel_Interface_Group.xml (renamed from spec/ChannelInterfaceGroup.xml) | 0 | ||||
-rw-r--r-- | spec/Channel_Interface_Hold.xml (renamed from spec/ChannelInterfaceHold.xml) | 0 | ||||
-rw-r--r-- | spec/Channel_Interface_Media_Signalling.xml (renamed from spec/ChannelInterfaceMediaSignalling.xml) | 0 | ||||
-rw-r--r-- | spec/Channel_Interface_Password.xml (renamed from spec/ChannelInterfacePassword.xml) | 0 | ||||
-rw-r--r-- | spec/Channel_Interface_Transfer.xml (renamed from spec/ChannelInterfaceTransfer.xml) | 0 | ||||
-rw-r--r-- | spec/Channel_Type_Contact_List.xml (renamed from spec/ChannelTypeContactList.xml) | 0 | ||||
-rw-r--r-- | spec/Channel_Type_Contact_Search.xml (renamed from spec/ChannelTypeContactSearch.xml) | 0 | ||||
-rw-r--r-- | spec/Channel_Type_Room_List.xml (renamed from spec/ChannelTypeRoomList.xml) | 0 | ||||
-rw-r--r-- | spec/Channel_Type_Streamed_Media.xml (renamed from spec/ChannelTypeStreamedMedia.xml) | 0 | ||||
-rw-r--r-- | spec/Channel_Type_Text.xml (renamed from spec/ChannelTypeText.xml) | 0 | ||||
-rw-r--r-- | spec/Connection_Interface_Aliasing.xml (renamed from spec/ConnectionInterfaceAliasing.xml) | 0 | ||||
-rw-r--r-- | spec/Connection_Interface_Avatars.xml (renamed from spec/ConnectionInterfaceAvatars.xml) | 0 | ||||
-rw-r--r-- | spec/Connection_Interface_Capabilities.xml (renamed from spec/ConnectionInterfaceCapabilities.xml) | 0 | ||||
-rw-r--r-- | spec/Connection_Interface_Contact_Info.xml (renamed from spec/ConnectionInterfaceContactInfo.xml) | 0 | ||||
-rw-r--r-- | spec/Connection_Interface_Forwarding.xml (renamed from spec/ConnectionInterfaceForwarding.xml) | 0 | ||||
-rw-r--r-- | spec/Connection_Interface_Presence.xml (renamed from spec/ConnectionInterfacePresence.xml) | 0 | ||||
-rw-r--r-- | spec/Connection_Interface_Privacy.xml (renamed from spec/ConnectionInterfacePrivacy.xml) | 0 | ||||
-rw-r--r-- | spec/Connection_Interface_Renaming.xml (renamed from spec/ConnectionInterfaceRenaming.xml) | 0 | ||||
-rw-r--r-- | spec/Connection_Manager.xml (renamed from spec/ConnectionManager.xml) | 0 | ||||
-rw-r--r-- | spec/Media_Session_Handler.xml (renamed from spec/MediaSessionHandler.xml) | 0 | ||||
-rw-r--r-- | spec/Media_Stream_Handler.xml (renamed from spec/MediaStreamHandler.xml) | 0 | ||||
-rw-r--r-- | telepathy/server/channel.py | 18 | ||||
-rw-r--r-- | telepathy/server/conn.py | 16 | ||||
-rw-r--r-- | telepathy/server/connmgr.py | 2 | ||||
-rw-r--r-- | telepathy/server/media.py | 6 |
26 files changed, 21 insertions, 21 deletions
diff --git a/spec/ChannelInterfaceDTMF.xml b/spec/Channel_Interface_DTMF.xml index 54f0803c..54f0803c 100644 --- a/spec/ChannelInterfaceDTMF.xml +++ b/spec/Channel_Interface_DTMF.xml diff --git a/spec/ChannelInterfaceGroup.xml b/spec/Channel_Interface_Group.xml index d3c3aeee..d3c3aeee 100644 --- a/spec/ChannelInterfaceGroup.xml +++ b/spec/Channel_Interface_Group.xml diff --git a/spec/ChannelInterfaceHold.xml b/spec/Channel_Interface_Hold.xml index 87c3223a..87c3223a 100644 --- a/spec/ChannelInterfaceHold.xml +++ b/spec/Channel_Interface_Hold.xml diff --git a/spec/ChannelInterfaceMediaSignalling.xml b/spec/Channel_Interface_Media_Signalling.xml index c33d5972..c33d5972 100644 --- a/spec/ChannelInterfaceMediaSignalling.xml +++ b/spec/Channel_Interface_Media_Signalling.xml diff --git a/spec/ChannelInterfacePassword.xml b/spec/Channel_Interface_Password.xml index fb8ccde2..fb8ccde2 100644 --- a/spec/ChannelInterfacePassword.xml +++ b/spec/Channel_Interface_Password.xml diff --git a/spec/ChannelInterfaceTransfer.xml b/spec/Channel_Interface_Transfer.xml index 3ae49082..3ae49082 100644 --- a/spec/ChannelInterfaceTransfer.xml +++ b/spec/Channel_Interface_Transfer.xml diff --git a/spec/ChannelTypeContactList.xml b/spec/Channel_Type_Contact_List.xml index 3405ea59..3405ea59 100644 --- a/spec/ChannelTypeContactList.xml +++ b/spec/Channel_Type_Contact_List.xml diff --git a/spec/ChannelTypeContactSearch.xml b/spec/Channel_Type_Contact_Search.xml index 2bd05168..2bd05168 100644 --- a/spec/ChannelTypeContactSearch.xml +++ b/spec/Channel_Type_Contact_Search.xml diff --git a/spec/ChannelTypeRoomList.xml b/spec/Channel_Type_Room_List.xml index a6fb13ba..a6fb13ba 100644 --- a/spec/ChannelTypeRoomList.xml +++ b/spec/Channel_Type_Room_List.xml diff --git a/spec/ChannelTypeStreamedMedia.xml b/spec/Channel_Type_Streamed_Media.xml index 471d18ae..471d18ae 100644 --- a/spec/ChannelTypeStreamedMedia.xml +++ b/spec/Channel_Type_Streamed_Media.xml diff --git a/spec/ChannelTypeText.xml b/spec/Channel_Type_Text.xml index ac7620d4..ac7620d4 100644 --- a/spec/ChannelTypeText.xml +++ b/spec/Channel_Type_Text.xml diff --git a/spec/ConnectionInterfaceAliasing.xml b/spec/Connection_Interface_Aliasing.xml index 2325db80..2325db80 100644 --- a/spec/ConnectionInterfaceAliasing.xml +++ b/spec/Connection_Interface_Aliasing.xml diff --git a/spec/ConnectionInterfaceAvatars.xml b/spec/Connection_Interface_Avatars.xml index 01a0f971..01a0f971 100644 --- a/spec/ConnectionInterfaceAvatars.xml +++ b/spec/Connection_Interface_Avatars.xml diff --git a/spec/ConnectionInterfaceCapabilities.xml b/spec/Connection_Interface_Capabilities.xml index 93569dc7..93569dc7 100644 --- a/spec/ConnectionInterfaceCapabilities.xml +++ b/spec/Connection_Interface_Capabilities.xml diff --git a/spec/ConnectionInterfaceContactInfo.xml b/spec/Connection_Interface_Contact_Info.xml index fe3fef59..fe3fef59 100644 --- a/spec/ConnectionInterfaceContactInfo.xml +++ b/spec/Connection_Interface_Contact_Info.xml diff --git a/spec/ConnectionInterfaceForwarding.xml b/spec/Connection_Interface_Forwarding.xml index 2960a87f..2960a87f 100644 --- a/spec/ConnectionInterfaceForwarding.xml +++ b/spec/Connection_Interface_Forwarding.xml diff --git a/spec/ConnectionInterfacePresence.xml b/spec/Connection_Interface_Presence.xml index f7960306..f7960306 100644 --- a/spec/ConnectionInterfacePresence.xml +++ b/spec/Connection_Interface_Presence.xml diff --git a/spec/ConnectionInterfacePrivacy.xml b/spec/Connection_Interface_Privacy.xml index 24915093..24915093 100644 --- a/spec/ConnectionInterfacePrivacy.xml +++ b/spec/Connection_Interface_Privacy.xml diff --git a/spec/ConnectionInterfaceRenaming.xml b/spec/Connection_Interface_Renaming.xml index 4583e80a..4583e80a 100644 --- a/spec/ConnectionInterfaceRenaming.xml +++ b/spec/Connection_Interface_Renaming.xml diff --git a/spec/ConnectionManager.xml b/spec/Connection_Manager.xml index e402b0f8..e402b0f8 100644 --- a/spec/ConnectionManager.xml +++ b/spec/Connection_Manager.xml diff --git a/spec/MediaSessionHandler.xml b/spec/Media_Session_Handler.xml index e839a0af..e839a0af 100644 --- a/spec/MediaSessionHandler.xml +++ b/spec/Media_Session_Handler.xml diff --git a/spec/MediaStreamHandler.xml b/spec/Media_Stream_Handler.xml index 1fad5c55..1fad5c55 100644 --- a/spec/MediaStreamHandler.xml +++ b/spec/Media_Stream_Handler.xml diff --git a/telepathy/server/channel.py b/telepathy/server/channel.py index aa650558..e98dd10c 100644 --- a/telepathy/server/channel.py +++ b/telepathy/server/channel.py @@ -23,33 +23,33 @@ from telepathy import * from telepathy._generated.Channel import Channel as _Channel -from telepathy._generated.ChannelTypeContactSearch \ +from telepathy._generated.Channel_Type_Contact_Search \ import ChannelTypeContactSearch \ as _ChannelTypeContactSearch -from telepathy._generated.ChannelTypeContactList \ +from telepathy._generated.Channel_Type_Contact_List \ import ChannelTypeContactList \ as _ChannelTypeContactList -from telepathy._generated.ChannelTypeStreamedMedia \ +from telepathy._generated.Channel_Type_Streamed_Media \ import ChannelTypeStreamedMedia \ as _ChannelTypeStreamedMedia -from telepathy._generated.ChannelTypeRoomList \ +from telepathy._generated.Channel_Type_Room_List \ import ChannelTypeRoomList \ as _ChannelTypeRoomList from telepathy._generated.ChannelTypeText \ import ChannelTypeText \ as _ChannelTypeText -from telepathy._generated.ChannelInterfaceDTMF \ +from telepathy._generated.Channel_Interface_DTMF \ import ChannelInterfaceDTMF -from telepathy._generated.ChannelInterfaceHold \ +from telepathy._generated.Channel_Interface_Hold \ import ChannelInterfaceHold -from telepathy._generated.ChannelInterfacePassword \ +from telepathy._generated.Channel_Interface_Password \ import ChannelInterfacePassword \ as _ChannelInterfacePassword -from telepathy._generated.ChannelInterfaceGroup \ +from telepathy._generated.Channel_Interface_Group \ import ChannelInterfaceGroup \ as _ChannelInterfaceGroup -from telepathy._generated.ChannelInterfaceTransfer \ +from telepathy._generated.Channel_Interface_Transfer \ import ChannelInterfaceTransfer class Channel(_Channel, dbus.service.Object): diff --git a/telepathy/server/conn.py b/telepathy/server/conn.py index fdcc9638..0116ec11 100644 --- a/telepathy/server/conn.py +++ b/telepathy/server/conn.py @@ -26,25 +26,25 @@ from telepathy import * from handle import Handle from telepathy._generated.Connection import Connection as _Connection -from telepathy._generated.ConnectionInterfaceAliasing \ +from telepathy._generated.Connection_Interface_Aliasing \ import ConnectionInterfaceAliasing \ as _ConnectionInterfaceAliasing -from telepathy._generated.ConnectionInterfaceAvatars \ +from telepathy._generated.Connection_Interface_Avatars \ import ConnectionInterfaceAvatars -from telepathy._generated.ConnectionInterfaceCapabilities \ +from telepathy._generated.Connection_Interface_Capabilities \ import ConnectionInterfaceCapabilities \ as _ConnectionInterfaceCapabilities -from telepathy._generated.ConnectionInterfaceContactInfo \ +from telepathy._generated.Connection_Interface_Contact_Info \ import ConnectionInterfaceContactInfo -from telepathy._generated.ConnectionInterfaceForwarding \ +from telepathy._generated.Connection_Interface_Forwarding \ import ConnectionInterfaceForwarding \ as _ConnectionInterfaceForwarding -from telepathy._generated.ConnectionInterfacePresence \ +from telepathy._generated.Connection_Interface_Presence \ import ConnectionInterfacePresence -from telepathy._generated.ConnectionInterfacePrivacy \ +from telepathy._generated.Connection_Interface_Privacy \ import ConnectionInterfacePrivacy \ as _ConnectionInterfacePrivacy -from telepathy._generated.ConnectionInterfaceRenaming \ +from telepathy._generated.Connection_Interface_Renaming \ import ConnectionInterfaceRenaming class Connection(_Connection, dbus.service.Object): diff --git a/telepathy/server/connmgr.py b/telepathy/server/connmgr.py index 637ffb85..84586cd2 100644 --- a/telepathy/server/connmgr.py +++ b/telepathy/server/connmgr.py @@ -22,7 +22,7 @@ import dbus.service from telepathy import * -from telepathy._generated.ConnectionManager import ConnectionManager as _ConnectionManager +from telepathy._generated.Connection_Manager import ConnectionManager as _ConnectionManager class ConnectionManager(_ConnectionManager, dbus.service.Object): def __init__(self, name): diff --git a/telepathy/server/media.py b/telepathy/server/media.py index 4a018404..e5f0ee61 100644 --- a/telepathy/server/media.py +++ b/telepathy/server/media.py @@ -19,9 +19,9 @@ import dbus.service -from telepathy._generated.ChannelInterfaceMediaSignalling import ChannelInterfaceMediaSignalling -from telepathy._generated.MediaSessionHandler import MediaSessionHandler as _MediaSessionHandler -from telepathy._generated.MediaStreamHandler import MediaStreamHandler as _MediaStreamHandler +from telepathy._generated.Channel_Interface_Media_Signalling import ChannelInterfaceMediaSignalling +from telepathy._generated.Media_Session_Handler import MediaSessionHandler as _MediaSessionHandler +from telepathy._generated.Media_Stream_Handler import MediaStreamHandler as _MediaStreamHandler class MediaSessionHandler(_MediaSessionHandler, dbus.service.Object): def __init__(self, bus_name, object_path): |