Attachment 88713 Details for Bug 71262 – [tp-glib next 4/4] Replace some remaining uses of org.freedesktop.Telepathy

[patch] [tp-glib next 4/4] Replace some remaining uses of org.freedesktop.Telepathy

0004-Replace-some-remaining-uses-of-org.freedesktop.Telep.patch (text/plain), 12.56 KB, created by Simon McVittie on 2013-11-05 16:16:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2013-11-05 16:16:11 UTC

Size: 12.56 KB

patch

obsolete

>From 4b585add639386acd02bd822c6c18fac177340e1 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Tue, 5 Nov 2013 16:00:10 +0000
>Subject: [PATCH 4/4] Replace some remaining uses of org.freedesktop.Telepathy
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=71262
>---
> examples/client/js/debug-client.js                    |  2 +-
> examples/cm/call/Makefile.am                          |  4 ++--
> examples/cm/channelspecific/Makefile.am               |  4 ++--
> examples/cm/channelspecific/example_csh.manager       |  8 ++++----
> examples/cm/contactlist/Makefile.am                   |  4 ++--
> examples/cm/echo-message-parts/Makefile.am            |  4 ++--
> examples/cm/echo-message-parts/example_echo_2.manager |  8 ++++----
> examples/cm/extended/Makefile.am                      |  4 ++--
> examples/cm/extended/example_extended.manager         |  2 +-
> examples/cm/no-protocols/Makefile.am                  |  4 ++--
> examples/extensions/Connection_Interface_Hats.xml     | 12 ++++++------
> telepathy-glib/account.c                              |  2 +-
> tests/lib/my-conn-proxy.h                             |  2 +-
> 13 files changed, 30 insertions(+), 30 deletions(-)
>
>diff --git a/examples/client/js/debug-client.js b/examples/client/js/debug-client.js
>index cfb1cad..405608b 100755
>--- a/examples/client/js/debug-client.js
>+++ b/examples/client/js/debug-client.js
>@@ -194,7 +194,7 @@ DebugClient = new Lang.Class({
> 
>     _isInteresting: function(wellKnownName) {
>         return (GLib.str_has_prefix(wellKnownName,
>-                    'org.freedesktop.Telepathy'));
>+                    'im.telepathy.v1'));
> 
>     },
> 
>diff --git a/examples/cm/call/Makefile.am b/examples/cm/call/Makefile.am
>index e12f5e6..8f90515 100644
>--- a/examples/cm/call/Makefile.am
>+++ b/examples/cm/call/Makefile.am
>@@ -36,11 +36,11 @@ telepathy_example_cm_call_LDADD = \
> servicedir = ${datadir}/dbus-1/services
> 
> if INSTALL_EXAMPLES
>-service_DATA = _gen/org.freedesktop.Telepathy.ConnectionManager.example_call.service
>+service_DATA = _gen/im.telepathy.v1.ConnectionManager.example_call.service
> $(service_DATA): %: Makefile
> 	$(MKDIR_P) _gen
> 	{ echo "[D-BUS Service]" && \
>-	echo "Name=org.freedesktop.Telepathy.ConnectionManager.example_call" && \
>+	echo "Name=im.telepathy.v1.ConnectionManager.example_call" && \
> 	echo "Exec=${libexecdir}/telepathy-example-cm-call"; } > $@
> 
> managerdir = ${datadir}/telepathy/managers
>diff --git a/examples/cm/channelspecific/Makefile.am b/examples/cm/channelspecific/Makefile.am
>index b3dfb68..be2d8bb 100644
>--- a/examples/cm/channelspecific/Makefile.am
>+++ b/examples/cm/channelspecific/Makefile.am
>@@ -33,11 +33,11 @@ telepathy_example_cm_csh_LDADD = \
> servicedir = ${datadir}/dbus-1/services
> 
> if INSTALL_EXAMPLES
>-service_DATA = _gen/org.freedesktop.Telepathy.ConnectionManager.example_csh.service
>+service_DATA = _gen/im.telepathy.v1.ConnectionManager.example_csh.service
> $(service_DATA): %: Makefile
> 	$(MKDIR_P) _gen
> 	{ echo "[D-BUS Service]" && \
>-	echo "Name=org.freedesktop.Telepathy.ConnectionManager.example_csh" && \
>+	echo "Name=im.telepathy.v1.ConnectionManager.example_csh" && \
> 	echo "Exec=${libexecdir}/telepathy-example-cm-csh"; } > $@
> 
> managerdir = ${datadir}/telepathy/managers
>diff --git a/examples/cm/channelspecific/example_csh.manager b/examples/cm/channelspecific/example_csh.manager
>index b67a3de..bc5a12e 100644
>--- a/examples/cm/channelspecific/example_csh.manager
>+++ b/examples/cm/channelspecific/example_csh.manager
>@@ -3,7 +3,7 @@ Interfaces=
> 
> [Protocol example]
> Interfaces=
>-ConnectionInterfaces=org.freedesktop.Telepathy.Connection.Interface.Requests;org.freedesktop.Telepathy.Connection.Interface.Contacts;
>+ConnectionInterfaces=im.telepathy.v1.Connection.Interface.Requests;im.telepathy.v1.Connection.Interface.Contacts;
> param-account=s required register
> param-simulation-delay=u
> default-simulation-delay=500
>@@ -13,6 +13,6 @@ EnglishName=Example with channel-specific handles
> Icon=face-smile
> 
> [room]
>-org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.Text
>-org.freedesktop.Telepathy.Channel.TargetHandleType u=2
>-allowed=org.freedesktop.Telepathy.Channel.TargetHandle;org.freedesktop.Telepathy.Channel.TargetID;
>+im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.Text
>+im.telepathy.v1.Channel.TargetHandleType u=2
>+allowed=im.telepathy.v1.Channel.TargetHandle;im.telepathy.v1.Channel.TargetID;
>diff --git a/examples/cm/contactlist/Makefile.am b/examples/cm/contactlist/Makefile.am
>index cda6477..e9d0764 100644
>--- a/examples/cm/contactlist/Makefile.am
>+++ b/examples/cm/contactlist/Makefile.am
>@@ -29,11 +29,11 @@ telepathy_example_cm_contactlist_LDADD = \
> 
> if INSTALL_EXAMPLES
> servicedir = ${datadir}/dbus-1/services
>-service_DATA = _gen/org.freedesktop.Telepathy.ConnectionManager.example_contact_list.service
>+service_DATA = _gen/im.telepathy.v1.ConnectionManager.example_contact_list.service
> $(service_DATA): %: Makefile
> 	$(MKDIR_P) _gen
> 	{ echo "[D-BUS Service]" && \
>-	echo "Name=org.freedesktop.Telepathy.ConnectionManager.example_contact_list" && \
>+	echo "Name=im.telepathy.v1.ConnectionManager.example_contact_list" && \
> 	echo "Exec=${libexecdir}/telepathy-example-cm-contactlist"; } > $@
> 
> managerdir = ${datadir}/telepathy/managers
>diff --git a/examples/cm/echo-message-parts/Makefile.am b/examples/cm/echo-message-parts/Makefile.am
>index 9d9ce6d..2b870f4 100644
>--- a/examples/cm/echo-message-parts/Makefile.am
>+++ b/examples/cm/echo-message-parts/Makefile.am
>@@ -29,11 +29,11 @@ telepathy_example_cm_echo_2_LDADD = \
> 
> if INSTALL_EXAMPLES
> servicedir = ${datadir}/dbus-1/services
>-service_DATA = _gen/org.freedesktop.Telepathy.ConnectionManager.example_echo_2.service
>+service_DATA = _gen/im.telepathy.v1.ConnectionManager.example_echo_2.service
> $(service_DATA): %: Makefile
> 	$(MKDIR_P) _gen
> 	{ echo "[D-BUS Service]" && \
>-	echo "Name=org.freedesktop.Telepathy.ConnectionManager.example_echo_2" && \
>+	echo "Name=im.telepathy.v1.ConnectionManager.example_echo_2" && \
> 	echo "Exec=${libexecdir}/telepathy-example-cm-echo-2"; } > $@
> 
> managerdir = ${datadir}/telepathy/managers
>diff --git a/examples/cm/echo-message-parts/example_echo_2.manager b/examples/cm/echo-message-parts/example_echo_2.manager
>index 18427df..eaf4346 100644
>--- a/examples/cm/echo-message-parts/example_echo_2.manager
>+++ b/examples/cm/echo-message-parts/example_echo_2.manager
>@@ -3,7 +3,7 @@ Interfaces=
> 
> [Protocol example]
> Interfaces=
>-ConnectionInterfaces=org.freedesktop.Telepathy.Connection.Interface.Requests;org.freedesktop.Telepathy.Connection.Interface.Contacts;
>+ConnectionInterfaces=im.telepathy.v1.Connection.Interface.Requests;im.telepathy.v1.Connection.Interface.Contacts;
> param-account=s required register
> RequestableChannelClasses=1-1-text;
> VCardField=x-telepathy-example
>@@ -11,6 +11,6 @@ EnglishName=Echo II example
> Icon=im-icq
> 
> [1-1-text]
>-org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.Text
>-org.freedesktop.Telepathy.Channel.TargetHandleType u=1
>-allowed=org.freedesktop.Telepathy.Channel.TargetHandle;org.freedesktop.Telepathy.Channel.TargetID;
>+im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.Text
>+im.telepathy.v1.Channel.TargetHandleType u=1
>+allowed=im.telepathy.v1.Channel.TargetHandle;im.telepathy.v1.Channel.TargetID;
>diff --git a/examples/cm/extended/Makefile.am b/examples/cm/extended/Makefile.am
>index c8c2380..629df7a 100644
>--- a/examples/cm/extended/Makefile.am
>+++ b/examples/cm/extended/Makefile.am
>@@ -17,11 +17,11 @@ telepathy_example_cm_extended_SOURCES = \
> 
> if INSTALL_EXAMPLES
> servicedir = ${datadir}/dbus-1/services
>-service_DATA = _gen/org.freedesktop.Telepathy.ConnectionManager.example_extended.service
>+service_DATA = _gen/im.telepathy.v1.ConnectionManager.example_extended.service
> $(service_DATA): %: Makefile
> 	$(MKDIR_P) _gen
> 	{ echo "[D-BUS Service]" && \
>-	echo "Name=org.freedesktop.Telepathy.ConnectionManager.example_extended" && \
>+	echo "Name=im.telepathy.v1.ConnectionManager.example_extended" && \
> 	echo "Exec=${libexecdir}/telepathy-example-cm-extended"; } > $@
> 
> managerdir = ${datadir}/telepathy/managers
>diff --git a/examples/cm/extended/example_extended.manager b/examples/cm/extended/example_extended.manager
>index e39705a..e33a3a8 100644
>--- a/examples/cm/extended/example_extended.manager
>+++ b/examples/cm/extended/example_extended.manager
>@@ -3,7 +3,7 @@ Interfaces=
> 
> [Protocol example]
> Interfaces=
>-ConnectionInterfaces=org.freedesktop.Telepathy.Connection.Interface.Requests;org.freedesktop.Telepathy.Connection.Interface.Contacts;com.example.Telepathy.Connection.Interface.Hats;
>+ConnectionInterfaces=im.telepathy.v1.Connection.Interface.Requests;im.telepathy.v1.Connection.Interface.Contacts;com.example.Telepathy.Connection.Interface.Hats;
> param-account=s required register
> RequestableChannelClasses=
> VCardField=x-telepathy-example
>diff --git a/examples/cm/no-protocols/Makefile.am b/examples/cm/no-protocols/Makefile.am
>index 143641e..a746a51 100644
>--- a/examples/cm/no-protocols/Makefile.am
>+++ b/examples/cm/no-protocols/Makefile.am
>@@ -13,11 +13,11 @@ telepathy_example_no_protocols_SOURCES = \
> 
> if INSTALL_EXAMPLES
> servicedir = ${datadir}/dbus-1/services
>-service_DATA = _gen/org.freedesktop.Telepathy.ConnectionManager.example_no_protocols.service
>+service_DATA = _gen/im.telepathy.v1.ConnectionManager.example_no_protocols.service
> $(service_DATA): %: Makefile
> 	$(MKDIR_P) _gen
> 	{ echo "[D-BUS Service]" && \
>-	echo "Name=org.freedesktop.Telepathy.ConnectionManager.example_no_protocols" && \
>+	echo "Name=im.telepathy.v1.ConnectionManager.example_no_protocols" && \
> 	echo "Exec=${libexecdir}/telepathy-example-cm-no-protocols"; } > $@
> 
> managerdir = ${datadir}/telepathy/managers
>diff --git a/examples/extensions/Connection_Interface_Hats.xml b/examples/extensions/Connection_Interface_Hats.xml
>index bc4f83d..3876a0f 100644
>--- a/examples/extensions/Connection_Interface_Hats.xml
>+++ b/examples/extensions/Connection_Interface_Hats.xml
>@@ -10,7 +10,7 @@
>   </tp:license>
>   <interface name="com.example.Telepathy.Connection.Interface.Hats"
>     tp:causes-havoc='a silly example'>
>-    <tp:requires interface="org.freedesktop.Telepathy.Connection"/>
>+    <tp:requires interface="im.telepathy.v1.Connection"/>
> 
>     <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
>       This interface is an example of how Telepathy can be extended.
>@@ -103,11 +103,11 @@
>         </tp:docstring>
>       </arg>
>       <tp:possible-errors>
>-        <tp:error name="org.freedesktop.Telepathy.Error.Disconnected"/>
>-        <tp:error name="org.freedesktop.Telepathy.Error.NetworkError"/>
>-        <tp:error name="org.freedesktop.Telepathy.Error.InvalidHandle"/>
>-        <tp:error name="org.freedesktop.Telepathy.Error.PermissionDenied"/>
>-        <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable"/>
>+        <tp:error name="im.telepathy.v1.Error.Disconnected"/>
>+        <tp:error name="im.telepathy.v1.Error.NetworkError"/>
>+        <tp:error name="im.telepathy.v1.Error.InvalidHandle"/>
>+        <tp:error name="im.telepathy.v1.Error.PermissionDenied"/>
>+        <tp:error name="im.telepathy.v1.Error.NotAvailable"/>
>       </tp:possible-errors>
>     </method>
> 
>diff --git a/telepathy-glib/account.c b/telepathy-glib/account.c
>index 0627637..8049c09 100644
>--- a/telepathy-glib/account.c
>+++ b/telepathy-glib/account.c
>@@ -2443,7 +2443,7 @@ tp_account_get_parameters (TpAccount *account)
>  * via tp_connection_manager_get_protocol() and
>  * tp_connection_manager_protocol_get_param(). Well-known parameters are
>  * listed
>- * <ulink url="http://telepathy.freedesktop.org/spec/org.freedesktop.Telepathy.ConnectionManager.html#org.freedesktop.Telepathy.ConnectionManager.RequestConnection">in
>+ * <ulink url="http://telepathy.freedesktop.org/spec/Connection_Manager.html#im.telepathy.v1.ConnectionManager.RequestConnection">in
>  * the Telepathy D-Bus Interface Specification</ulink>.
>  *
>  * Returns: (transfer full): the dictionary of
>diff --git a/tests/lib/my-conn-proxy.h b/tests/lib/my-conn-proxy.h
>index 08be18b..64a6ebe 100644
>--- a/tests/lib/my-conn-proxy.h
>+++ b/tests/lib/my-conn-proxy.h
>@@ -110,7 +110,7 @@ GQuark tp_tests_my_conn_proxy_get_feature_quark_retry_dep (void) G_GNUC_CONST;
>   (tp_tests_my_conn_proxy_get_feature_quark_before_connected ())
> GQuark tp_tests_my_conn_proxy_get_feature_quark_before_connected (void) G_GNUC_CONST;
> 
>-#define TP_TESTS_MY_CONN_PROXY_IFACE_LATER "org.freedesktop.Telepathy.Conncetion.Interface.Test.Later"
>+#define TP_TESTS_MY_CONN_PROXY_IFACE_LATER "im.telepathy.v1.Tests.Connection.Interface.Later"
> 
> /* Need the interface TP_TESTS_MY_CONN_PROXY_IFACE_LATER to be prepared but
>  * this interface is not in the initial set of interfaces of the connection.
>-- 
>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.