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

[Simon McVittie]

20080722181947-53eee-18343458e42b388485fe036a6a3c943f99d9f575.gz
---
 src/bytestream-factory.c |    4 +---
 src/bytestream-factory.h |    3 ++-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/bytestream-factory.c b/src/bytestream-factory.c
index 81bd0ea..fd382e1 100644
--- a/src/bytestream-factory.c
+++ b/src/bytestream-factory.c
@@ -103,7 +103,6 @@ bytestream_id_free (gpointer v)
   g_slice_free (BytestreamIdentifier, bsid);
 }
 
-typedef struct _GabbleBytestreamFactoryPrivate GabbleBytestreamFactoryPrivate;
 struct _GabbleBytestreamFactoryPrivate
 {
   GabbleConnection *conn;
@@ -125,8 +124,7 @@ struct _GabbleBytestreamFactoryPrivate
   gboolean dispose_has_run;
 };
 
-#define GABBLE_BYTESTREAM_FACTORY_GET_PRIVATE(obj) \
-    ((GabbleBytestreamFactoryPrivate *) obj->priv)
+#define GABBLE_BYTESTREAM_FACTORY_GET_PRIVATE(obj) ((obj)->priv)
 
 static LmHandlerResult
 bytestream_factory_msg_data_cb (LmMessageHandler *handler,
diff --git a/src/bytestream-factory.h b/src/bytestream-factory.h
index 9548fbf..44fa2ef 100644
--- a/src/bytestream-factory.h
+++ b/src/bytestream-factory.h
@@ -33,6 +33,7 @@
 G_BEGIN_DECLS
 
 typedef struct _GabbleBytestreamFactoryClass GabbleBytestreamFactoryClass;
+typedef struct _GabbleBytestreamFactoryPrivate GabbleBytestreamFactoryPrivate;
 
 struct _GabbleBytestreamFactoryClass {
   GObjectClass parent_class;
@@ -41,7 +42,7 @@ struct _GabbleBytestreamFactoryClass {
 struct _GabbleBytestreamFactory {
   GObject parent;
 
-  gpointer priv;
+  GabbleBytestreamFactoryPrivate *priv;
 };
 
 GType gabble_bytestream_factory_get_type (void);
-- 
1.5.6.3