contact, observer: use un-obfuscated priv accessors

2 files changed, 17 insertions, 19 deletions

diff --git a/telepathy-logger/contact.c b/telepathy-logger/contact.c
index 6980456d7..738c4bb75 100644
--- a/telepathy-logger/contact.c
+++ b/telepathy-logger/contact.c
@@ -29,7 +29,6 @@
 
 G_DEFINE_TYPE (TplContact, tpl_contact, G_TYPE_OBJECT)
 
-#define GET_PRIV(obj) TPL_GET_PRIV (obj, TplContact)
 struct _TplContactPriv
 {
   TpContact *contact;
@@ -52,7 +51,7 @@ static void
 tpl_contact_finalize (GObject *obj)
 {
   TplContact *self = TPL_CONTACT (obj);
-  TplContactPriv *priv = GET_PRIV (self);
+  TplContactPriv *priv = self->priv;
 
   g_free (priv->alias);
   priv->alias = NULL;
@@ -67,7 +66,7 @@ static void
 tpl_contact_dispose (GObject *obj)
 {
   TplContact *self = TPL_CONTACT (obj);
-  TplContactPriv *priv = GET_PRIV (self);
+  TplContactPriv *priv = self->priv;
 
   if (priv->contact != NULL)
     {
@@ -85,7 +84,7 @@ tpl_contact_get_property (GObject *object,
     GValue *value,
     GParamSpec *pspec)
 {
-  TplContactPriv *priv = GET_PRIV (object);
+  TplContactPriv *priv = TPL_CONTACT (object)->priv;
 
   switch (param_id)
     {
@@ -225,7 +224,7 @@ tpl_contact_new (const gchar *identifier)
 TpContact *
 tpl_contact_get_contact (TplContact *self)
 {
-  TplContactPriv *priv = GET_PRIV (self);
+  TplContactPriv *priv = self->priv;
 
   g_return_val_if_fail (TPL_IS_CONTACT (self), NULL);
 
@@ -236,7 +235,7 @@ tpl_contact_get_contact (TplContact *self)
 const gchar *
 tpl_contact_get_alias (TplContact *self)
 {
-  TplContactPriv *priv = GET_PRIV (self);
+  TplContactPriv *priv = self->priv;
 
   g_return_val_if_fail (TPL_IS_CONTACT (self), NULL);
 
@@ -247,7 +246,7 @@ tpl_contact_get_alias (TplContact *self)
 const gchar *
 tpl_contact_get_identifier (TplContact *self)
 {
-  TplContactPriv *priv = GET_PRIV (self);
+  TplContactPriv *priv = self->priv;
 
   g_return_val_if_fail (TPL_IS_CONTACT (self), NULL);
 
@@ -258,7 +257,7 @@ tpl_contact_get_identifier (TplContact *self)
 TplContactType
 tpl_contact_get_contact_type (TplContact *self)
 {
-  TplContactPriv *priv = GET_PRIV (self);
+  TplContactPriv *priv = self->priv;
 
   g_return_val_if_fail (TPL_IS_CONTACT (self), TPL_CONTACT_UNKNOWN);
 
@@ -269,7 +268,7 @@ tpl_contact_get_contact_type (TplContact *self)
 const gchar *
 tpl_contact_get_avatar_token (TplContact *self)
 {
-  TplContactPriv *priv = GET_PRIV (self);
+  TplContactPriv *priv = self->priv;
 
   g_return_val_if_fail (TPL_IS_CONTACT (self), NULL);
 
@@ -281,7 +280,7 @@ void
 tpl_contact_set_contact (TplContact *self,
     TpContact *data)
 {
-  TplContactPriv *priv = GET_PRIV (self);
+  TplContactPriv *priv = self->priv;
 
   g_return_if_fail (TPL_IS_CONTACT (self));
   g_return_if_fail (TP_IS_CONTACT (data));
@@ -295,7 +294,7 @@ void
 tpl_contact_set_alias (TplContact *self,
     const gchar *data)
 {
-  TplContactPriv *priv = GET_PRIV (self);
+  TplContactPriv *priv = self->priv;
 
   g_return_if_fail (TPL_IS_CONTACT (self));
   g_return_if_fail (!TPL_STR_EMPTY (data));
@@ -309,7 +308,7 @@ void
 tpl_contact_set_identifier (TplContact *self,
     const gchar *data)
 {
-  TplContactPriv *priv = GET_PRIV (self);
+  TplContactPriv *priv = self->priv;
 
   g_return_if_fail (TPL_IS_CONTACT (self));
   g_return_if_fail (!TPL_STR_EMPTY (data));
@@ -323,7 +322,7 @@ void
 tpl_contact_set_contact_type (TplContact *self,
     TplContactType data)
 {
-  TplContactPriv *priv = GET_PRIV (self);
+  TplContactPriv *priv = self->priv;
 
   g_return_if_fail (TPL_IS_CONTACT (self));
 
@@ -335,7 +334,7 @@ void
 tpl_contact_set_avatar_token (TplContact *self,
     const gchar *data)
 {
-  TplContactPriv *priv = GET_PRIV (self);
+  TplContactPriv *priv = self->priv;
 
   g_return_if_fail (TPL_IS_CONTACT (self));
   g_return_if_fail (priv->avatar_token == NULL);
diff --git a/telepathy-logger/observer.c b/telepathy-logger/observer.c
index d0eb65d2b..68f2d1ec2 100644
--- a/telepathy-logger/observer.c
+++ b/telepathy-logger/observer.c
@@ -91,7 +91,6 @@ static GHashTable *tpl_observer_get_channel_map (TplObserver *self);
 static void tpl_observer_get_open_channels (void);
 
 
-#define GET_PRIV(obj) TPL_GET_PRIV (obj, TplObserver)
 struct _TplObserverPriv
 {
     /* mapping channel_path->TplChannel instances */
@@ -556,7 +555,7 @@ observer_iface_init (gpointer g_iface,
 static void
 tpl_observer_dispose (GObject *obj)
 {
-  TplObserverPriv *priv = GET_PRIV (obj);
+  TplObserverPriv *priv = TPL_OBSERVER (obj)->priv;
 
   if (priv->channel_map != NULL)
     {
@@ -585,7 +584,7 @@ tpl_observer_get_channel_map (TplObserver *self)
 {
   g_return_val_if_fail (TPL_IS_OBSERVER (self), NULL);
 
-  return GET_PRIV (self)->channel_map;
+  return self->priv->channel_map;
 }
 
 
@@ -663,7 +662,7 @@ tpl_observer_get_channel_factory (TplObserver *self)
 {
   g_return_val_if_fail (TPL_IS_OBSERVER (self), NULL);
 
-  return GET_PRIV (self)->channel_factory;
+  return self->priv->channel_factory;
 }
 
 
@@ -671,7 +670,7 @@ void
 tpl_observer_set_channel_factory (TplObserver *self,
     TplChannelFactory factory)
 {
-  TplObserverPriv *priv = GET_PRIV (self);
+  TplObserverPriv *priv = self->priv;
 
   g_return_if_fail (factory != NULL);
   g_return_if_fail (priv->channel_factory == NULL);