[next] telepathy-glib: base-{connection, protocol}: be sure to add new class members to the end of the struct
Xavier Claessens
xclaesse at kemper.freedesktop.org
Tue Jul 10 07:07:10 PDT 2012
Module: telepathy-glib
Branch: next
Commit: 932a5758b82c9440d482694e66a80b0dcabba561
URL: http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=932a5758b82c9440d482694e66a80b0dcabba561
Author: Jonny Lamb <jonny.lamb at collabora.co.uk>
Date: Mon Jul 9 16:38:27 2012 +0100
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 at collabora.co.uk>
---
telepathy-glib/base-connection.h | 4 ++--
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 41504e4..b158328 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 20fbf0e..5361f94 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;
More information about the telepathy-commits
mailing list