diff options
| author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2012-07-09 16:38:27 +0100 |
|---|---|---|
| committer | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2012-07-09 16:38:53 +0100 |
| commit | 932a5758b82c9440d482694e66a80b0dcabba561 (patch) | |
| tree | 1ec09963a1813b5c0f533d4417caf35418b06a72 | |
| parent | 528770ed041b494a23dc00b4e0b1f5b4ee5c75f9 (diff) | |
| download | telepathy-glib-932a5758b82c9440d482694e66a80b0dcabba561.tar.gz | |
base-{connection,protocol}: be sure to add new class members to the end of the struct
I already removed the padding (in c14d25b4bf4 and 436219789348) so
just re-arrange the struct.
D'oh.
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
| -rw-r--r-- | telepathy-glib/base-connection.h | 4 | ||||
| -rw-r--r-- | telepathy-glib/base-protocol.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/telepathy-glib/base-connection.h b/telepathy-glib/base-connection.h index 41504e423..b15832849 100644 --- a/telepathy-glib/base-connection.h +++ b/telepathy-glib/base-connection.h @@ -109,10 +109,10 @@ struct _TpBaseConnectionClass { /*<private>*/ const gchar **_TP_SEAL (interfaces_always_present); /*<public>*/ - TpBaseConnectionGetInterfacesImpl get_interfaces_always_present; - TpBaseConnectionCreateChannelManagersImpl create_channel_managers; + TpBaseConnectionGetInterfacesImpl get_interfaces_always_present; + /*<private>*/ gpointer _future3; gpointer _future4; diff --git a/telepathy-glib/base-protocol.h b/telepathy-glib/base-protocol.h index 20fbf0ee2..5361f9488 100644 --- a/telepathy-glib/base-protocol.h +++ b/telepathy-glib/base-protocol.h @@ -163,8 +163,6 @@ struct _TpBaseProtocolClass GStrv (*_TP_SEAL (get_interfaces)) (TpBaseProtocol *self); /*<public>*/ - TpBaseProtocolGetInterfacesArrayFunc get_interfaces_array; - void (*get_connection_details) (TpBaseProtocol *self, GStrv *connection_interfaces, GType **channel_manager_types, @@ -178,6 +176,8 @@ struct _TpBaseProtocolClass GStrv (*dup_authentication_types) (TpBaseProtocol *self); + TpBaseProtocolGetInterfacesArrayFunc get_interfaces_array; + /*<private>*/ GCallback padding[4]; TpBaseProtocolClassPrivate *priv; |