summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2013-09-19 15:45:40 +0200
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2013-09-23 13:01:39 +0200
commit63441d993eef9eece120d9e8f0b2854cb3087d44 (patch)
tree8db7ae0d1ab3bdd9418274879e028876dbf2b004
parentfd4e323482b1ff8c91528df6c6fb267ba511e6bc (diff)
s/NUM_TP_*/TP_NUM_*
-rw-r--r--src/idle-connection.c2
-rw-r--r--src/idle-text.c2
-rw-r--r--src/tls-certificate.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/idle-connection.c b/src/idle-connection.c
index 9b495a8..9ba1d23 100644
--- a/src/idle-connection.c
+++ b/src/idle-connection.c
@@ -566,7 +566,7 @@ static GPtrArray *_iface_create_channel_managers(TpBaseConnection *base) {
}
static void _iface_create_handle_repos(TpBaseConnection *self, TpHandleRepoIface **repos) {
- for (int i = 0; i < NUM_TP_HANDLE_TYPES; i++)
+ for (int i = 0; i < TP_NUM_HANDLE_TYPES; i++)
repos[i] = NULL;
idle_handle_repos_init(repos);
diff --git a/src/idle-text.c b/src/idle-text.c
index dbda8b0..cce38c8 100644
--- a/src/idle-text.c
+++ b/src/idle-text.c
@@ -179,7 +179,7 @@ void idle_text_send(GObject *obj, TpMessage *message, TpMessageSendingFlags flag
if (!result)
INVALID_ARGUMENT ("message-type must be a 32-bit unsigned integer");
- if (type >= NUM_TP_CHANNEL_TEXT_MESSAGE_TYPES)
+ if (type >= TP_NUM_CHANNEL_TEXT_MESSAGE_TYPES)
INVALID_ARGUMENT ("invalid message type: %u", type);
n_parts = tp_message_count_parts (message);
diff --git a/src/tls-certificate.c b/src/tls-certificate.c
index 467d13e..3d71be1 100644
--- a/src/tls-certificate.c
+++ b/src/tls-certificate.c
@@ -216,7 +216,7 @@ idle_tls_certificate_class_init (IdleTLSCertificateClass *klass)
pspec = g_param_spec_uint ("state",
"State of this certificate",
"The state of this TLS certificate.",
- 0, NUM_TP_TLS_CERTIFICATE_STATES - 1,
+ 0, TP_NUM_TLS_CERTIFICATE_STATES - 1,
TP_TLS_CERTIFICATE_STATE_PENDING,
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
g_object_class_install_property (oclass, PROP_STATE, pspec);