diff options
| author | Xavier Claessens <xavier.claessens@collabora.co.uk> | 2013-09-23 13:41:43 -0400 |
|---|---|---|
| committer | Xavier Claessens <xavier.claessens@collabora.co.uk> | 2013-09-24 14:45:10 -0400 |
| commit | d0fcea1ff0ed78c897bc54f4a62373b407554641 (patch) | |
| tree | e9ad5d78bea7e44409405e411310976d7f1b3118 | |
| parent | c63c10234fe0d60e2194204aadddde0ef1aedc58 (diff) | |
| download | telepathy-salut-d0fcea1ff0ed78c897bc54f4a62373b407554641.tar.gz | |
NUM_TP_ got replaced by TP_NUM_
| -rw-r--r-- | src/connection.c | 4 | ||||
| -rw-r--r-- | src/ft-manager.c | 2 | ||||
| -rw-r--r-- | src/tube-stream.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/connection.c b/src/connection.c index 00a6d56e..a0e19e4d 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 5156eabf..f0edfbee 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 99255576..fea5be7c 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, |