summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2008-07-22 18:21:04 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2008-07-22 18:21:04 +0000
commit6bc06ae45af4854a95b4ecbc0451b1bca73e0963 (patch)
tree63abe5492462b72dcdc8c06bb1d16bdc8076978e
parentb7e0aebc4de7a8561d83a3d99420a715592775e9 (diff)
GabbleDisco: simplify priv access
-rw-r--r--src/disco.c3
-rw-r--r--src/disco.h3
2 files changed, 3 insertions, 3 deletions
diff --git a/src/disco.c b/src/disco.c
index 2f0549c3d..d6b8bb01b 100644
--- a/src/disco.c
+++ b/src/disco.c
@@ -52,7 +52,6 @@ enum
G_DEFINE_TYPE(GabbleDisco, gabble_disco, G_TYPE_OBJECT);
-typedef struct _GabbleDiscoPrivate GabbleDiscoPrivate;
struct _GabbleDiscoPrivate
{
GabbleConnection *connection;
@@ -83,7 +82,7 @@ gabble_disco_error_quark (void)
return quark;
}
-#define GABBLE_DISCO_GET_PRIVATE(o) ((GabbleDiscoPrivate *) ((o)->priv))
+#define GABBLE_DISCO_GET_PRIVATE(o) ((o)->priv)
static void
gabble_disco_init (GabbleDisco *obj)
diff --git a/src/disco.h b/src/disco.h
index 5951645df..cf937d19b 100644
--- a/src/disco.h
+++ b/src/disco.h
@@ -38,6 +38,7 @@ typedef enum
} GabbleDiscoType;
typedef struct _GabbleDiscoClass GabbleDiscoClass;
+typedef struct _GabbleDiscoPrivate GabbleDiscoPrivate;
typedef struct _GabbleDiscoRequest GabbleDiscoRequest;
/**
@@ -78,7 +79,7 @@ struct _GabbleDiscoClass {
struct _GabbleDisco {
GObject parent;
- gpointer priv;
+ GabbleDiscoPrivate *priv;
};
typedef void (*GabbleDiscoCb)(GabbleDisco *self, GabbleDiscoRequest *request,