[Telepathy-commits] [telepathy-glib/master] TpBaseConnection: expand useless TP_BASE_CONNECTION_GET_PRIVATE macro, resulting in code reduction
Simon McVittie
simon.mcvittie at collabora.co.uk
Tue Mar 3 06:23:38 PST 2009
---
telepathy-glib/base-connection.c | 45 ++++++++++++++++++-------------------
1 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/telepathy-glib/base-connection.c b/telepathy-glib/base-connection.c
index ab17ec5..809bbb7 100644
--- a/telepathy-glib/base-connection.c
+++ b/telepathy-glib/base-connection.c
@@ -284,8 +284,6 @@ enum
static guint signals[N_SIGNALS] = {0};
-#define TP_BASE_CONNECTION_GET_PRIVATE(obj) (obj->priv)
-
typedef struct _ChannelRequest ChannelRequest;
typedef enum {
@@ -413,7 +411,7 @@ tp_base_connection_get_property (GObject *object,
GParamSpec *pspec)
{
TpBaseConnection *self = (TpBaseConnection *) object;
- TpBaseConnectionPrivate *priv = TP_BASE_CONNECTION_GET_PRIVATE (self);
+ TpBaseConnectionPrivate *priv = self->priv;
switch (property_id) {
case PROP_PROTOCOL:
@@ -437,7 +435,7 @@ tp_base_connection_set_property (GObject *object,
GParamSpec *pspec)
{
TpBaseConnection *self = (TpBaseConnection *) object;
- TpBaseConnectionPrivate *priv = TP_BASE_CONNECTION_GET_PRIVATE (self);
+ TpBaseConnectionPrivate *priv = self->priv;
switch (property_id) {
case PROP_PROTOCOL:
@@ -480,7 +478,7 @@ static void
tp_base_connection_dispose (GObject *object)
{
TpBaseConnection *self = TP_BASE_CONNECTION (object);
- TpBaseConnectionPrivate *priv = TP_BASE_CONNECTION_GET_PRIVATE (self);
+ TpBaseConnectionPrivate *priv = self->priv;
guint i;
if (priv->dispose_has_run)
@@ -545,7 +543,7 @@ static void
tp_base_connection_finalize (GObject *object)
{
TpBaseConnection *self = TP_BASE_CONNECTION (object);
- TpBaseConnectionPrivate *priv = TP_BASE_CONNECTION_GET_PRIVATE (self);
+ TpBaseConnectionPrivate *priv = self->priv;
g_free (priv->protocol);
g_free (self->bus_name);
@@ -699,7 +697,7 @@ find_matching_channel_requests (TpBaseConnection *conn,
ChannelRequest *channel_request,
gboolean *suppress_handler)
{
- TpBaseConnectionPrivate *priv = TP_BASE_CONNECTION_GET_PRIVATE (conn);
+ TpBaseConnectionPrivate *priv = conn->priv;
GPtrArray *requests;
guint i;
@@ -765,7 +763,8 @@ satisfy_request (TpBaseConnection *conn,
GObject *channel,
const gchar *object_path)
{
- TpBaseConnectionPrivate *priv = TP_BASE_CONNECTION_GET_PRIVATE (conn);
+ TpBaseConnectionPrivate *priv = conn->priv;
+
DEBUG ("completing queued request %p with success, "
"channel_type=%s, handle_type=%u, "
"handle=%u, suppress_handler=%u", request, request->channel_type,
@@ -872,7 +871,8 @@ fail_channel_request (TpBaseConnection *conn,
ChannelRequest *request,
GError *error)
{
- TpBaseConnectionPrivate *priv = TP_BASE_CONNECTION_GET_PRIVATE (conn);
+ TpBaseConnectionPrivate *priv = conn->priv;
+
DEBUG ("completing queued request %p with error, channel_type=%s, "
"handle_type=%u, handle=%u, suppress_handler=%u",
request, request->channel_type,
@@ -1266,7 +1266,7 @@ manager_get_channel_details_foreach (TpExportableChannel *chan,
static GPtrArray *
conn_requests_get_channel_details (TpBaseConnection *self)
{
- TpBaseConnectionPrivate *priv = TP_BASE_CONNECTION_GET_PRIVATE (self);
+ TpBaseConnectionPrivate *priv = self->priv;
/* guess that each ChannelManager and each ChannelFactory has two
* channels, on average */
GPtrArray *details = g_ptr_array_sized_new (priv->channel_managers->len * 2
@@ -1322,7 +1322,7 @@ get_requestables_foreach (TpChannelManager *manager,
static GPtrArray *
conn_requests_get_requestables (TpBaseConnection *self)
{
- TpBaseConnectionPrivate *priv = TP_BASE_CONNECTION_GET_PRIVATE (self);
+ TpBaseConnectionPrivate *priv = self->priv;
/* generously guess that each ChannelManager has about 2 ChannelClasses */
GPtrArray *details = g_ptr_array_sized_new (priv->channel_managers->len * 2);
guint i;
@@ -1495,7 +1495,7 @@ tp_base_connection_register (TpBaseConnection *self,
GError **error)
{
TpBaseConnectionClass *cls = TP_BASE_CONNECTION_GET_CLASS (self);
- TpBaseConnectionPrivate *priv = TP_BASE_CONNECTION_GET_PRIVATE (self);
+ TpBaseConnectionPrivate *priv = self->priv;
gchar *tmp;
gchar *safe_proto;
gchar *unique_name;
@@ -1701,7 +1701,7 @@ tp_base_connection_get_interfaces (TpSvcConnection *iface,
TP_BASE_CONNECTION_ERROR_IF_NOT_CONNECTED (self, context);
- priv = TP_BASE_CONNECTION_GET_PRIVATE (self);
+ priv = self->priv;
klass = TP_BASE_CONNECTION_GET_CLASS (self);
if (priv->interfaces)
@@ -1743,7 +1743,7 @@ tp_base_connection_get_protocol (TpSvcConnection *iface,
TP_BASE_CONNECTION_ERROR_IF_NOT_CONNECTED (self, context);
- priv = TP_BASE_CONNECTION_GET_PRIVATE (self);
+ priv = self->priv;
tp_svc_connection_return_from_get_protocol (context, priv->protocol);
}
@@ -1819,7 +1819,7 @@ tp_base_connection_hold_handles (TpSvcConnection *iface,
g_assert (TP_IS_BASE_CONNECTION (self));
- priv = TP_BASE_CONNECTION_GET_PRIVATE (self);
+ priv = self->priv;
TP_BASE_CONNECTION_ERROR_IF_NOT_CONNECTED (self, context);
@@ -2011,7 +2011,7 @@ tp_base_connection_list_channels (TpSvcConnection *iface,
g_assert (TP_IS_BASE_CONNECTION (self));
- priv = TP_BASE_CONNECTION_GET_PRIVATE (self);
+ priv = self->priv;
TP_BASE_CONNECTION_ERROR_IF_NOT_CONNECTED (self, context);
@@ -2086,7 +2086,7 @@ tp_base_connection_request_channel (TpSvcConnection *iface,
g_assert (TP_IS_BASE_CONNECTION (self));
- priv = TP_BASE_CONNECTION_GET_PRIVATE (self);
+ priv = self->priv;
TP_BASE_CONNECTION_ERROR_IF_NOT_CONNECTED (self, context);
@@ -2595,7 +2595,7 @@ tp_base_connection_change_status (TpBaseConnection *self,
g_assert (TP_IS_BASE_CONNECTION (self));
- priv = TP_BASE_CONNECTION_GET_PRIVATE (self);
+ priv = self->priv;
klass = TP_BASE_CONNECTION_GET_CLASS (self);
if (self->status == TP_INTERNAL_CONNECTION_STATUS_NEW
@@ -2743,7 +2743,7 @@ tp_base_connection_add_interfaces (TpBaseConnection *self,
const gchar **interfaces)
{
guint i, n_new;
- TpBaseConnectionPrivate *priv = TP_BASE_CONNECTION_GET_PRIVATE (self);
+ TpBaseConnectionPrivate *priv = self->priv;
TpBaseConnectionClass *klass = TP_BASE_CONNECTION_GET_CLASS (self);
g_return_if_fail (self->status != TP_CONNECTION_STATUS_CONNECTED);
@@ -3067,7 +3067,7 @@ conn_requests_offer_request (TpBaseConnection *self,
/* Step 3: offer the incoming, vaguely sanitized request to the channel
* managers.
*/
- TpBaseConnectionPrivate *priv = TP_BASE_CONNECTION_GET_PRIVATE (self);
+ TpBaseConnectionPrivate *priv = self->priv;
TpChannelManagerRequestFunc func;
ChannelRequest *request;
gboolean suppress_handler;
@@ -3202,7 +3202,7 @@ tp_base_connection_channel_manager_iter_next (TpChannelManagerIter *iter,
/* Check the caller initialized the iterator properly. */
g_assert (TP_IS_BASE_CONNECTION (iter->self));
- priv = TP_BASE_CONNECTION_GET_PRIVATE (iter->self);
+ priv = iter->self->priv;
/* Be noisy if something's gone really wrong */
g_return_val_if_fail (iter->index <= priv->channel_managers->len, FALSE);
@@ -3224,8 +3224,7 @@ tp_base_connection_fill_contact_attributes (GObject *obj,
const GArray *contacts, GHashTable *attributes_hash)
{
TpBaseConnection *self = TP_BASE_CONNECTION (obj);
- TpBaseConnectionPrivate *priv =
- TP_BASE_CONNECTION_GET_PRIVATE (self);
+ TpBaseConnectionPrivate *priv = self->priv;
guint i;
for (i = 0; i < contacts->len; i++)
--
1.5.6.5
More information about the telepathy-commits
mailing list