From 8bca8f238eddac1a47f4418c1d6d5cc4b8c7fce0 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 5 Nov 2013 16:48:34 +0000 Subject: [PATCH 9/9] Re-namespace to im.telepathy.v1 --- .gitignore | 4 ++-- data/Makefile.am | 4 ++-- data/salut.service.in | 2 +- extensions/Connection_Future.xml | 12 +++++----- extensions/OLPC_Activity_Properties.xml | 16 ++++++------- extensions/OLPC_Buddy_Info.xml | 28 +++++++++++----------- extensions/Salut_Plugin_Test.xml | 2 +- plugins/test.c | 2 +- src/connection.c | 4 ++-- src/file-transfer-channel.c | 4 ++-- src/muc-manager.c | 4 ++-- src/roomlist-channel.c | 8 +++---- src/tube-dbus.c | 4 ++-- src/tube-stream.c | 4 ++-- tests/twisted/avahi/caps-self.py | 2 +- tests/twisted/avahi/close-local-pending-room.py | 2 +- .../avahi/file-transfer/file_transfer_helper.py | 8 +++---- tests/twisted/avahi/muc-invite.py | 2 +- tests/twisted/avahi/olpc-activity-announcements.py | 2 +- tests/twisted/avahi/tubes/tubetestutil.py | 2 +- tests/twisted/avahi/tubes/two-muc-dbus-tubes.py | 4 ++-- tests/twisted/constants.py | 2 +- tests/twisted/sidecars.py | 2 +- tests/twisted/tools/Makefile.am | 4 ++-- tests/twisted/tools/salut.service.in | 2 +- 25 files changed, 65 insertions(+), 65 deletions(-) diff --git a/.gitignore b/.gitignore index ec554dd..bfec94d 100644 --- a/.gitignore +++ b/.gitignore @@ -81,7 +81,7 @@ m4/lt~obsolete.m4 /coverage/ -data/im.telepathy1.ConnectionManager.salut.service +data/im.telepathy.v1.ConnectionManager.salut.service data/*.service data/salut.manager @@ -118,7 +118,7 @@ tests/twisted/tools/core tests/twisted/tools/exec-with-log.sh tests/twisted/tools/salut-testing.log* tests/twisted/tools/tmp-session-bus.conf -tests/twisted/tools/im.telepathy1.ConnectionManager.salut.service +tests/twisted/tools/im.telepathy.v1.ConnectionManager.salut.service tests/twisted/tools/refdbg.log /tests/twisted/with-session-bus*.address /tests/twisted/with-session-bus*.pid diff --git a/data/Makefile.am b/data/Makefile.am index 049070c..296387b 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -4,12 +4,12 @@ managerdir = $(datadir)/telepathy/managers manager_DATA = salut.manager servicedir = $(datadir)/dbus-1/services -service_DATA = im.telepathy1.ConnectionManager.salut.service +service_DATA = im.telepathy.v1.ConnectionManager.salut.service # We don't use the full filename for the .in because > 99 character filenames # in tarballs are non-portable (and automake 1.8 doesn't let us build # non-archaic tarballs) -im.telepathy1.ConnectionManager.salut.service: salut.service.in \ +im.telepathy.v1.ConnectionManager.salut.service: salut.service.in \ Makefile $(AM_V_GEN)sed -e "s|[@]libexecdir[@]|$(libexecdir)|" $< > $@ diff --git a/data/salut.service.in b/data/salut.service.in index 6030368..fe080b0 100644 --- a/data/salut.service.in +++ b/data/salut.service.in @@ -1,3 +1,3 @@ [D-BUS Service] -Name=im.telepathy1.ConnectionManager.salut +Name=im.telepathy.v1.ConnectionManager.salut Exec=@libexecdir@/telepathy-salut diff --git a/extensions/Connection_Future.xml b/extensions/Connection_Future.xml index a578a88..ad08642 100644 --- a/extensions/Connection_Future.xml +++ b/extensions/Connection_Future.xml @@ -20,9 +20,9 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

- - + @@ -75,12 +75,12 @@ USA.

in a dictionary, build a proxy object from the value). More “plural” plugins are likely to want to implement new types of Channel + namespace="im.telepathy.v1">Channel instead.

- + The requested sidecar is not implemented by this connection manager, or a necessary server-side component does not exist. (FIXME: split @@ -91,7 +91,7 @@ USA.

 - + A server-side component needed by the requested sidecar reported it is currently too busy, or did not respond for some @@ -99,7 +99,7 @@ USA.

 - + The connection was disconnected while the sidecar was being set up. diff --git a/extensions/OLPC_Activity_Properties.xml b/extensions/OLPC_Activity_Properties.xml index 4125cd5..babfd4f 100644 --- a/extensions/OLPC_Activity_Properties.xml +++ b/extensions/OLPC_Activity_Properties.xml @@ -17,7 +17,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

- + @@ -35,9 +35,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

You have to be the owner of this activity. - - - + + + @@ -56,8 +56,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

Get the properties of a particular activity. - - + + @@ -80,8 +80,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

- - + + diff --git a/extensions/OLPC_Buddy_Info.xml b/extensions/OLPC_Buddy_Info.xml index 83bf916..cdd9fb4 100644 --- a/extensions/OLPC_Buddy_Info.xml +++ b/extensions/OLPC_Buddy_Info.xml @@ -17,7 +17,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

- + @@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

(possibly immediately).

- + @@ -54,8 +54,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

Get the properties of a particular contact. - - + + @@ -103,8 +103,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

Set the activities of the local user for this connection. - - + + @@ -128,8 +128,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

- - + + @@ -152,8 +152,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

Get the activities of a particular contact. - - + + @@ -196,8 +196,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

Set the current activity of the local user for this connection. - - + + @@ -223,8 +223,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

Get the current activity of a particular contact. - - + + diff --git a/extensions/Salut_Plugin_Test.xml b/extensions/Salut_Plugin_Test.xml index d62c26b..1bcde7b 100644 --- a/extensions/Salut_Plugin_Test.xml +++ b/extensions/Salut_Plugin_Test.xml @@ -17,7 +17,7 @@ Lesser General Public License for more details.

License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

- +

A sidecar interface implemented by a plugin used by the test suite.

diff --git a/plugins/test.c b/plugins/test.c index 6ab1513..03c9a60 100644 --- a/plugins/test.c +++ b/plugins/test.c @@ -14,7 +14,7 @@ static void plugin_iface_init ( gpointer g_iface, gpointer data); -#define IFACE_TEST "im.telepathy1.Salut.Plugin.Test" +#define IFACE_TEST "im.telepathy.v1.Salut.Plugin.Test" static const gchar * const sidecar_interfaces[] = { IFACE_TEST, diff --git a/src/connection.c b/src/connection.c index 07d4c59..9bf9316 100644 --- a/src/connection.c +++ b/src/connection.c @@ -1346,7 +1346,7 @@ salut_connection_get_alias (SalutConnection *self, TpHandle handle) * salut_connection_request_aliases * * Implements D-Bus method RequestAliases - * on interface im.telepathy1.Connection.Interface.Aliasing + * on interface im.telepathy.v1.Connection.Interface.Aliasing * */ static void @@ -1938,7 +1938,7 @@ data_forms_equal (GPtrArray *one, * * Implements D-Bus method UpdateCapabilities * on interface - * im.telepathy1.Connection.Interface.ContactCapabilities + * im.telepathy.v1.Connection.Interface.ContactCapabilities */ static void salut_connection_update_capabilities ( diff --git a/src/file-transfer-channel.c b/src/file-transfer-channel.c index a3621f9..0ac431b 100644 --- a/src/file-transfer-channel.c +++ b/src/file-transfer-channel.c @@ -1188,7 +1188,7 @@ salut_file_transfer_channel_offer_file (SalutFileTransferChannel *self, * salut_file_transfer_channel_accept_file * * Implements D-Bus method AcceptFile - * on interface im.telepathy1.Channel.Type.FileTransfer + * on interface im.telepathy.v1.Channel.Type.FileTransfer */ static void salut_file_transfer_channel_accept_file (TpSvcChannelTypeFileTransfer1 *iface, @@ -1264,7 +1264,7 @@ salut_file_transfer_channel_accept_file (TpSvcChannelTypeFileTransfer1 *iface, * salut_file_transfer_channel_provide_file * * Implements D-Bus method ProvideFile - * on interface im.telepathy1.Channel.Type.FileTransfer + * on interface im.telepathy.v1.Channel.Type.FileTransfer */ static void salut_file_transfer_channel_provide_file ( diff --git a/src/muc-manager.c b/src/muc-manager.c index 30a0a81..86ff547 100644 --- a/src/muc-manager.c +++ b/src/muc-manager.c @@ -360,12 +360,12 @@ salut_muc_manager_type_foreach_channel_class (GType type, g_hash_table_insert (table, TP_IFACE_CHANNEL ".TargetHandleType", handle_type_value); - /* im.telepathy1.Channel.Type.Text */ + /* im.telepathy.v1.Channel.Type.Text */ g_value_set_static_string (channel_type_value, TP_IFACE_CHANNEL_TYPE_TEXT); func (type, table, muc_channel_allowed_properties, user_data); - /* im.telepathy1.Channel.Type.StreamTube */ + /* im.telepathy.v1.Channel.Type.StreamTube */ g_value_set_static_string (channel_type_value, TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1); func (type, table, salut_tube_stream_channel_get_allowed_properties (), diff --git a/src/roomlist-channel.c b/src/roomlist-channel.c index 1e59822..f50bc41 100644 --- a/src/roomlist-channel.c +++ b/src/roomlist-channel.c @@ -247,7 +247,7 @@ salut_roomlist_channel_add_room (SalutRoomlistChannel *self, dbus_g_type_specialized_construct (TP_STRUCT_TYPE_ROOM_INFO)); dbus_g_type_struct_set (&room, 0, handle, - 1, "im.telepathy1.Channel.Type.Text", + 1, "im.telepathy.v1.Channel.Type.Text", 2, keys, G_MAXUINT); g_ptr_array_add (priv->rooms, g_value_get_boxed (&room)); @@ -299,7 +299,7 @@ salut_roomlist_channel_remove_room (SalutRoomlistChannel *self, * salut_roomlist_channel_get_listing_rooms * * Implements D-Bus method GetListingRooms - * on interface im.telepathy1.Channel.Type.RoomList + * on interface im.telepathy.v1.Channel.Type.RoomList * * @error: Used to return a pointer to a GError detailing any error * that occurred, D-Bus will throw the error only if this @@ -324,7 +324,7 @@ salut_roomlist_channel_get_listing_rooms (TpSvcChannelTypeRoomList1 *iface, * salut_roomlist_channel_list_rooms * * Implements D-Bus method ListRooms - * on interface im.telepathy1.Channel.Type.RoomList + * on interface im.telepathy.v1.Channel.Type.RoomList * * @error: Used to return a pointer to a GError detailing any error * that occurred, D-Bus will throw the error only if this @@ -350,7 +350,7 @@ salut_roomlist_channel_list_rooms (TpSvcChannelTypeRoomList1 *iface, * salut_roomlist_channel_stop_listing * * Implements D-Bus method StopListing - * on interface im.telepathy1.Channel.Type.RoomList + * on interface im.telepathy.v1.Channel.Type.RoomList */ static void salut_roomlist_channel_stop_listing (TpSvcChannelTypeRoomList1 *iface, diff --git a/src/tube-dbus.c b/src/tube-dbus.c index ebe9a17..fddf54e 100644 --- a/src/tube-dbus.c +++ b/src/tube-dbus.c @@ -1536,7 +1536,7 @@ salut_tube_dbus_check_access_control (SalutTubeDBus *self, * salut_tube_dbus_offer_async * * Implement D-Bus method Offer on interface - * im.telepathy1.Channel.Type.DBusTube + * im.telepathy.v1.Channel.Type.DBusTube */ static void salut_tube_dbus_offer_async (TpSvcChannelTypeDBusTube1 *self, @@ -1576,7 +1576,7 @@ salut_tube_dbus_offer_async (TpSvcChannelTypeDBusTube1 *self, * salut_tube_dbus_accept_async * * Implements D-Bus method Accept on interface - * im.telepathy1.Channel.Type.DBusTube + * im.telepathy.v1.Channel.Type.DBusTube */ static void salut_tube_dbus_accept_async (TpSvcChannelTypeDBusTube1 *self, diff --git a/src/tube-stream.c b/src/tube-stream.c index 06e5d6d..cbed76c 100644 --- a/src/tube-stream.c +++ b/src/tube-stream.c @@ -2053,7 +2053,7 @@ salut_tube_stream_check_params (TpSocketAddressType address_type, * salut_tube_stream_offer_async * * Implements D-Bus method Offer - * on im.telepathy1.Channel.Type.StreamTube + * on im.telepathy.v1.Channel.Type.StreamTube */ static void salut_tube_stream_offer_async (TpSvcChannelTypeStreamTube1 *iface, @@ -2110,7 +2110,7 @@ salut_tube_stream_offer_async (TpSvcChannelTypeStreamTube1 *iface, * salut_tube_stream_accept_async * * Implements D-Bus method Accept - * on im.telepathy1.Channel.Type.StreamTube + * on im.telepathy.v1.Channel.Type.StreamTube */ static void salut_tube_stream_accept_async (TpSvcChannelTypeStreamTube1 *iface, diff --git a/tests/twisted/avahi/caps-self.py b/tests/twisted/avahi/caps-self.py index c176691..8e0bab2 100644 --- a/tests/twisted/avahi/caps-self.py +++ b/tests/twisted/avahi/caps-self.py @@ -1,6 +1,6 @@ """ Basic test of SetSelfCapabilities on interface -im.telepathy1.Connection.Interface.ContactCapabilities +im.telepathy.v1.Connection.Interface.ContactCapabilities """ from saluttest import exec_test diff --git a/tests/twisted/avahi/close-local-pending-room.py b/tests/twisted/avahi/close-local-pending-room.py index 5066fcf..c1f201a 100644 --- a/tests/twisted/avahi/close-local-pending-room.py +++ b/tests/twisted/avahi/close-local-pending-room.py @@ -72,7 +72,7 @@ def test(q, bus, conn): q.expect('dbus-signal', signal='MembersChanged', path=path) - lp_members = props_iface.Get('im.telepathy1.Channel.Interface.Group1', + lp_members = props_iface.Get('im.telepathy.v1.Channel.Interface.Group1', 'LocalPendingMembers') assert len(lp_members) == 1 diff --git a/tests/twisted/avahi/file-transfer/file_transfer_helper.py b/tests/twisted/avahi/file-transfer/file_transfer_helper.py index edfb198..cb1fc5b 100644 --- a/tests/twisted/avahi/file-transfer/file_transfer_helper.py +++ b/tests/twisted/avahi/file-transfer/file_transfer_helper.py @@ -246,7 +246,7 @@ class ReceiveFileTest(FileTransferTest): path, props = channels[0] # check channel properties - # im.telepathy1.Channel D-Bus properties + # im.telepathy.v1.Channel D-Bus properties assert props[cs.CHANNEL_TYPE] == cs.CHANNEL_TYPE_FILE_TRANSFER assert props[cs.INTERFACES] == [] assert props[cs.TARGET_HANDLE] == self.handle @@ -256,7 +256,7 @@ class ReceiveFileTest(FileTransferTest): assert props[cs.INITIATOR_HANDLE] == self.handle assert props[cs.INITIATOR_ID] == self.contact_name - # im.telepathy1.Channel.Type.FileTransfer D-Bus properties + # im.telepathy.v1.Channel.Type.FileTransfer D-Bus properties assert props[cs.FT_STATE] == cs.FT_STATE_PENDING assert props[cs.FT_CONTENT_TYPE] == self.file.content_type assert props[cs.FT_FILENAME] == self.file.name @@ -410,7 +410,7 @@ class SendFileTest(FileTransferTest): self.ft_path, props = self.conn.Requests.CreateChannel(request) - # im.telepathy1.Channel D-Bus properties + # im.telepathy.v1.Channel D-Bus properties assert props[cs.CHANNEL_TYPE] == cs.CHANNEL_TYPE_FILE_TRANSFER assert props[cs.INTERFACES] == [] assert props[cs.TARGET_HANDLE] == self.handle @@ -420,7 +420,7 @@ class SendFileTest(FileTransferTest): assert props[cs.INITIATOR_HANDLE] == self.self_handle assert props[cs.INITIATOR_ID] == self.self_handle_name - # im.telepathy1.Channel.Type.FileTransfer D-Bus properties + # im.telepathy.v1.Channel.Type.FileTransfer D-Bus properties assert props[cs.FT_STATE] == cs.FT_STATE_PENDING assert props[cs.FT_CONTENT_TYPE] == self.file.content_type assert props[cs.FT_FILENAME] == self.file.name diff --git a/tests/twisted/avahi/muc-invite.py b/tests/twisted/avahi/muc-invite.py index 6f0a611..c07bea2 100644 --- a/tests/twisted/avahi/muc-invite.py +++ b/tests/twisted/avahi/muc-invite.py @@ -80,7 +80,7 @@ def test(q, bus, conn): channel_group = make_channel_proxy(conn, path, "Channel.Interface.Group") # check channel properties - # im.telepathy1.Channel D-Bus properties + # im.telepathy.v1.Channel D-Bus properties assert props[cs.CHANNEL_TYPE] == cs.CHANNEL_TYPE_TEXT assertContains(cs.CHANNEL_IFACE_GROUP, props[cs.INTERFACES]) assert props[cs.TARGET_ID] == 'my-room' diff --git a/tests/twisted/avahi/olpc-activity-announcements.py b/tests/twisted/avahi/olpc-activity-announcements.py index 93dbd1a..a883d92 100644 --- a/tests/twisted/avahi/olpc-activity-announcements.py +++ b/tests/twisted/avahi/olpc-activity-announcements.py @@ -13,7 +13,7 @@ import time import dbus import socket -CHANNEL_TYPE_TEXT = "im.telepathy1.Channel.Type.Text" +CHANNEL_TYPE_TEXT = "im.telepathy.v1.Channel.Type.Text" HT_CONTACT = 1 HT_ROOM = 2 HT_CONTACT_LIST = 3 diff --git a/tests/twisted/avahi/tubes/tubetestutil.py b/tests/twisted/avahi/tubes/tubetestutil.py index 4e342f9..a8bbcaa 100644 --- a/tests/twisted/avahi/tubes/tubetestutil.py +++ b/tests/twisted/avahi/tubes/tubetestutil.py @@ -56,7 +56,7 @@ def connect_two_accounts(q, bus, conn): # property first contact1_handle_on_conn2 = 0 conn2_members = conn2_publish_proxy.Get( - 'im.telepathy1.Channel.Interface.Group', 'Members', + 'im.telepathy.v1.Channel.Interface.Group', 'Members', dbus_interface='org.freedesktop.DBus.Properties') for h in conn2_members: name = conn2.InspectHandles(cs.HT_CONTACT, [h])[0] diff --git a/tests/twisted/avahi/tubes/two-muc-dbus-tubes.py b/tests/twisted/avahi/tubes/two-muc-dbus-tubes.py index ae8864c..42ef174 100644 --- a/tests/twisted/avahi/tubes/two-muc-dbus-tubes.py +++ b/tests/twisted/avahi/tubes/two-muc-dbus-tubes.py @@ -21,9 +21,9 @@ def check_dbus_names(tube, members): names = tube.Properties.Get(cs.CHANNEL_TYPE_DBUS_TUBE, 'DBusNames') assert set(names.keys()) == set(members), names.keys() -SERVICE = "im.telepathy1.Tube.Test" +SERVICE = "im.telepathy.v1.Tube.Test" IFACE = SERVICE -PATH = "/im/telepathy1/Tube/Test" +PATH = "/im/telepathy/v1/Tube/Test" print "FIXME: MUC tubes tests are currently broken: fdo#69223" # exiting 77 causes automake to consider the test to have been skipped diff --git a/tests/twisted/constants.py b/tests/twisted/constants.py index e72c592..a9181ac 100644 --- a/tests/twisted/constants.py +++ b/tests/twisted/constants.py @@ -22,7 +22,7 @@ Some handy constants for other tests to share and enjoy. from dbus import PROPERTIES_IFACE, INTROSPECTABLE_IFACE -PREFIX = "im.telepathy1" +PREFIX = "im.telepathy.v1" PATH_PREFIX = '/' + PREFIX.replace('.', '/') tp_name_prefix = PREFIX diff --git a/tests/twisted/sidecars.py b/tests/twisted/sidecars.py index 137a27f..87941f0 100644 --- a/tests/twisted/sidecars.py +++ b/tests/twisted/sidecars.py @@ -9,7 +9,7 @@ from saluttest import exec_test import constants as cs from config import PLUGINS_ENABLED -TEST_PLUGIN_IFACE = "im.telepathy1.Salut.Plugin.Test" +TEST_PLUGIN_IFACE = "im.telepathy.v1.Salut.Plugin.Test" if not PLUGINS_ENABLED: print "NOTE: built without --enable-plugins, not testing plugins" diff --git a/tests/twisted/tools/Makefile.am b/tests/twisted/tools/Makefile.am index bab9999..97d62f7 100644 --- a/tests/twisted/tools/Makefile.am +++ b/tests/twisted/tools/Makefile.am @@ -8,12 +8,12 @@ exec-with-log.sh: exec-with-log.sh.in # We don't use the full filename for the .in because > 99 character filenames # in tarballs are non-portable (and automake 1.8 doesn't let us build # non-archaic tarballs) -im.telepathy1.ConnectionManager.%.service: %.service.in +im.telepathy.v1.ConnectionManager.%.service: %.service.in $(AM_V_GEN)sed -e "s|[@]abs_top_builddir[@]|@abs_top_builddir@|g" $< > $@ # D-Bus service file for testing service_in_files = salut.service.in -service_files = im.telepathy1.ConnectionManager.salut.service +service_files = im.telepathy.v1.ConnectionManager.salut.service # D-Bus config file for testing conf_in_files = tmp-session-bus.conf.in diff --git a/tests/twisted/tools/salut.service.in b/tests/twisted/tools/salut.service.in index c517ba1..2ebde94 100644 --- a/tests/twisted/tools/salut.service.in +++ b/tests/twisted/tools/salut.service.in @@ -1,3 +1,3 @@ [D-BUS Service] -Name=im.telepathy1.ConnectionManager.salut +Name=im.telepathy.v1.ConnectionManager.salut Exec=@abs_top_builddir@/tests/twisted/tools/exec-with-log.sh -- 1.8.4.2