diff options
| author | Xavier Claessens <xavier.claessens@collabora.co.uk> | 2013-10-02 16:08:39 -0400 |
|---|---|---|
| committer | Xavier Claessens <xavier.claessens@collabora.co.uk> | 2013-10-03 10:11:43 -0400 |
| commit | c9ed3ccb624594660908c3d39ea8d182079dd000 (patch) | |
| tree | 1d18e9473a9ae34db245911b2d30d23614ee7010 /libempathy | |
| parent | e3cbf70a3ca4aba15a65ae170c0a0d54573b7649 (diff) | |
Rename NUM_TP_ to TP_NUM_
Diffstat (limited to 'libempathy')
| -rw-r--r-- | libempathy/empathy-contact.c | 2 | ||||
| -rw-r--r-- | libempathy/empathy-presence-manager.c | 6 | ||||
| -rw-r--r-- | libempathy/empathy-status-presets.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c index 2f381a5be..d2284806f 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 6eab7f15b..a6aca1adf 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 9895d4d42..aacee83d8 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; } |