[next] telepathy-glib: move _TpBaseConnectionPrivate struct to its .c file
Guillaume Desmottes
gdesmott at kemper.freedesktop.org
Fri May 16 05:48:08 PDT 2014
Module: telepathy-glib
Branch: next
Commit: cada19aa37bb5da8055af4bd80339d7ceed9dda3
URL: http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=cada19aa37bb5da8055af4bd80339d7ceed9dda3
Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date: Fri May 16 10:58:40 2014 +0200
move _TpBaseConnectionPrivate struct to its .c file
Fix https://bugs.freedesktop.org/show_bug.cgi?id=78377
---
telepathy-glib/base-connection-internal.h | 58 -----------------------------
telepathy-glib/base-connection.c | 58 +++++++++++++++++++++++++++++
2 files changed, 58 insertions(+), 58 deletions(-)
diff --git a/telepathy-glib/base-connection-internal.h b/telepathy-glib/base-connection-internal.h
index aff75ab..27da6ba 100644
--- a/telepathy-glib/base-connection-internal.h
+++ b/telepathy-glib/base-connection-internal.h
@@ -30,64 +30,6 @@
G_BEGIN_DECLS
-struct _TpBaseConnectionPrivate
-{
- gchar *bus_name;
- gchar *object_path;
-
- TpConnectionStatus status;
-
- TpHandle self_handle;
- const gchar *self_id;
-
- /* Telepathy properties */
- gchar *protocol;
-
- /* if TRUE, the object has gone away */
- gboolean dispose_has_run;
- /* array of (TpChannelManager *) */
- GPtrArray *channel_managers;
- /* array of reffed (TpChannelManagerRequest *) */
- GPtrArray *channel_requests;
-
- TpHandleRepoIface *handles[TP_NUM_ENTITY_TYPES];
-
- /* Created in constructed, this is an array of static strings which
- * represent the interfaces on this connection.
- *
- * Note that this is a GArray of gchar*, not a GPtrArray,
- * so that we can use GArray's convenient auto-null-termination. */
- GArray *interfaces;
-
- /* Array of GDBusMethodInvocation * representing Disconnect calls.
- * If NULL and we are in a state != DISCONNECTED, then we have not started
- * shutting down yet.
- * If NULL and we are in state DISCONNECTED, then we have finished shutting
- * down.
- * If not NULL, we are trying to shut down (and must be in state
- * DISCONNECTED). */
- GPtrArray *disconnect_requests;
-
- GDBusConnection *dbus_connection;
- /* TRUE after constructor() returns */
- gboolean been_constructed;
- /* TRUE if on D-Bus */
- gboolean been_registered;
- /* TRUE if CONNECTED has been signalled to D-Bus, so it's too late to
- * manipulate the list of interfaces */
- gboolean been_connected;
-
- /* g_strdup (unique name) => owned ClientData struct */
- GHashTable *clients;
- /* GQuark iface => number of clients interested */
- GHashTable *interests;
-
- gchar *account_path_suffix;
-
- _TpGDBusConnection *connection_skeleton;
- _TpGDBusConnectionInterfaceRequests *requests_skeleton;
-};
-
void _tp_base_connection_set_handle_repo (TpBaseConnection *self,
TpEntityType entity_type,
TpHandleRepoIface *handle_repo);
diff --git a/telepathy-glib/base-connection.c b/telepathy-glib/base-connection.c
index 3d9b92a..1ed86eb 100644
--- a/telepathy-glib/base-connection.c
+++ b/telepathy-glib/base-connection.c
@@ -219,6 +219,64 @@
G_DEFINE_ABSTRACT_TYPE (TpBaseConnection, tp_base_connection,
G_TYPE_DBUS_OBJECT_SKELETON)
+struct _TpBaseConnectionPrivate
+{
+ gchar *bus_name;
+ gchar *object_path;
+
+ TpConnectionStatus status;
+
+ TpHandle self_handle;
+ const gchar *self_id;
+
+ /* Telepathy properties */
+ gchar *protocol;
+
+ /* if TRUE, the object has gone away */
+ gboolean dispose_has_run;
+ /* array of (TpChannelManager *) */
+ GPtrArray *channel_managers;
+ /* array of reffed (TpChannelManagerRequest *) */
+ GPtrArray *channel_requests;
+
+ TpHandleRepoIface *handles[TP_NUM_ENTITY_TYPES];
+
+ /* Created in constructed, this is an array of static strings which
+ * represent the interfaces on this connection.
+ *
+ * Note that this is a GArray of gchar*, not a GPtrArray,
+ * so that we can use GArray's convenient auto-null-termination. */
+ GArray *interfaces;
+
+ /* Array of GDBusMethodInvocation * representing Disconnect calls.
+ * If NULL and we are in a state != DISCONNECTED, then we have not started
+ * shutting down yet.
+ * If NULL and we are in state DISCONNECTED, then we have finished shutting
+ * down.
+ * If not NULL, we are trying to shut down (and must be in state
+ * DISCONNECTED). */
+ GPtrArray *disconnect_requests;
+
+ GDBusConnection *dbus_connection;
+ /* TRUE after constructor() returns */
+ gboolean been_constructed;
+ /* TRUE if on D-Bus */
+ gboolean been_registered;
+ /* TRUE if CONNECTED has been signalled to D-Bus, so it's too late to
+ * manipulate the list of interfaces */
+ gboolean been_connected;
+
+ /* g_strdup (unique name) => owned ClientData struct */
+ GHashTable *clients;
+ /* GQuark iface => number of clients interested */
+ GHashTable *interests;
+
+ gchar *account_path_suffix;
+
+ _TpGDBusConnection *connection_skeleton;
+ _TpGDBusConnectionInterfaceRequests *requests_skeleton;
+};
+
enum
{
PROP_PROTOCOL = 1,
More information about the telepathy-commits
mailing list