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

[Simon McVittie]

20080722182207-53eee-f81f220f82f4ca2648f92e8e82222d7de7a65715.gz
---
 src/presence.c |    4 +---
 src/presence.h |    4 +++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/presence.c b/src/presence.c
index 4b6a80e..180baa3 100644
--- a/src/presence.c
+++ b/src/presence.c
@@ -33,7 +33,7 @@
 
 G_DEFINE_TYPE (GabblePresence, gabble_presence, G_TYPE_OBJECT);
 
-#define GABBLE_PRESENCE_PRIV(account) ((GabblePresencePrivate *) account->priv)
+#define GABBLE_PRESENCE_PRIV(account) ((account)->priv)
 
 typedef struct _Resource Resource;
 
@@ -47,8 +47,6 @@ struct _Resource {
     time_t last_activity;
 };
 
-typedef struct _GabblePresencePrivate GabblePresencePrivate;
-
 struct _GabblePresencePrivate {
     gchar *no_resource_status_message;
     GSList *resources;
diff --git a/src/presence.h b/src/presence.h
index cf6a306..c556be3 100644
--- a/src/presence.h
+++ b/src/presence.h
@@ -51,6 +51,8 @@ G_BEGIN_DECLS
     (G_TYPE_INSTANCE_GET_CLASS ((obj), \
                                   GABBLE_TYPE_PRESENCE, GabblePresenceClass))
 
+typedef struct _GabblePresencePrivate GabblePresencePrivate;
+
 struct _GabblePresence {
     GObject parent;
     GabblePresenceCapabilities caps;
@@ -59,7 +61,7 @@ struct _GabblePresence {
     gchar *nickname;
     gchar *avatar_sha1;
     gboolean keep_unavailable;
-    gpointer priv;
+    GabblePresencePrivate *priv;
 };
 
 typedef struct _GabblePresenceClass GabblePresenceClass;
-- 
1.5.6.3