Attachment 88717 Details for Bug 71262 – [haze next 1/1] Use im.telepathy.v1 namespace

[patch] [haze next 1/1] Use im.telepathy.v1 namespace

0001-Use-im.telepathy.v1-namespace.patch (text/plain), 4.74 KB, created by Simon McVittie on 2013-11-05 17:00:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2013-11-05 17:00:15 UTC

Size: 4.74 KB

patch

obsolete

>From 0536086333fb83051ae37b211376e4afda3b77ea Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Tue, 5 Nov 2013 16:57:42 +0000
>Subject: [PATCH] Use im.telepathy.v1 namespace
>
>---
> .gitignore                                           | 4 ++--
> data/Makefile.am                                     | 4 ++--
> data/haze.service.in                                 | 3 +++
> data/im.telepathy1.ConnectionManager.haze.service.in | 3 ---
> src/im-channel.c                                     | 2 +-
> tests/twisted/constants.py                           | 2 +-
> tests/twisted/tools/Makefile.am                      | 4 ++--
> tests/twisted/tools/haze.service.in                  | 2 +-
> 8 files changed, 12 insertions(+), 12 deletions(-)
> create mode 100644 data/haze.service.in
> delete mode 100644 data/im.telepathy1.ConnectionManager.haze.service.in
>
>diff --git a/.gitignore b/.gitignore
>index 862af51..c6fd34a 100644
>--- a/.gitignore
>+++ b/.gitignore
>@@ -13,7 +13,7 @@ config.h
> config.h.in
> cscope.out
> stamp-h1
>-data/im.telepathy1.ConnectionManager.haze.service
>+data/im.telepathy.v1.ConnectionManager.haze.service
> depcomp
> /extensions/extensions.html
> install-sh
>@@ -33,7 +33,7 @@ src/telepathy-haze
> src/telepathy-haze.8
> tags
> /tests/haze-testing.log
>-/tests/twisted/tools/im.telepathy1.ConnectionManager.haze.service
>+/tests/twisted/tools/im.telepathy.v1.ConnectionManager.haze.service
> /tests/twisted/tools/tmp-session-bus.conf
> /tests/twisted/config.py
> /tests/twisted/haze-twisted-tests.list
>diff --git a/data/Makefile.am b/data/Makefile.am
>index dfe09f1..ec715f7 100644
>--- a/data/Makefile.am
>+++ b/data/Makefile.am
>@@ -1,7 +1,7 @@
> # Dbus service file
> servicedir = $(datadir)/dbus-1/services
>-service_in_files = im.telepathy1.ConnectionManager.haze.service.in
>-service_DATA = $(service_in_files:.service.in=.service)
>+service_in_files = haze.service.in
>+service_DATA = im.telepathy.v1.ConnectionManager.haze.service
> 
> BUILT_FILES = $(service_DATA)
> 
>diff --git a/data/haze.service.in b/data/haze.service.in
>new file mode 100644
>index 0000000..32b41e9
>--- /dev/null
>+++ b/data/haze.service.in
>@@ -0,0 +1,3 @@
>+[D-BUS Service]
>+Name=org.freedesktop.Telepathy.ConnectionManager.haze
>+Exec=@libexecdir@/telepathy-haze
>diff --git a/data/im.telepathy1.ConnectionManager.haze.service.in b/data/im.telepathy1.ConnectionManager.haze.service.in
>deleted file mode 100644
>index 32b41e9..0000000
>--- a/data/im.telepathy1.ConnectionManager.haze.service.in
>+++ /dev/null
>@@ -1,3 +0,0 @@
>-[D-BUS Service]
>-Name=org.freedesktop.Telepathy.ConnectionManager.haze
>-Exec=@libexecdir@/telepathy-haze
>diff --git a/src/im-channel.c b/src/im-channel.c
>index 4ab9afe..7321ff6 100644
>--- a/src/im-channel.c
>+++ b/src/im-channel.c
>@@ -111,7 +111,7 @@ haze_im_channel_get_interfaces (TpBaseChannel *base)
>  * haze_im_channel_destroy
>  *
>  * Implements D-Bus method Destroy
>- * on interface im.telepathy1.Channel.Interface.Destroyable
>+ * on interface im.telepathy.v1.Channel.Interface.Destroyable
>  */
> static void
> haze_im_channel_destroy (TpSvcChannelInterfaceDestroyable1 *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 c64e7c1..8e928e1 100644
>--- a/tests/twisted/tools/Makefile.am
>+++ b/tests/twisted/tools/Makefile.am
>@@ -4,13 +4,13 @@
> # 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" \
> 		-e "s|[@]abs_top_srcdir[@]|@abs_top_srcdir@|g" $< > $@
> 
> # D-Bus service file for testing
> service_in_files = haze.service.in
>-service_files = im.telepathy1.ConnectionManager.haze.service
>+service_files = im.telepathy.v1.ConnectionManager.haze.service
> 
> # D-Bus config file for testing
> conf_in_files = tmp-session-bus.conf.in
>diff --git a/tests/twisted/tools/haze.service.in b/tests/twisted/tools/haze.service.in
>index 8c3cea7..d106060 100644
>--- a/tests/twisted/tools/haze.service.in
>+++ b/tests/twisted/tools/haze.service.in
>@@ -1,3 +1,3 @@
> [D-BUS Service]
>-Name=im.telepathy1.ConnectionManager.haze
>+Name=im.telepathy.v1.ConnectionManager.haze
> Exec=@abs_top_srcdir@/tests/twisted/tools/exec-with-log.sh @abs_top_srcdir@ @abs_top_builddir@
>-- 
>1.8.4.2
>

Actions: View | Splinter Review

Attachments on bug 71262: 88707 | 88708 | 88709 | 88710 | 88711 | 88713 | 88714 | 88715 | 88717 | 88718 | 88724 | 88833 | 88834 | 89079 | 89080 | 89081 | 89082

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.