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

[Simon McVittie]

20080722182157-53eee-effa75d032082c3880d45c3912505d2436f51af0.gz
---
 src/presence-cache.c |    5 +----
 src/presence-cache.h |    4 +++-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/presence-cache.c b/src/presence-cache.c
index f325e2a..7f924a5 100644
--- a/src/presence-cache.c
+++ b/src/presence-cache.c
@@ -62,10 +62,7 @@ enum
 
 static guint signals[LAST_SIGNAL] = { 0 };
 
-#define GABBLE_PRESENCE_CACHE_PRIV(account) \
-  ((GabblePresenceCachePrivate *) account->priv)
-
-typedef struct _GabblePresenceCachePrivate GabblePresenceCachePrivate;
+#define GABBLE_PRESENCE_CACHE_PRIV(account) ((account)->priv)
 
 struct _GabblePresenceCachePrivate
 {
diff --git a/src/presence-cache.h b/src/presence-cache.h
index a687742..b56bc39 100644
--- a/src/presence-cache.h
+++ b/src/presence-cache.h
@@ -54,9 +54,11 @@ G_BEGIN_DECLS
 #define JABBER_PRESENCE_SHOW_DND "dnd"
 #define JABBER_PRESENCE_SHOW_XA "xa"
 
+typedef struct _GabblePresenceCachePrivate GabblePresenceCachePrivate;
+
 struct _GabblePresenceCache {
     GObject parent;
-    gpointer priv;
+    GabblePresenceCachePrivate *priv;
 };
 
 typedef struct _GabblePresenceCacheClass GabblePresenceCacheClass;
-- 
1.5.6.3