telepathy-salut: NUM_TP_ got replaced by TP_NUM_

[Xavier Claessens]

Module: telepathy-salut
Branch: master
Commit: d0fcea1ff0ed78c897bc54f4a62373b407554641
URL:    http://cgit.freedesktop.org/telepathy/telepathy-salut/commit/?id=d0fcea1ff0ed78c897bc54f4a62373b407554641

Author: Xavier Claessens <xavier.claessens at collabora.co.uk>
Date:   Mon Sep 23 13:41:43 2013 -0400

NUM_TP_ got replaced by TP_NUM_

---

 src/connection.c  |    4 ++--
 src/ft-manager.c  |    2 +-
 src/tube-stream.c |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/connection.c b/src/connection.c
index 00a6d56..a0e19e4 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -253,7 +253,7 @@ static void _salut_connection_disconnect (SalutConnection *self);
 
 static void
 salut_connection_create_handle_repos (TpBaseConnection *self,
-    TpHandleRepoIface *repos[NUM_TP_HANDLE_TYPES]);
+    TpHandleRepoIface *repos[TP_NUM_HANDLE_TYPES]);
 
 static GPtrArray *
 salut_connection_create_channel_factories (TpBaseConnection *self);
@@ -3364,7 +3364,7 @@ handle_normalize_require_nonempty (TpHandleRepoIface *repo G_GNUC_UNUSED,
 /* Connection baseclass function implementations */
 static void
 salut_connection_create_handle_repos (TpBaseConnection *self,
-    TpHandleRepoIface *repos[NUM_TP_HANDLE_TYPES])
+    TpHandleRepoIface *repos[TP_NUM_HANDLE_TYPES])
 {
   repos[TP_HANDLE_TYPE_CONTACT] = tp_dynamic_handle_repo_new
       (TP_HANDLE_TYPE_CONTACT, handle_normalize_require_nonempty, NULL);
diff --git a/src/ft-manager.c b/src/ft-manager.c
index 5156eab..f0edfbe 100644
--- a/src/ft-manager.c
+++ b/src/ft-manager.c
@@ -363,7 +363,7 @@ salut_ft_manager_handle_request (TpChannelManager *manager,
     }
   else
     {
-      if (content_hash_type >= NUM_TP_FILE_HASH_TYPES)
+      if (content_hash_type >= TP_NUM_FILE_HASH_TYPES)
         {
           g_set_error (&error, TP_ERROR, TP_ERROR_INVALID_ARGUMENT,
               "%u is not a valid ContentHashType", content_hash_type);
diff --git a/src/tube-stream.c b/src/tube-stream.c
index 9925557..fea5be7 100644
--- a/src/tube-stream.c
+++ b/src/tube-stream.c
@@ -1350,7 +1350,7 @@ salut_tube_stream_class_init (SalutTubeStreamClass *salut_tube_stream_class)
       "address type",
       "a TpSocketAddressType representing the type of the listening"
       "address of the local service",
-      0, NUM_TP_SOCKET_ADDRESS_TYPES - 1,
+      0, TP_NUM_SOCKET_ADDRESS_TYPES - 1,
       TP_SOCKET_ADDRESS_TYPE_UNIX,
       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_ADDRESS_TYPE,
@@ -1369,7 +1369,7 @@ salut_tube_stream_class_init (SalutTubeStreamClass *salut_tube_stream_class)
       "access control",
       "a TpSocketAccessControl representing the access control "
       "the local service applies to the local socket",
-      0, NUM_TP_SOCKET_ACCESS_CONTROLS - 1,
+      0, TP_NUM_SOCKET_ACCESS_CONTROLS - 1,
       TP_SOCKET_ACCESS_CONTROL_LOCALHOST,
       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_ACCESS_CONTROL,