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

[Simon McVittie]

20080722182316-53eee-39250d5456d1b7b2005927f06a61b22b052f1dec.gz
---
 src/tube-dbus.c |    4 +---
 src/tube-dbus.h |    3 ++-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/tube-dbus.c b/src/tube-dbus.c
index baea8c7..d3a5772 100644
--- a/src/tube-dbus.c
+++ b/src/tube-dbus.c
@@ -88,7 +88,6 @@ enum
   LAST_PROPERTY
 };
 
-typedef struct _GabbleTubeDBusPrivate GabbleTubeDBusPrivate;
 struct _GabbleTubeDBusPrivate
 {
   GabbleConnection *conn;
@@ -130,8 +129,7 @@ struct _GabbleTubeDBusPrivate
   gboolean dispose_has_run;
 };
 
-#define GABBLE_TUBE_DBUS_GET_PRIVATE(obj) \
-    ((GabbleTubeDBusPrivate *) obj->priv)
+#define GABBLE_TUBE_DBUS_GET_PRIVATE(obj) ((obj)->priv)
 
 static void data_received_cb (GabbleBytestreamIface *stream, TpHandle sender,
     GString *data, gpointer user_data);
diff --git a/src/tube-dbus.h b/src/tube-dbus.h
index a15c18f..5d232fe 100644
--- a/src/tube-dbus.h
+++ b/src/tube-dbus.h
@@ -28,6 +28,7 @@
 G_BEGIN_DECLS
 
 typedef struct _GabbleTubeDBus GabbleTubeDBus;
+typedef struct _GabbleTubeDBusPrivate GabbleTubeDBusPrivate;
 typedef struct _GabbleTubeDBusClass GabbleTubeDBusClass;
 
 struct _GabbleTubeDBusClass {
@@ -37,7 +38,7 @@ struct _GabbleTubeDBusClass {
 struct _GabbleTubeDBus {
   GObject parent;
 
-  gpointer priv;
+  GabbleTubeDBusPrivate *priv;
 };
 
 GType gabble_tube_dbus_get_type (void);
-- 
1.5.6.3