diff options
| -rw-r--r-- | ytstenut/yts-client.h | 31 | ||||
| -rw-r--r-- | ytstenut/yts-contact.h | 37 | ||||
| -rw-r--r-- | ytstenut/yts-roster.h | 28 | ||||
| -rw-r--r-- | ytstenut/yts-types.h | 6 |
4 files changed, 46 insertions, 56 deletions
diff --git a/ytstenut/yts-client.h b/ytstenut/yts-client.h index f5553b0..ac31b41 100644 --- a/ytstenut/yts-client.h +++ b/ytstenut/yts-client.h @@ -56,10 +56,22 @@ G_BEGIN_DECLS YTS_TYPE_CLIENT, \ YtsClientClass)) -typedef struct _YtsClientClass YtsClientClass; typedef struct _YtsClientPrivate YtsClientPrivate; /** + * YtsClient: + * + * Class representing an application connection to the Ytstenut mesh. + */ +typedef struct +{ + /*< private >*/ + GObject parent; + + YtsClientPrivate *priv; +} YtsClient; + +/** * YtsClientClass: * @authenticated: signal handler for #YtsClient::authenticated * @ready: signal handler for #YtsClient::ready @@ -69,7 +81,7 @@ typedef struct _YtsClientPrivate YtsClientPrivate; * * Class for #YtsClient */ -struct _YtsClientClass +typedef struct { /*< private >*/ GObjectClass parent_class; @@ -85,20 +97,7 @@ struct _YtsClientClass guint64 size, guint64 offset, TpChannel *channel); -}; - -/** - * YtsClient: - * - * Class representing an application connection to the Ytstenut mesh. - */ -struct _YtsClient -{ - /*< private >*/ - GObject parent; - - YtsClientPrivate *priv; -}; +} YtsClientClass; GType yts_client_get_type (void) G_GNUC_CONST; diff --git a/ytstenut/yts-contact.h b/ytstenut/yts-contact.h index ccd571e..e366da9 100644 --- a/ytstenut/yts-contact.h +++ b/ytstenut/yts-contact.h @@ -51,17 +51,32 @@ G_BEGIN_DECLS YTS_TYPE_CONTACT, \ YtsContactClass)) -typedef struct _YtsContactClass YtsContactClass; typedef struct _YtsContactPrivate YtsContactPrivate; /** + * YtsContact: + * + * Represents a single XMPP connection (usually a device) in the Ytstenut + * mesh. One or more #YtsService<!-- -->s will be available throug a given + * contact. + */ +typedef struct +{ + /*< private >*/ + GObject parent; + + /*< private >*/ + YtsContactPrivate *priv; +} YtsContact; + +/** * YtsContactClass: * @service_added: signal handler for #YtsContact::service-added * @service_removed: signal handler for #YtsContact::service-removed * * #YtsContact class. */ -struct _YtsContactClass +typedef struct { /*< private >*/ GObjectClass parent_class; @@ -74,23 +89,7 @@ struct _YtsContactClass /*< public >*/ void (*service_added) (YtsContact *contact, YtsService *service); void (*service_removed) (YtsContact *contact, YtsService *service); -}; - -/** - * YtsContact: - * - * Represents a single XMPP connection (usually a device) in the Ytstenut - * mesh. One or more #YtsService<!-- -->s will be available throug a given - * contact. - */ -struct _YtsContact -{ - /*< private >*/ - GObject parent; - - /*< private >*/ - YtsContactPrivate *priv; -}; +} YtsContactClass; GType yts_contact_get_type (void) G_GNUC_CONST; diff --git a/ytstenut/yts-roster.h b/ytstenut/yts-roster.h index 7dee217..c173c16 100644 --- a/ytstenut/yts-roster.h +++ b/ytstenut/yts-roster.h @@ -47,34 +47,32 @@ G_BEGIN_DECLS YTS_TYPE_ROSTER, \ YtsRosterClass)) -typedef struct _YtsRoster YtsRoster; -typedef struct _YtsRosterClass YtsRosterClass; typedef struct _YtsRosterPrivate YtsRosterPrivate; /** - * YtsRosterClass: - * - * #YtsRoster class. - */ -struct _YtsRosterClass -{ - /*< private >*/ - GObjectClass parent_class; -}; - -/** * YtsRoster: * * Represents a roster of #YtsContact<!-- -->s known to #YtsClient. */ -struct _YtsRoster +typedef struct { /*< private >*/ GObject parent; /*< private >*/ YtsRosterPrivate *priv; -}; +} YtsRoster; + +/** + * YtsRosterClass: + * + * #YtsRoster class. + */ +typedef struct +{ + /*< private >*/ + GObjectClass parent_class; +} YtsRosterClass; GType yts_roster_get_type (void) G_GNUC_CONST; diff --git a/ytstenut/yts-types.h b/ytstenut/yts-types.h index 80a01b3..b41038b 100644 --- a/ytstenut/yts-types.h +++ b/ytstenut/yts-types.h @@ -34,12 +34,6 @@ G_BEGIN_DECLS -/* - * Forward declarations - */ -typedef struct _YtsClient YtsClient; -typedef struct _YtsContact YtsContact; - /** * YtsProtocol: * @YTS_PROTOCOL_XMPP: Jabber |