From 338369db8af6dd54af021c4efbffa7b3ad19cd21 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Tue, 9 Mar 2010 20:38:49 -0600 Subject: [PATCH] Switching protocol from sip to gv --- hand_tests/generic.py | 4 ++-- hand_tests/params.py | 2 +- hand_tests/presence.py | 2 +- src/constants.py | 2 +- src/util/tp_utils.py | 10 +++++----- support/theonering.manager | 2 +- support/theonering.profile.debian | 2 +- support/theonering.profile.diablo | 2 +- support/theonering.profile.fremantle | 2 +- support/theonering.profile.mer | 2 +- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/hand_tests/generic.py b/hand_tests/generic.py index 3d83a79..a25f77b 100755 --- a/hand_tests/generic.py +++ b/hand_tests/generic.py @@ -75,7 +75,7 @@ class DisplayParams(Action): def queue_action(self): self._cm[telepathy.interfaces.CONN_MGR_INTERFACE].GetParameters( - 'sip', + 'gv', reply_handler = self._on_done, error_handler = self._on_error, ) @@ -123,7 +123,7 @@ class RequestConnection(Action): def queue_action(self): self._cm[telepathy.server.CONNECTION_MANAGER].RequestConnection( - 'sip', + 'gv', { 'account': self._username, 'password': self._password, diff --git a/hand_tests/params.py b/hand_tests/params.py index e2f663f..c3906ea 100755 --- a/hand_tests/params.py +++ b/hand_tests/params.py @@ -39,7 +39,7 @@ if __name__ == "__main__": cm = reg.GetManager('theonering') # get the parameters required to make a Jabber connection - cm[CONN_MGR_INTERFACE].GetParameters('sip', + cm[CONN_MGR_INTERFACE].GetParameters('gv', reply_handler = print_params, error_handler = error_cb) loop = gobject.MainLoop() diff --git a/hand_tests/presence.py b/hand_tests/presence.py index 0a90e7f..52b6c9f 100755 --- a/hand_tests/presence.py +++ b/hand_tests/presence.py @@ -43,7 +43,7 @@ class Example(object): # get the parameters required to make a Jabber connection # Begin Example 2-3 - cm[CONNECTION_MANAGER].RequestConnection('sip', + cm[CONNECTION_MANAGER].RequestConnection('gv', { 'account': account, 'forward': forward, diff --git a/src/constants.py b/src/constants.py index 1529e44..2940788 100644 --- a/src/constants.py +++ b/src/constants.py @@ -8,5 +8,5 @@ __app_magic__ = 0xdeadbeef _data_path_ = os.path.join(os.path.expanduser("~"), ".telepathy-theonering") _user_settings_ = "%s/settings.ini" % _data_path_ _user_logpath_ = "%s/theonering.log" % _data_path_ -_telepathy_protocol_name_ = "sip" +_telepathy_protocol_name_ = "gv" _telepathy_implementation_name_ = "theonering" diff --git a/src/util/tp_utils.py b/src/util/tp_utils.py index 712e642..addae92 100644 --- a/src/util/tp_utils.py +++ b/src/util/tp_utils.py @@ -138,23 +138,23 @@ class NewChannelSignaller(object): def channel_path_to_conn_path(channelObjectPath): """ - >>> channel_path_to_conn_path("/org/freedesktop/Telepathy/ConnectionManager/theonering/sip/USERNAME/Channel1") - '/org/freedesktop/Telepathy/ConnectionManager/theonering/sip/USERNAME' + >>> channel_path_to_conn_path("/org/freedesktop/Telepathy/ConnectionManager/theonering/gv/USERNAME/Channel1") + '/org/freedesktop/Telepathy/ConnectionManager/theonering/gv/USERNAME' """ return channelObjectPath.rsplit("/", 1)[0] def path_to_service_name(path): """ - >>> path_to_service_name("/org/freedesktop/Telepathy/ConnectionManager/theonering/sip/USERNAME/Channel1") - 'org.freedesktop.Telepathy.ConnectionManager.theonering.sip.USERNAME' + >>> path_to_service_name("/org/freedesktop/Telepathy/ConnectionManager/theonering/gv/USERNAME/Channel1") + 'org.freedesktop.Telepathy.ConnectionManager.theonering.gv.USERNAME' """ return ".".join(path[1:].split("/")[0:7]) def cm_from_path(path): """ - >>> cm_from_path("/org/freedesktop/Telepathy/ConnectionManager/theonering/sip/USERNAME/Channel1") + >>> cm_from_path("/org/freedesktop/Telepathy/ConnectionManager/theonering/gv/USERNAME/Channel1") 'theonering' """ return path[1:].split("/")[4] diff --git a/support/theonering.manager b/support/theonering.manager index 2caff6b..7099c47 100644 --- a/support/theonering.manager +++ b/support/theonering.manager @@ -3,7 +3,7 @@ Name = theonering BusName = org.freedesktop.Telepathy.ConnectionManager.theonering ObjectPath = /org/freedesktop/Telepathy/ConnectionManager/theonering -[Protocol sip] +[Protocol gv] param-account = s required param-password = s required secret param-forward = s diff --git a/support/theonering.profile.debian b/support/theonering.profile.debian index 0ac91a5..958dec0 100644 --- a/support/theonering.profile.debian +++ b/support/theonering.profile.debian @@ -1,6 +1,6 @@ [Profile] Manager=theonering -Protocol=sip +Protocol=gv DisplayName=Google Voice IconName = im-theonering SupportsInvisible = 1 diff --git a/support/theonering.profile.diablo b/support/theonering.profile.diablo index cd5c28e..bf4ccb3 100644 --- a/support/theonering.profile.diablo +++ b/support/theonering.profile.diablo @@ -1,6 +1,6 @@ [Profile] Manager=theonering -Protocol=sip +Protocol=gv DisplayName=Google Voice IconName = im-theonering ConfigurationUI = haze-plugin diff --git a/support/theonering.profile.fremantle b/support/theonering.profile.fremantle index 42dbae1..02bf2ac 100644 --- a/support/theonering.profile.fremantle +++ b/support/theonering.profile.fremantle @@ -1,6 +1,6 @@ [Profile] Manager=theonering -Protocol=sip +Protocol=gv DisplayName=Google Voice IconName = im-theonering ConfigurationUI = haze-plugin diff --git a/support/theonering.profile.mer b/support/theonering.profile.mer index 0ac91a5..958dec0 100644 --- a/support/theonering.profile.mer +++ b/support/theonering.profile.mer @@ -1,6 +1,6 @@ [Profile] Manager=theonering -Protocol=sip +Protocol=gv DisplayName=Google Voice IconName = im-theonering SupportsInvisible = 1 -- 1.7.9.5