[Telepathy-commits] [telepathy-glib/master] TpBaseConnectionManager: simplify private data accesses

[Simon McVittie]

---
 telepathy-glib/base-connection-manager.c |   19 ++++++-------------
 telepathy-glib/base-connection-manager.h |    8 +++++---
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/telepathy-glib/base-connection-manager.c b/telepathy-glib/base-connection-manager.c
index a6dfc93..eac29ab 100644
--- a/telepathy-glib/base-connection-manager.c
+++ b/telepathy-glib/base-connection-manager.c
@@ -195,16 +195,13 @@ G_DEFINE_ABSTRACT_TYPE_WITH_CODE(TpBaseConnectionManager,
     G_IMPLEMENT_INTERFACE(TP_TYPE_SVC_CONNECTION_MANAGER,
         service_iface_init))
 
-#define TP_BASE_CONNECTION_MANAGER_GET_PRIVATE(obj) \
-    ((TpBaseConnectionManagerPrivate *) obj->priv)
-
-typedef struct _TpBaseConnectionManagerPrivate
+struct _TpBaseConnectionManagerPrivate
 {
   /* if TRUE, the object has gone away */
   gboolean dispose_has_run;
   /* used as a set: key is TpBaseConnection *, value is TRUE */
   GHashTable *connections;
-} TpBaseConnectionManagerPrivate;
+};
 
 /* signal enum */
 enum
@@ -219,8 +216,7 @@ static void
 tp_base_connection_manager_dispose (GObject *object)
 {
   TpBaseConnectionManager *self = TP_BASE_CONNECTION_MANAGER (object);
-  TpBaseConnectionManagerPrivate *priv =
-    TP_BASE_CONNECTION_MANAGER_GET_PRIVATE (self);
+  TpBaseConnectionManagerPrivate *priv = self->priv;
 
   if (priv->dispose_has_run)
     return;
@@ -232,8 +228,7 @@ static void
 tp_base_connection_manager_finalize (GObject *object)
 {
   TpBaseConnectionManager *self = TP_BASE_CONNECTION_MANAGER (object);
-  TpBaseConnectionManagerPrivate *priv =
-    TP_BASE_CONNECTION_MANAGER_GET_PRIVATE (self);
+  TpBaseConnectionManagerPrivate *priv = self->priv;
 
   g_hash_table_destroy (priv->connections);
 
@@ -312,8 +307,7 @@ connection_shutdown_finished_cb (TpBaseConnection *conn,
                                  gpointer data)
 {
   TpBaseConnectionManager *self = TP_BASE_CONNECTION_MANAGER (data);
-  TpBaseConnectionManagerPrivate *priv =
-    TP_BASE_CONNECTION_MANAGER_GET_PRIVATE (self);
+  TpBaseConnectionManagerPrivate *priv = self->priv;
 
   g_assert (g_hash_table_lookup (priv->connections, conn));
   g_hash_table_remove (priv->connections, conn);
@@ -766,8 +760,7 @@ tp_base_connection_manager_request_connection (TpSvcConnectionManager *iface,
   TpBaseConnectionManager *self = TP_BASE_CONNECTION_MANAGER (iface);
   TpBaseConnectionManagerClass *cls =
     TP_BASE_CONNECTION_MANAGER_GET_CLASS (self);
-  TpBaseConnectionManagerPrivate *priv =
-    TP_BASE_CONNECTION_MANAGER_GET_PRIVATE (self);
+  TpBaseConnectionManagerPrivate *priv = self->priv;
   TpBaseConnection *conn;
   gchar *bus_name;
   gchar *object_path;
diff --git a/telepathy-glib/base-connection-manager.h b/telepathy-glib/base-connection-manager.h
index d941d7d..0959d33 100644
--- a/telepathy-glib/base-connection-manager.h
+++ b/telepathy-glib/base-connection-manager.h
@@ -89,8 +89,10 @@ typedef struct {
 } TpCMProtocolSpec;
 
 typedef struct _TpBaseConnectionManager TpBaseConnectionManager;
-
+typedef struct _TpBaseConnectionManagerPrivate TpBaseConnectionManagerPrivate;
 typedef struct _TpBaseConnectionManagerClass TpBaseConnectionManagerClass;
+typedef struct _TpBaseConnectionManagerClassPrivate
+    TpBaseConnectionManagerClassPrivate;
 
 typedef TpBaseConnection *(*TpBaseConnectionManagerNewConnFunc)(
     TpBaseConnectionManager *self, const gchar *proto,
@@ -109,14 +111,14 @@ struct _TpBaseConnectionManagerClass {
     gpointer _future3;
     gpointer _future4;
 
-    gpointer priv;
+    TpBaseConnectionManagerClassPrivate *priv;
 };
 
 struct _TpBaseConnectionManager {
     /*<private>*/
     GObject parent;
 
-    gpointer priv;
+    TpBaseConnectionManagerPrivate *priv;
 };
 
 GType tp_base_connection_manager_get_type (void);
-- 
1.5.6.5