[Telepathy-commits] [telepathy-glib/master] Move TpConnectionPrivate to connection-internal.h

[Simon McVittie]

This allows _tp_connection_get_contact_attribute_interfaces() to be
removed, since TpContact can just access the struct member directly.
---
 telepathy-glib/connection-internal.h |   21 +++++++++++++++++++--
 telepathy-glib/connection.c          |   26 --------------------------
 2 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/telepathy-glib/connection-internal.h b/telepathy-glib/connection-internal.h
index 00f274d..5d4894c 100644
--- a/telepathy-glib/connection-internal.h
+++ b/telepathy-glib/connection-internal.h
@@ -27,8 +27,25 @@
 
 G_BEGIN_DECLS
 
-const GArray *_tp_connection_get_contact_attribute_interfaces (
-    TpConnection *self);
+typedef void (*TpConnectionProc) (TpConnection *self);
+
+struct _TpConnectionPrivate {
+    /* GArray of TpConnectionProc */
+    GArray *introspect_needed;
+
+    TpConnectionStatus status;
+    TpConnectionStatusReason status_reason;
+
+    TpConnectionAliasFlags alias_flags;
+
+    /* GArray of GQuark */
+    GArray *contact_attribute_interfaces;
+
+    /* TpHandle => weak ref to TpContact */
+    GHashTable *contacts;
+
+    unsigned ready:1;
+};
 
 void _tp_connection_init_handle_refs (TpConnection *self);
 void _tp_connection_clean_up_handle_refs (TpConnection *self);
diff --git a/telepathy-glib/connection.c b/telepathy-glib/connection.c
index 3271ab1..18af8d4 100644
--- a/telepathy-glib/connection.c
+++ b/telepathy-glib/connection.c
@@ -110,26 +110,6 @@ tp_errors_disconnected_quark (void)
  * Since: 0.7.1; structure layout visible since 0.7.12
  */
 
-typedef void (*TpConnectionProc) (TpConnection *self);
-
-struct _TpConnectionPrivate {
-    /* GArray of TpConnectionProc */
-    GArray *introspect_needed;
-
-    TpConnectionStatus status;
-    TpConnectionStatusReason status_reason;
-
-    TpConnectionAliasFlags alias_flags;
-
-    /* GArray of GQuark */
-    GArray *contact_attribute_interfaces;
-
-    /* TpHandle => weak ref to TpContact */
-    GHashTable *contacts;
-
-    unsigned ready:1;
-};
-
 enum
 {
   PROP_STATUS = 1,
@@ -1226,12 +1206,6 @@ tp_connection_presence_type_cmp_availability (TpConnectionPresenceType p1,
   return 0;
 }
 
-const GArray *
-_tp_connection_get_contact_attribute_interfaces (TpConnection *self)
-{
-  return self->priv->contact_attribute_interfaces;
-}
-
 
 TpContact *
 _tp_connection_lookup_contact (TpConnection *self,
-- 
1.5.6.5