diff options
| author | Mikhail Zabaluev <mikhail.zabaluev@nokia.com> | 2011-08-24 11:29:45 +0300 |
|---|---|---|
| committer | Mikhail Zabaluev <mikhail.zabaluev@nokia.com> | 2011-08-24 11:34:52 +0300 |
| commit | bead97d9f05bf9d1ca10a803156f8fc702a92267 (patch) | |
| tree | b39d11f6289bd32859f81d6ae53f38bb2c36f27a | |
| parent | 8b5b9ee192fae3661292d8664d827f55fb4ee44d (diff) | |
Lightweight access to the private structure of RakiaMediaSession
| -rw-r--r-- | rakia/media-session.c | 11 | ||||
| -rw-r--r-- | rakia/media-session.h | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/rakia/media-session.c b/rakia/media-session.c index 6662381..7ff5a8a 100644 --- a/rakia/media-session.c +++ b/rakia/media-session.c @@ -124,8 +124,6 @@ static const char* session_states[] = #endif /* ENABLE_DEBUG */ /* private structure */ -typedef struct _RakiaMediaSessionPrivate RakiaMediaSessionPrivate; - struct _RakiaMediaSessionPrivate { TpDBusDaemon *dbus_daemon; @@ -157,7 +155,7 @@ struct _RakiaMediaSessionPrivate gboolean dispose_has_run; }; -#define RAKIA_MEDIA_SESSION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), RAKIA_TYPE_MEDIA_SESSION, RakiaMediaSessionPrivate)) +#define RAKIA_MEDIA_SESSION_GET_PRIVATE(session) ((session)->priv) static void rakia_media_session_get_property (GObject *object, guint property_id, @@ -181,9 +179,12 @@ static gboolean priv_update_remote_media (RakiaMediaSession *session, static void priv_save_event (RakiaMediaSession *self); static void priv_zap_event (RakiaMediaSession *self); -static void rakia_media_session_init (RakiaMediaSession *obj) +static void rakia_media_session_init (RakiaMediaSession *self) { - RakiaMediaSessionPrivate *priv = RAKIA_MEDIA_SESSION_GET_PRIVATE (obj); + RakiaMediaSessionPrivate *priv = G_TYPE_INSTANCE_GET_PRIVATE (self, + RAKIA_TYPE_MEDIA_SESSION, RakiaMediaSessionPrivate); + + self->priv = priv; priv->state = RAKIA_MEDIA_SESSION_STATE_CREATED; priv->hold_state = TP_LOCAL_HOLD_STATE_UNHELD; diff --git a/rakia/media-session.h b/rakia/media-session.h index b2f8004..e2f414e 100644 --- a/rakia/media-session.h +++ b/rakia/media-session.h @@ -43,6 +43,7 @@ typedef enum { typedef struct _RakiaMediaSession RakiaMediaSession; typedef struct _RakiaMediaSessionClass RakiaMediaSessionClass; +typedef struct _RakiaMediaSessionPrivate RakiaMediaSessionPrivate; struct _RakiaMediaSessionClass { GObjectClass parent_class; @@ -50,6 +51,7 @@ struct _RakiaMediaSessionClass { struct _RakiaMediaSession { GObject parent; + RakiaMediaSessionPrivate *priv; }; GType rakia_media_session_get_type(void); |