From: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date: Wed, 2 Oct 2013 20:08:39 +0000 (-0400)
Subject: Rename NUM_TP_ to TP_NUM_
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=480300ee4c05856a02a561240090fb39efb678bc

Rename NUM_TP_ to TP_NUM_
---

diff --git a/libempathy-gtk/empathy-tls-dialog.c b/libempathy-gtk/empathy-tls-dialog.c
index def31d22..df47c503 100644
--- a/libempathy-gtk/empathy-tls-dialog.c
+++ b/libempathy-gtk/empathy-tls-dialog.c
@@ -345,7 +345,7 @@ empathy_tls_dialog_class_init (EmpathyTLSDialogClass *klass)
 
   pspec = g_param_spec_uint ("reason", "The reason",
       "The reason why the certificate is being asked for confirmation.",
-      0, NUM_TP_TLS_CERTIFICATE_REJECT_REASONS - 1,
+      0, TP_NUM_TLS_CERTIFICATE_REJECT_REASONS - 1,
       TP_TLS_CERTIFICATE_REJECT_REASON_UNKNOWN,
       G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (oclass, PROP_REASON, pspec);
diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c
index 2f381a5b..d2284806 100644
--- a/libempathy/empathy-contact.c
+++ b/libempathy/empathy-contact.c
@@ -325,7 +325,7 @@ empathy_contact_class_init (EmpathyContactClass *class)
         "Contact presence",
         "Presence of contact",
         TP_CONNECTION_PRESENCE_TYPE_UNSET,
-        NUM_TP_CONNECTION_PRESENCE_TYPES,
+        TP_NUM_CONNECTION_PRESENCE_TYPES,
         TP_CONNECTION_PRESENCE_TYPE_UNSET,
         G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
diff --git a/libempathy/empathy-presence-manager.c b/libempathy/empathy-presence-manager.c
index 6eab7f15..a6aca1ad 100644
--- a/libempathy/empathy-presence-manager.c
+++ b/libempathy/empathy-presence-manager.c
@@ -80,7 +80,7 @@ G_DEFINE_TYPE (EmpathyPresenceManager, empathy_presence_manager, G_TYPE_OBJECT);
 
 static EmpathyPresenceManager * singleton = NULL;
 
-static const gchar *presence_type_to_status[NUM_TP_CONNECTION_PRESENCE_TYPES] =
+static const gchar *presence_type_to_status[TP_NUM_CONNECTION_PRESENCE_TYPES] =
 {
   NULL,
   "offline",
@@ -349,7 +349,7 @@ empathy_presence_manager_class_init (EmpathyPresenceManagerClass *klass)
   g_object_class_install_property (object_class,
       PROP_STATE,
       g_param_spec_uint ("state", "state", "state",
-        0, NUM_TP_CONNECTION_PRESENCE_TYPES,
+        0, TP_NUM_CONNECTION_PRESENCE_TYPES,
         TP_CONNECTION_PRESENCE_TYPE_UNSET,
         G_PARAM_READWRITE));
 
@@ -519,7 +519,7 @@ empathy_presence_manager_do_set_presence (EmpathyPresenceManager *self,
 {
   const gchar *status;
 
-  g_assert (status_type > 0 && status_type < NUM_TP_CONNECTION_PRESENCE_TYPES);
+  g_assert (status_type > 0 && status_type < TP_NUM_CONNECTION_PRESENCE_TYPES);
 
   status = presence_type_to_status[status_type];
 
diff --git a/libempathy/empathy-status-presets.c b/libempathy/empathy-status-presets.c
index 9895d4d4..aacee83d 100644
--- a/libempathy/empathy-status-presets.c
+++ b/libempathy/empathy-status-presets.c
@@ -187,10 +187,10 @@ status_presets_file_save (void)
 	GList      *l;
 	gchar      *dir;
 	gchar      *file;
-	gint        count[NUM_TP_CONNECTION_PRESENCE_TYPES];
+	gint        count[TP_NUM_CONNECTION_PRESENCE_TYPES];
 	gint        i;
 
-	for (i = 0; i < NUM_TP_CONNECTION_PRESENCE_TYPES; i++) {
+	for (i = 0; i < TP_NUM_CONNECTION_PRESENCE_TYPES; i++) {
 		count[i] = 0;
 	}
 
diff --git a/tests/empathy-tls-test.c b/tests/empathy-tls-test.c
index d3b1ae41..d48bfccf 100644
--- a/tests/empathy-tls-test.c
+++ b/tests/empathy-tls-test.c
@@ -128,7 +128,7 @@ mock_tls_certificate_class_init (MockTLSCertificateClass *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);