telepathy-rakia: s/NUM_TP_*/TP_NUM_*

Guillaume Desmottes gdesmott at kemper.freedesktop.org
Thu Oct 3 07:50:53 PDT 2013


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

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Mon Sep 30 15:22:28 2013 +0200

s/NUM_TP_*/TP_NUM_*

---

 rakia/codec-param-formats.c |    4 ++--
 rakia/sip-session.c         |    2 +-
 src/sip-connection.c        |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/rakia/codec-param-formats.c b/rakia/codec-param-formats.c
index ea43807..af95948 100644
--- a/rakia/codec-param-formats.c
+++ b/rakia/codec-param-formats.c
@@ -81,7 +81,7 @@ typedef struct _RakiaCodecParamFormatting {
 static GRegex *fmtp_attr_regex = NULL;
 static GRegex *dtmf_events_regex = NULL;
 
-static GHashTable *codec_param_formats[NUM_TP_MEDIA_STREAM_TYPES];
+static GHashTable *codec_param_formats[TP_NUM_MEDIA_STREAM_TYPES];
 
 static void rakia_codec_param_formats_init (void);
 
@@ -393,7 +393,7 @@ rakia_codec_param_formats_init (void)
   else
     return;
 
-  for (i = 0; i < NUM_TP_MEDIA_STREAM_TYPES; ++i)
+  for (i = 0; i < TP_NUM_MEDIA_STREAM_TYPES; ++i)
     {
       /* XXX: we ignore deallocation of values for now */
       codec_param_formats[i] = g_hash_table_new (g_str_hash, g_str_equal);
diff --git a/rakia/sip-session.c b/rakia/sip-session.c
index 7a9f57b..aed3ecb 100644
--- a/rakia/sip-session.c
+++ b/rakia/sip-session.c
@@ -272,7 +272,7 @@ rakia_sip_session_class_init (RakiaSipSessionClass *klass)
 
   param_spec = g_param_spec_uint ("hold-state", "Local Hold State",
       "Is the call held or not",
-      0, NUM_TP_LOCAL_HOLD_STATES - 1,
+      0, TP_NUM_LOCAL_HOLD_STATES - 1,
       TP_LOCAL_HOLD_STATE_UNHELD,
       G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_HOLD_STATE, param_spec);
diff --git a/src/sip-connection.c b/src/sip-connection.c
index 2a13994..338d81d 100644
--- a/src/sip-connection.c
+++ b/src/sip-connection.c
@@ -118,7 +118,7 @@ priv_url_from_string_value (su_home_t *home, const GValue *value)
 
 static void
 rakia_create_handle_repos (TpBaseConnection *conn,
-                           TpHandleRepoIface *repos[NUM_TP_HANDLE_TYPES])
+                           TpHandleRepoIface *repos[TP_NUM_HANDLE_TYPES])
 {
   repos[TP_HANDLE_TYPE_CONTACT] =
       (TpHandleRepoIface *)g_object_new (TP_TYPE_DYNAMIC_HANDLE_REPO,



More information about the telepathy-commits mailing list