diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-11-12 11:53:44 +0000 |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-01-07 16:26:49 +0000 |
commit | 4b501c3e26383c48f8b671963ef30924eae66780 (patch) | |
tree | 74555596d94dab85fc808a01163866c502065cde | |
parent | fbbbda700b35322ce396a9433125c18bebba5626 (diff) |
Re-namespace to im.telepathy.v1
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=71262
Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
-rw-r--r-- | .gitignore | 4 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | data/Makefile.am | 2 | ||||
-rw-r--r-- | data/im.telepathy.v1.ConnectionManager.idle.service.in (renamed from data/im.telepathy1.ConnectionManager.idle.service.in) | 2 | ||||
-rw-r--r-- | extensions/Connection_Interface_Renaming.xml | 18 | ||||
-rw-r--r-- | src/idle-im-channel.c | 2 | ||||
-rw-r--r-- | src/idle-muc-channel.c | 2 | ||||
-rw-r--r-- | src/idle-roomlist-channel.c | 6 | ||||
-rw-r--r-- | tests/twisted/constants.py | 2 | ||||
-rw-r--r-- | tests/twisted/tools/Makefile.am | 4 | ||||
-rw-r--r-- | tests/twisted/tools/idle.service.in | 2 |
11 files changed, 23 insertions, 23 deletions
@@ -45,7 +45,7 @@ Makefile.in *-bindings.[ch] *-gen.h -data/im.telepathy1.ConnectionManager.idle.service +data/im.telepathy.v1.ConnectionManager.idle.service extensions/_gen extensions/extensions.html @@ -69,7 +69,7 @@ tests/twisted/config.py tests/twisted/idle-twisted-tests.list tests/twisted/tools/exec-with-log.sh tests/twisted/tools/idle-testing.log -tests/twisted/tools/im.telepathy1.ConnectionManager.idle.service +tests/twisted/tools/im.telepathy.v1.ConnectionManager.idle.service tests/twisted/run-test.sh tests/twisted/test-suite.log tests/twisted/tools/tmp-session-bus.conf diff --git a/configure.ac b/configure.ac index b1c57d1..506747a 100644 --- a/configure.ac +++ b/configure.ac @@ -98,7 +98,7 @@ AC_DEFINE([TP_SEAL_ENABLE], [], [Prevent to use sealed variables]) AC_DEFINE([TP_DISABLE_SINGLE_INCLUDE], [], [Disable single header include]) AC_DEFINE(TP_VERSION_MIN_REQUIRED, TP_VERSION_0_22, [Ignore post 0.22 deprecations]) AC_DEFINE(TP_VERSION_MAX_ALLOWED, TP_VERSION_0_22, [Prevent post 0.22 APIs]) -PKG_CHECK_MODULES([TELEPATHY], [telepathy-glib-1 >= 0.99.2, telepathy-glib-1-dbus >= 0.99.2]) +PKG_CHECK_MODULES([TELEPATHY], [telepathy-glib-1 >= 0.99.5, telepathy-glib-1-dbus >= 0.99.5]) dnl Check for code generation tools XSLTPROC= diff --git a/data/Makefile.am b/data/Makefile.am index 1a5ecf6..edb8f6d 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -6,7 +6,7 @@ manager_DATA = idle.manager BUILT_FILES = $(service_in_files:.service.in=.service) servicedir = $(DBUS_SERVICES_DIR) -service_in_files = im.telepathy1.ConnectionManager.idle.service.in +service_in_files = im.telepathy.v1.ConnectionManager.idle.service.in service_DATA = $(BUILT_FILES) CLEANFILES = $(BUILT_FILES) diff --git a/data/im.telepathy1.ConnectionManager.idle.service.in b/data/im.telepathy.v1.ConnectionManager.idle.service.in index 4bf24de..5c7a539 100644 --- a/data/im.telepathy1.ConnectionManager.idle.service.in +++ b/data/im.telepathy.v1.ConnectionManager.idle.service.in @@ -1,3 +1,3 @@ [D-BUS Service] -Name=im.telepathy1.ConnectionManager.idle +Name=im.telepathy.v1.ConnectionManager.idle Exec=@libexecdir@/telepathy-idle diff --git a/extensions/Connection_Interface_Renaming.xml b/extensions/Connection_Interface_Renaming.xml index 0c7ae5d..e4bf0e7 100644 --- a/extensions/Connection_Interface_Renaming.xml +++ b/extensions/Connection_Interface_Renaming.xml @@ -18,9 +18,9 @@ Lesser General Public License for more details.</p> License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</p> </tp:license> - <interface name="im.telepathy1.Connection.Interface.Renaming" + <interface name="im.telepathy.v1.Connection.Interface.Renaming" tp:causes-havoc='not well-tested'> - <tp:requires interface="im.telepathy1.Connection"/> + <tp:requires interface="im.telepathy.v1.Connection"/> <signal name="Renamed" tp:name-for-bindings="Renamed"> <arg name="Original" type="u" tp:type="Contact_Handle"> <tp:docstring> @@ -51,7 +51,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ a channel which has the groups interface, it will be removed from the channel and the new handle will be added. The resulting <tp:dbus-ref - namespace="im.telepathy1.Channel.Interface.Group">MembersChanged</tp:dbus-ref> + namespace="im.telepathy.v1.Channel.Interface.Group">MembersChanged</tp:dbus-ref> signal must be emitted <em>after</em> the <tp:member-ref>Renamed</tp:member-ref> signal; the reason should be RENAMED. @@ -74,17 +74,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <p>Request that the user's own identifier is changed on the server. If successful, a <tp:member-ref>Renamed</tp:member-ref> signal will be emitted for the current "self handle" as returned by <tp:dbus-ref - namespace="im.telepathy1.Connection">GetSelfHandle</tp:dbus-ref>.</p> + namespace="im.telepathy.v1.Connection">GetSelfHandle</tp:dbus-ref>.</p> <p>It is protocol-dependent how the identifier that's actually used will be derived from the supplied identifier; some sort of normalization might take place.</p> </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.Disconnected"/> - <tp:error name="im.telepathy1.Error.NetworkError"/> - <tp:error name="im.telepathy1.Error.NotAvailable"/> - <tp:error name="im.telepathy1.Error.InvalidArgument"/> - <tp:error name="im.telepathy1.Error.PermissionDenied"/> + <tp:error name="im.telepathy.v1.Error.Disconnected"/> + <tp:error name="im.telepathy.v1.Error.NetworkError"/> + <tp:error name="im.telepathy.v1.Error.NotAvailable"/> + <tp:error name="im.telepathy.v1.Error.InvalidArgument"/> + <tp:error name="im.telepathy.v1.Error.PermissionDenied"/> </tp:possible-errors> </method> <tp:docstring> diff --git a/src/idle-im-channel.c b/src/idle-im-channel.c index 3e48944..76c7f4b 100644 --- a/src/idle-im-channel.c +++ b/src/idle-im-channel.c @@ -182,7 +182,7 @@ idle_im_channel_get_interfaces (TpBaseChannel *channel) * idle_im_channel_send * * Indirectly implements (via TpMessageMixin) D-Bus method Send on interface - * im.telepathy1.Channel.Type.Text and D-Bus method SendMessage on + * im.telepathy.v1.Channel.Type.Text and D-Bus method SendMessage on * Channel.Interface.Messages */ static void diff --git a/src/idle-muc-channel.c b/src/idle-muc-channel.c index f67eedd..ed97cfa 100644 --- a/src/idle-muc-channel.c +++ b/src/idle-muc-channel.c @@ -1434,7 +1434,7 @@ static void idle_muc_channel_provide_password (TpSvcChannelInterfacePassword1 *i * idle_muc_channel_send * * Indirectly implements (via TpMessageMixin) D-Bus method Send on interface - * im.telepathy1.Channel.Type.Text and D-Bus method SendMessage on + * im.telepathy.v1.Channel.Type.Text and D-Bus method SendMessage on * Channel.Interface.Messages */ static void diff --git a/src/idle-roomlist-channel.c b/src/idle-roomlist-channel.c index eb6bc4d..a07e7b4 100644 --- a/src/idle-roomlist-channel.c +++ b/src/idle-roomlist-channel.c @@ -222,7 +222,7 @@ idle_roomlist_channel_close (TpBaseChannel *channel) * idle_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 */ static void idle_roomlist_channel_get_listing_rooms (TpSvcChannelTypeRoomList1 *iface, @@ -240,7 +240,7 @@ idle_roomlist_channel_get_listing_rooms (TpSvcChannelTypeRoomList1 *iface, * idle_roomlist_channel_list_rooms * * Implements D-Bus method ListRooms - * on interface im.telepathy1.Channel.Type.RoomList + * on interface im.telepathy.v1.Channel.Type.RoomList */ static void idle_roomlist_channel_list_rooms (TpSvcChannelTypeRoomList1 *iface, @@ -261,7 +261,7 @@ idle_roomlist_channel_list_rooms (TpSvcChannelTypeRoomList1 *iface, * idle_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 idle_roomlist_channel_stop_listing (TpSvcChannelTypeRoomList1 *iface, 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/tools/Makefile.am b/tests/twisted/tools/Makefile.am index e987989..e21c97a 100644 --- a/tests/twisted/tools/Makefile.am +++ b/tests/twisted/tools/Makefile.am @@ -9,12 +9,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 sed -e "s|[@]abs_top_builddir[@]|@abs_top_builddir@|g" $< > $@ # D-Bus service file for testing service_in_files = idle.service.in -service_files = im.telepathy1.ConnectionManager.idle.service +service_files = im.telepathy.v1.ConnectionManager.idle.service # D-Bus config file for testing conf_in_files = tmp-session-bus.conf.in diff --git a/tests/twisted/tools/idle.service.in b/tests/twisted/tools/idle.service.in index f3c542b..d7c9596 100644 --- a/tests/twisted/tools/idle.service.in +++ b/tests/twisted/tools/idle.service.in @@ -1,3 +1,3 @@ [D-BUS Service] -Name=im.telepathy1.ConnectionManager.idle +Name=im.telepathy.v1.ConnectionManager.idle Exec=@abs_top_builddir@/tests/twisted/tools/exec-with-log.sh |