[telepathy-mission-control/master] Rename non-standard interfaces into the com.nokia namespace

[Simon McVittie]

The Creation interface remains .DRAFT, but since MC beta 70 and
telepathy-spec 0.17.24 the same functionality has been present on the
main CreateAccount method. Any existing users should migrate to the core
API, at which point the draft API can be deleted altogether.

ChannelRequests won't go into telepathy-spec, we already have API for
this on the ChannelDispatcher object.

Compat is for compatibility with MC 4, which was never specified by
telepathy-spec, so it would be inappropriate for it to go in
telepathy-spec.
---
 examples/mc-example-2.c                   |    4 ++--
 examples/mc-example.c                     |    4 ++--
 test/twisted/constants.py                 |    4 ++--
 xml/Account_Interface_ChannelRequests.xml |    2 +-
 xml/Account_Interface_Compat.xml          |    2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/examples/mc-example-2.c b/examples/mc-example-2.c
index b9872dc..a691451 100644
--- a/examples/mc-example-2.c
+++ b/examples/mc-example-2.c
@@ -229,12 +229,12 @@ find_accounts (McAccountManager *am)
     g_value_init (&v_true, G_TYPE_BOOLEAN);
     g_value_set_boolean (&v_true, TRUE);
     g_hash_table_insert (params,
-			 "org.freedesktop.Telepathy.Account.Enabled",
+			 MC_IFACE_ACCOUNT ".Enabled",
 			 &v_true);
     g_value_init (&v_profile, G_TYPE_STRING);
     g_value_set_static_string (&v_profile, "sip");
     g_hash_table_insert (params,
-			 "org.freedesktop.Telepathy.Account.Interface.Compat.Profile",
+			 MC_IFACE_ACCOUNT_INTERFACE_COMPAT ".Profile",
 			 &v_profile);
     mc_cli_account_manager_interface_query_call_find_accounts (am, -1, 
 							       params,
diff --git a/examples/mc-example.c b/examples/mc-example.c
index 5605474..e016564 100644
--- a/examples/mc-example.c
+++ b/examples/mc-example.c
@@ -437,12 +437,12 @@ main (int argc,
     g_value_init (&v_true, G_TYPE_BOOLEAN);
     g_value_set_boolean (&v_true, TRUE);
     g_hash_table_insert (params,
-			 "org.freedesktop.Telepathy.Account.Enabled",
+			 MC_IFACE_ACCOUNT ".Enabled",
 			 &v_true);
     g_value_init (&v_profile, G_TYPE_STRING);
     g_value_set_static_string (&v_profile, "sip");
     g_hash_table_insert (params,
-			 "org.freedesktop.Telepathy.Account.Interface.Compat.Profile",
+			 MC_IFACE_ACCOUNT_INTERFACE_COMPAT ".Profile",
 			 &v_profile);
     mc_cli_account_manager_interface_query_call_find_accounts (am, -1, 
 							       params,
diff --git a/test/twisted/constants.py b/test/twisted/constants.py
index 5794f0a..44c5c4c 100644
--- a/test/twisted/constants.py
+++ b/test/twisted/constants.py
@@ -128,8 +128,8 @@ CLIENT_IFACE_REQUESTS = CLIENT + '.Interface.Requests'
 
 ACCOUNT = tp_name_prefix + '.Account'
 ACCOUNT_IFACE_AVATAR = ACCOUNT + '.Interface.Avatar'
-ACCOUNT_IFACE_NOKIA_COMPAT = ACCOUNT + '.Interface.Compat'
-ACCOUNT_IFACE_NOKIA_REQUESTS = ACCOUNT + '.Interface.ChannelRequests'
+ACCOUNT_IFACE_NOKIA_COMPAT = 'com.nokia.Account.Interface.Compat'
+ACCOUNT_IFACE_NOKIA_REQUESTS = 'com.nokia.Account.Interface.ChannelRequests'
 ACCOUNT_IFACE_NOKIA_CONDITIONS = 'com.nokia.Account.Interface.Conditions'
 
 AM = tp_name_prefix + '.AccountManager'
diff --git a/xml/Account_Interface_ChannelRequests.xml b/xml/Account_Interface_ChannelRequests.xml
index e0f2723..039a2ea 100644
--- a/xml/Account_Interface_ChannelRequests.xml
+++ b/xml/Account_Interface_ChannelRequests.xml
@@ -16,7 +16,7 @@ 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="org.freedesktop.Telepathy.Account.Interface.ChannelRequests">
+  <interface name="com.nokia.Account.Interface.ChannelRequests">
     <tp:requires interface="org.freedesktop.Telepathy.Account"/>
     <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
       <p>The ChannelRequests interface provides methods to create and cancel channel requests, and signals to monitor them.</p>
diff --git a/xml/Account_Interface_Compat.xml b/xml/Account_Interface_Compat.xml
index 1c5a51b..8f4afdb 100644
--- a/xml/Account_Interface_Compat.xml
+++ b/xml/Account_Interface_Compat.xml
@@ -16,7 +16,7 @@ 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="org.freedesktop.Telepathy.Account.Interface.Compat">
+  <interface name="com.nokia.Account.Interface.Compat">
     <tp:requires interface="org.freedesktop.Telepathy.Account"/>
     <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
       <p>The Compat interface holds properties necessary for maintaining the
-- 
1.5.6.5