[Telepathy-commits] [telepathy-gabble/master] GabblePrivateTubesFactory: simplify priv access

[Simon McVittie]

20080722182217-53eee-af41409097946fe5c7a2bdd0f06efe8942aac83a.gz
---
 src/private-tubes-factory.c |    5 +----
 src/private-tubes-factory.h |    4 +++-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/private-tubes-factory.c b/src/private-tubes-factory.c
index 8ea1fb5..aa01a29 100644
--- a/src/private-tubes-factory.c
+++ b/src/private-tubes-factory.c
@@ -64,8 +64,6 @@ enum
   LAST_PROPERTY
 };
 
-typedef struct _GabblePrivateTubesFactoryPrivate \
-          GabblePrivateTubesFactoryPrivate;
 struct _GabblePrivateTubesFactoryPrivate
 {
   GabbleConnection *conn;
@@ -76,8 +74,7 @@ struct _GabblePrivateTubesFactoryPrivate
   gboolean dispose_has_run;
 };
 
-#define GABBLE_PRIVATE_TUBES_FACTORY_GET_PRIVATE(obj) \
-    ((GabblePrivateTubesFactoryPrivate *) obj->priv)
+#define GABBLE_PRIVATE_TUBES_FACTORY_GET_PRIVATE(obj) ((obj)->priv)
 
 static void
 gabble_private_tubes_factory_init (GabblePrivateTubesFactory *self)
diff --git a/src/private-tubes-factory.h b/src/private-tubes-factory.h
index 10b2dae..f04f1ea 100644
--- a/src/private-tubes-factory.h
+++ b/src/private-tubes-factory.h
@@ -31,6 +31,8 @@
 G_BEGIN_DECLS
 
 typedef struct _GabblePrivateTubesFactoryClass GabblePrivateTubesFactoryClass;
+typedef struct _GabblePrivateTubesFactoryPrivate
+    GabblePrivateTubesFactoryPrivate;
 
 struct _GabblePrivateTubesFactoryClass {
   GObjectClass parent_class;
@@ -39,7 +41,7 @@ struct _GabblePrivateTubesFactoryClass {
 struct _GabblePrivateTubesFactory {
   GObject parent;
 
-  gpointer priv;
+  GabblePrivateTubesFactoryPrivate *priv;
 };
 
 GType gabble_private_tubes_factory_get_type (void);
-- 
1.5.6.3