Attachment 88718 Details for Bug 71262 – [gabble next 1/1] Re-namespace to im.telepathy.v1

[patch] [gabble next 1/1] Re-namespace to im.telepathy.v1

0001-Re-namespace-to-im.telepathy.v1.patch (text/plain), 10.31 KB, created by Simon McVittie on 2013-11-05 17:05:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2013-11-05 17:05:40 UTC

Size: 10.31 KB

patch

obsolete

>From 171ac67b2faa2ec7f2d09a48946240080cd7057f Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Tue, 5 Nov 2013 16:22:19 +0000
>Subject: [PATCH] Re-namespace to im.telepathy.v1
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=71262
>---
> .gitignore | 2 +-
> configure.ac | 2 +-
> data/Makefile.am | 4 ++--
> data/gabble.service.in | 2 +-
> extensions/Connection_Interface_Gabble_Decloak.xml | 4 ++--
> extensions/Gabble_Plugin_Console.xml | 2 +-
> extensions/Gabble_Plugin_Gateways.xml | 10 +++++-----
> extensions/Gabble_Plugin_Test.xml | 2 +-
> plugins/telepathy-gabble-xmpp-console | 2 +-
> plugins/test.c | 2 +-
> tests/twisted/Makefile.am | 8 ++++----
> tests/twisted/constants.py | 2 +-
> tests/twisted/tools/servicedir-uninstalled/gabble.service.in | 2 +-
> tests/twisted/tools/servicedir/gabble.service.in | 2 +-
> 14 files changed, 23 insertions(+), 23 deletions(-)
>
>diff --git a/.gitignore b/.gitignore
>index ffc6460..6d23041 100644
>--- a/.gitignore
>+++ b/.gitignore
>@@ -38,7 +38,7 @@ _gen
> /configure.lineno
> core
> /data/gabble.manager
>-/data/im.telepathy1.ConnectionManager.gabble.service
>+/data/im.telepathy.v1.ConnectionManager.gabble.service
> /debian
> /depcomp
> /docs/*.html
>diff --git a/configure.ac b/configure.ac
>index 0692c00..7737c44 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -280,7 +280,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_1_0], [Ignore post 1.0 deprecations])
> AC_DEFINE([TP_VERSION_MAX_ALLOWED], [TP_VERSION_1_0], [Prevent post 1.0 APIs])
>-PKG_CHECK_MODULES(TP_GLIB, [telepathy-glib-1 >= 0.99.2, telepathy-glib-1-dbus >= 0.99.2])
>+PKG_CHECK_MODULES(TP_GLIB, [telepathy-glib-1 >= 0.99.3.1, telepathy-glib-1-dbus >= 0.99.3.1])
> 
> AC_SUBST(TP_GLIB_CFLAGS)
> AC_SUBST(TP_GLIB_LIBS)
>diff --git a/data/Makefile.am b/data/Makefile.am
>index 7b753ae..9a987a4 100644
>--- a/data/Makefile.am
>+++ b/data/Makefile.am
>@@ -4,12 +4,12 @@ managerdir = $(datadir)/telepathy-1/managers
> manager_DATA = gabble.manager
> 
> servicedir = $(datadir)/dbus-1/services
>-service_DATA = im.telepathy1.ConnectionManager.gabble.service
>+service_DATA = im.telepathy.v1.ConnectionManager.gabble.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.gabble.service: gabble.service.in \
>+im.telepathy.v1.ConnectionManager.gabble.service: gabble.service.in \
> 		Makefile
> 	$(AM_V_GEN)sed -e "s|[@]libexecdir[@]|$(libexecdir)|" $< > $@
> 
>diff --git a/data/gabble.service.in b/data/gabble.service.in
>index d688163..e3c0bf8 100644
>--- a/data/gabble.service.in
>+++ b/data/gabble.service.in
>@@ -1,3 +1,3 @@
> [D-BUS Service]
>-Name=im.telepathy1.ConnectionManager.gabble
>+Name=im.telepathy.v1.ConnectionManager.gabble
> Exec=@libexecdir@/telepathy-gabble
>diff --git a/extensions/Connection_Interface_Gabble_Decloak.xml b/extensions/Connection_Interface_Gabble_Decloak.xml
>index f2af802..98e441a 100644
>--- a/extensions/Connection_Interface_Gabble_Decloak.xml
>+++ b/extensions/Connection_Interface_Gabble_Decloak.xml
>@@ -18,10 +18,10 @@
> USA.
> </tp:license>
> 
>- <interface name="im.telepathy1.Connection.Interface.Gabble.Decloak"
>+ <interface name="im.telepathy.v1.Connection.Interface.Gabble.Decloak"
> tp:causes-havoc="experimental">
> <tp:added version="Gabble 0.9.4">(Gabble-specific)</tp:added>
>- <tp:requires interface="im.telepathy1.Connection"/>
>+ <tp:requires interface="im.telepathy.v1.Connection"/>
> 
> <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
> A simple D-Bus API for <a
>diff --git a/extensions/Gabble_Plugin_Console.xml b/extensions/Gabble_Plugin_Console.xml
>index 7b38635..fe9efde 100644
>--- a/extensions/Gabble_Plugin_Console.xml
>+++ b/extensions/Gabble_Plugin_Console.xml
>@@ -19,7 +19,7 @@
> USA.
> </tp:license>
> 
>- <interface name="im.telepathy1.Gabble.Plugin.Console">
>+ <interface name="im.telepathy.v1.Gabble.Plugin.Console">
> <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal"
> value="true"/>
> <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
>diff --git a/extensions/Gabble_Plugin_Gateways.xml b/extensions/Gabble_Plugin_Gateways.xml
>index d95809d..3b630fb 100644
>--- a/extensions/Gabble_Plugin_Gateways.xml
>+++ b/extensions/Gabble_Plugin_Gateways.xml
>@@ -19,7 +19,7 @@
> USA.
> </tp:license>
> 
>- <interface name="im.telepathy1.Gabble.Plugin.Gateways">
>+ <interface name="im.telepathy.v1.Gabble.Plugin.Gateways">
> <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
> A sidecar interface to register with XEP-0100 gateways.
> </tp:docstring>
>@@ -63,10 +63,10 @@
> </arg>
> 
> <tp:possible-errors>
>- <tp:error name="im.telepathy1.Error.NetworkError"/>
>- <tp:error name="im.telepathy1.Error.NotAvailable"/>
>- <tp:error name="im.telepathy1.Error.NotImplemented"/>
>- <tp:error name="im.telepathy1.Error.PermissionDenied"/>
>+ <tp:error name="im.telepathy.v1.Error.NetworkError"/>
>+ <tp:error name="im.telepathy.v1.Error.NotAvailable"/>
>+ <tp:error name="im.telepathy.v1.Error.NotImplemented"/>
>+ <tp:error name="im.telepathy.v1.Error.PermissionDenied"/>
> </tp:possible-errors>
> </method>
> 
>diff --git a/extensions/Gabble_Plugin_Test.xml b/extensions/Gabble_Plugin_Test.xml
>index e84ef1b..7a37e1a 100644
>--- a/extensions/Gabble_Plugin_Test.xml
>+++ b/extensions/Gabble_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.
> </tp:license>
>- <interface name="im.telepathy1.Gabble.Plugin.Test">
>+ <interface name="im.telepathy.v1.Gabble.Plugin.Test">
> <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
> A sidecar interface implemented by a plugin used by the test
> suite.
>diff --git a/plugins/telepathy-gabble-xmpp-console b/plugins/telepathy-gabble-xmpp-console
>index 3815a72..ea58315 100755
>--- a/plugins/telepathy-gabble-xmpp-console
>+++ b/plugins/telepathy-gabble-xmpp-console
>@@ -31,7 +31,7 @@ from gi.repository import TelepathyGLib as Tp
> 
> PADDING = 6
> 
>-CONSOLE_IFACE = "im.telepathy1.Gabble.Plugin.Console"
>+CONSOLE_IFACE = "im.telepathy.v1.Gabble.Plugin.Console"
> 
> class StanzaViewer(Gtk.ScrolledWindow):
> def __init__(self):
>diff --git a/plugins/test.c b/plugins/test.c
>index 6b6e3dc..cfcc223 100644
>--- a/plugins/test.c
>+++ b/plugins/test.c
>@@ -25,7 +25,7 @@ static void plugin_iface_init (
> gpointer g_iface,
> gpointer data);
> 
>-#define IFACE_TEST "im.telepathy1.Gabble.Plugin.Test"
>+#define IFACE_TEST "im.telepathy.v1.Gabble.Plugin.Test"
> #define IFACE_TEST_PROPS IFACE_TEST ".Props"
> #define IFACE_TEST_BUGGY IFACE_TEST ".Buggy"
> #define IFACE_TEST_IQ IFACE_TEST ".IQ"
>diff --git a/tests/twisted/Makefile.am b/tests/twisted/Makefile.am
>index 5b7403c..b5188f0 100644
>--- a/tests/twisted/Makefile.am
>+++ b/tests/twisted/Makefile.am
>@@ -420,19 +420,19 @@ tools/%.conf: tools/%.conf.in Makefile
> # 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)
>-tools/servicedir/im.telepathy1.ConnectionManager.%.service: tools/servicedir/%.service.in Makefile
>+tools/servicedir/im.telepathy.v1.ConnectionManager.%.service: tools/servicedir/%.service.in Makefile
> 	$(MKDIR_P) tools/servicedir
> 	$(AM_V_GEN)sed -e "s|[@]gabbletestsdir[@]|@gabbletestsdir@|g" $< > $@
> 
>-tools/servicedir-uninstalled/im.telepathy1.ConnectionManager.%.service: tools/servicedir-uninstalled/%.service.in
>+tools/servicedir-uninstalled/im.telepathy.v1.ConnectionManager.%.service: tools/servicedir-uninstalled/%.service.in
> 	$(MKDIR_P) tools/servicedir-uninstalled
> 	$(AM_V_GEN)sed -e "s|[@]abs_top_builddir[@]|@abs_top_builddir@|g" $< > $@
> 
> # D-Bus service file for testing
> installed_service_in_files = tools/servicedir/gabble.service.in
>-service_files = tools/servicedir/im.telepathy1.ConnectionManager.gabble.service
>+service_files = tools/servicedir/im.telepathy.v1.ConnectionManager.gabble.service
> uninstalled_service_in_files = tools/servicedir-uninstalled/gabble.service.in
>-uninstalled_service_files = tools/servicedir-uninstalled/im.telepathy1.ConnectionManager.gabble.service
>+uninstalled_service_files = tools/servicedir-uninstalled/im.telepathy.v1.ConnectionManager.gabble.service
> 
> # D-Bus config file for testing
> installed_conf_in_files = tools/servicedir/tmp-session-bus.conf.in
>diff --git a/tests/twisted/constants.py b/tests/twisted/constants.py
>index 3d87272..8b428fa 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/servicedir-uninstalled/gabble.service.in b/tests/twisted/tools/servicedir-uninstalled/gabble.service.in
>index 4486c55..f603442 100644
>--- a/tests/twisted/tools/servicedir-uninstalled/gabble.service.in
>+++ b/tests/twisted/tools/servicedir-uninstalled/gabble.service.in
>@@ -1,3 +1,3 @@
> [D-BUS Service]
>-Name=im.telepathy1.ConnectionManager.gabble
>+Name=im.telepathy.v1.ConnectionManager.gabble
> Exec=@abs_top_builddir@/tests/twisted/tools/exec-with-log.sh
>diff --git a/tests/twisted/tools/servicedir/gabble.service.in b/tests/twisted/tools/servicedir/gabble.service.in
>index c228ceb..5acadfb 100644
>--- a/tests/twisted/tools/servicedir/gabble.service.in
>+++ b/tests/twisted/tools/servicedir/gabble.service.in
>@@ -1,3 +1,3 @@
> [D-BUS Service]
>-Name=im.telepathy1.ConnectionManager.gabble
>+Name=im.telepathy.v1.ConnectionManager.gabble
> Exec=@gabbletestsdir@/twisted/tools/run-gabble.sh
>-- 
>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.