[Telepathy-commits] [telepathy-gabble/master] enure pointer casts have a space after them
Dafydd Harries
dafydd.harries at collabora.co.uk
Tue Aug 19 10:53:20 PDT 2008
20080718202814-c9803-6a9dba64677bfbca45459e03a3acaf09268fe050.gz
---
src/conn-aliasing.c | 8 ++--
src/conn-avatars.c | 14 ++++----
src/conn-presence.c | 2 +-
src/connection-manager.c | 8 ++--
src/connection.c | 54 ++++++++++++++++----------------
src/gabble.c | 2 +-
src/im-channel.c | 12 +++---
src/im-factory.c | 10 +++---
src/media-channel.c | 20 ++++++------
src/media-factory.c | 12 +++---
src/media-session.c | 10 +++---
src/media-stream.c | 4 +-
src/muc-channel.c | 24 +++++++-------
src/presence-cache.c | 18 +++++-----
src/presence.c | 4 +-
src/private-tubes-factory.c | 2 +-
src/pubsub.c | 2 +-
src/roomlist-channel.c | 18 +++++-----
src/roster-channel.c | 20 ++++++------
src/roster.c | 72 +++++++++++++++++++++---------------------
src/tubes-channel.c | 4 +-
src/util.c | 2 +-
src/vcard-manager.c | 22 ++++++------
tests/test-handles.c | 2 +-
24 files changed, 173 insertions(+), 173 deletions(-)
diff --git a/src/conn-aliasing.c b/src/conn-aliasing.c
index 7d6bc07..c1b654d 100644
--- a/src/conn-aliasing.c
+++ b/src/conn-aliasing.c
@@ -291,7 +291,7 @@ gabble_connection_request_aliases (TpSvcConnectionInterfaceAliasing *iface,
DBusGMethodInvocation *context)
{
GabbleConnection *self = GABBLE_CONNECTION (iface);
- TpBaseConnection *base = (TpBaseConnection *)self;
+ TpBaseConnection *base = (TpBaseConnection *) self;
TpHandleRepoIface *contact_handles = tp_base_connection_get_handles (base,
TP_HANDLE_TYPE_CONTACT);
guint i;
@@ -422,7 +422,7 @@ setaliases_foreach (gpointer key, gpointer value, gpointer user_data)
TpHandle handle = GPOINTER_TO_INT (key);
gchar *alias = (gchar *) value;
GError *error = NULL;
- TpBaseConnection *base = (TpBaseConnection *)data->conn;
+ TpBaseConnection *base = (TpBaseConnection *) data->conn;
TpHandleRepoIface *contact_handles = tp_base_connection_get_handles (base,
TP_HANDLE_TYPE_CONTACT);
@@ -500,7 +500,7 @@ gabble_connection_set_aliases (TpSvcConnectionInterfaceAliasing *iface,
DBusGMethodInvocation *context)
{
GabbleConnection *self = GABBLE_CONNECTION (iface);
- TpBaseConnection *base = (TpBaseConnection *)self;
+ TpBaseConnection *base = (TpBaseConnection *) self;
GError *error = NULL;
struct _i_hate_g_hash_table_foreach data = { NULL, NULL, TRUE };
@@ -726,7 +726,7 @@ _gabble_connection_get_cached_alias (GabbleConnection *conn,
TpHandle handle,
gchar **alias)
{
- TpBaseConnection *base = (TpBaseConnection *)conn;
+ TpBaseConnection *base = (TpBaseConnection *) conn;
TpHandleRepoIface *contact_handles = tp_base_connection_get_handles (base,
TP_HANDLE_TYPE_CONTACT);
GabbleConnectionAliasSource ret = GABBLE_CONNECTION_ALIAS_NONE;
diff --git a/src/conn-avatars.c b/src/conn-avatars.c
index 902d9d9..a519738 100644
--- a/src/conn-avatars.c
+++ b/src/conn-avatars.c
@@ -47,7 +47,7 @@ update_own_avatar_sha1 (GabbleConnection *conn,
const gchar *sha1,
GError **out_error)
{
- TpBaseConnection *base = (TpBaseConnection *)conn;
+ TpBaseConnection *base = (TpBaseConnection *) conn;
GError *error = NULL;
if (!tp_strdiff (sha1, conn->self_presence->avatar_sha1))
@@ -79,7 +79,7 @@ connection_avatar_update_cb (GabblePresenceCache *cache,
gpointer user_data)
{
GabbleConnection *conn = GABBLE_CONNECTION (user_data);
- TpBaseConnection *base = (TpBaseConnection *)conn;
+ TpBaseConnection *base = (TpBaseConnection *) conn;
GabblePresence *presence;
presence = gabble_presence_cache_get (conn->presence_cache, handle);
@@ -184,7 +184,7 @@ gabble_connection_get_avatar_tokens (TpSvcConnectionInterfaceAvatars *iface,
DBusGMethodInvocation *invocation)
{
GabbleConnection *self = GABBLE_CONNECTION (iface);
- TpBaseConnection *base = (TpBaseConnection *)self;
+ TpBaseConnection *base = (TpBaseConnection *) self;
gboolean wait_for_self_avatar = FALSE;
gboolean have_self_avatar;
guint i, my_index = 0;
@@ -312,7 +312,7 @@ gabble_connection_get_known_avatar_tokens (TpSvcConnectionInterfaceAvatars *ifac
DBusGMethodInvocation *invocation)
{
GabbleConnection *self = GABBLE_CONNECTION (iface);
- TpBaseConnection *base = (TpBaseConnection *)self;
+ TpBaseConnection *base = (TpBaseConnection *) self;
gboolean wait_for_self_avatar = FALSE;
gboolean have_self_avatar;
guint i;
@@ -564,7 +564,7 @@ gabble_connection_request_avatar (TpSvcConnectionInterfaceAvatars *iface,
DBusGMethodInvocation *context)
{
GabbleConnection *self = GABBLE_CONNECTION (iface);
- TpBaseConnection *base = (TpBaseConnection *)self;
+ TpBaseConnection *base = (TpBaseConnection *) self;
TpHandleRepoIface *contact_handles = tp_base_connection_get_handles (base,
TP_HANDLE_TYPE_CONTACT);
GError *err = NULL;
@@ -721,7 +721,7 @@ _set_avatar_cb2 (GabbleVCardManager *manager,
gpointer user_data)
{
struct _set_avatar_ctx *ctx = (struct _set_avatar_ctx *) user_data;
- TpBaseConnection *base = (TpBaseConnection *)ctx->conn;
+ TpBaseConnection *base = (TpBaseConnection *) ctx->conn;
if (NULL == vcard)
{
@@ -777,7 +777,7 @@ gabble_connection_set_avatar (TpSvcConnectionInterfaceAvatars *iface,
DBusGMethodInvocation *context)
{
GabbleConnection *self = GABBLE_CONNECTION (iface);
- TpBaseConnection *base = (TpBaseConnection *)self;
+ TpBaseConnection *base = (TpBaseConnection *) self;
struct _set_avatar_ctx *ctx;
gchar *value = NULL;
gchar *base64;
diff --git a/src/conn-presence.c b/src/conn-presence.c
index 27bf6ca..3751372 100644
--- a/src/conn-presence.c
+++ b/src/conn-presence.c
@@ -69,7 +69,7 @@ construct_contact_statuses_cb (GObject *obj,
GError **error)
{
GabbleConnection *self = GABBLE_CONNECTION (obj);
- TpBaseConnection *base = (TpBaseConnection *)self;
+ TpBaseConnection *base = (TpBaseConnection *) self;
guint i;
TpHandle handle;
GHashTable *contact_statuses, *parameters;
diff --git a/src/connection-manager.c b/src/connection-manager.c
index 39e5bfd..bbc0b71 100644
--- a/src/connection-manager.c
+++ b/src/connection-manager.c
@@ -49,7 +49,7 @@ static void
gabble_connection_manager_class_init (GabbleConnectionManagerClass *klass)
{
TpBaseConnectionManagerClass *base_class =
- (TpBaseConnectionManagerClass *)klass;
+ (TpBaseConnectionManagerClass *) klass;
base_class->new_connection = _gabble_connection_manager_new_connection;
base_class->cm_dbus_name = "gabble";
@@ -193,7 +193,7 @@ alloc_params (void)
static void
free_params (void *p)
{
- GabbleParams *params = (GabbleParams *)p;
+ GabbleParams *params = (GabbleParams *) p;
g_free (params->account);
g_free (params->password);
@@ -226,7 +226,7 @@ _gabble_connection_manager_new_connection (TpBaseConnectionManager *self,
GError **error)
{
GabbleConnection *conn;
- GabbleParams *params = (GabbleParams *)parsed_params;
+ GabbleParams *params = (GabbleParams *) parsed_params;
g_assert (GABBLE_IS_CONNECTION_MANAGER (self));
@@ -275,5 +275,5 @@ _gabble_connection_manager_new_connection (TpBaseConnectionManager *self,
conn = NULL;
}
- return (TpBaseConnection *)conn;
+ return (TpBaseConnection *) conn;
}
diff --git a/src/connection.c b/src/connection.c
index 2c1e048..d4a5d1f 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -177,7 +177,7 @@ struct _GabbleConnectionPrivate
};
#define GABBLE_CONNECTION_GET_PRIVATE(obj) \
- ((GabbleConnectionPrivate *)obj->priv)
+ ((GabbleConnectionPrivate *) obj->priv)
static void connection_capabilities_update_cb (GabblePresenceCache *,
TpHandle, GabblePresenceCapabilities, GabblePresenceCapabilities,
@@ -250,7 +250,7 @@ gabble_connection_constructor (GType type,
self->avatar_requests = g_hash_table_new (NULL, NULL);
- return (GObject *)self;
+ return (GObject *) self;
}
static void
@@ -688,7 +688,7 @@ static void
gabble_connection_dispose (GObject *object)
{
GabbleConnection *self = GABBLE_CONNECTION (object);
- TpBaseConnection *base = (TpBaseConnection *)self;
+ TpBaseConnection *base = (TpBaseConnection *) self;
GabbleConnectionPrivate *priv = GABBLE_CONNECTION_GET_PRIVATE (self);
if (priv->dispose_has_run)
@@ -1212,7 +1212,7 @@ connection_disconnected_cb (LmConnection *lmconn,
gpointer user_data)
{
GabbleConnection *conn = GABBLE_CONNECTION (user_data);
- TpBaseConnection *base = (TpBaseConnection *)user_data;
+ TpBaseConnection *base = (TpBaseConnection *) user_data;
g_assert (conn->lmconn == lmconn);
@@ -1225,12 +1225,12 @@ connection_disconnected_cb (LmConnection *lmconn,
if (base->status == TP_CONNECTION_STATUS_DISCONNECTED)
{
DEBUG ("expected; emitting DISCONNECTED");
- tp_base_connection_finish_shutdown ((TpBaseConnection *)conn);
+ tp_base_connection_finish_shutdown ((TpBaseConnection *) conn);
}
else
{
DEBUG ("unexpected; calling tp_base_connection_change_status");
- tp_base_connection_change_status ((TpBaseConnection *)conn,
+ tp_base_connection_change_status ((TpBaseConnection *) conn,
TP_CONNECTION_STATUS_DISCONNECTED,
TP_CONNECTION_STATUS_REASON_NETWORK_ERROR);
}
@@ -1591,7 +1591,7 @@ connection_stream_error_cb (LmMessageHandler *handler,
/* Another client with the same resource just
* appeared, we're going down. */
- tp_base_connection_change_status ((TpBaseConnection *)conn,
+ tp_base_connection_change_status ((TpBaseConnection *) conn,
TP_CONNECTION_STATUS_DISCONNECTED,
TP_CONNECTION_STATUS_REASON_NAME_IN_USE);
return LM_HANDLER_RESULT_REMOVE_MESSAGE;
@@ -1683,7 +1683,7 @@ do_auth (GabbleConnection *conn)
/* the reason this function can fail is through network errors,
* authentication failures are reported to our auth_cb */
- tp_base_connection_change_status ((TpBaseConnection *)conn,
+ tp_base_connection_change_status ((TpBaseConnection *) conn,
TP_CONNECTION_STATUS_DISCONNECTED,
TP_CONNECTION_STATUS_REASON_NETWORK_ERROR);
}
@@ -1697,7 +1697,7 @@ registration_finished_cb (GabbleRegister *reg,
gpointer user_data)
{
GabbleConnection *conn = GABBLE_CONNECTION (user_data);
- TpBaseConnection *base = (TpBaseConnection *)conn;
+ TpBaseConnection *base = (TpBaseConnection *) conn;
if (base->status != TP_CONNECTION_STATUS_CONNECTING)
{
@@ -1718,7 +1718,7 @@ registration_finished_cb (GabbleRegister *reg,
DEBUG ("err_code = %d, err_msg = '%s'",
err_code, err_msg);
- tp_base_connection_change_status ((TpBaseConnection *)conn,
+ tp_base_connection_change_status ((TpBaseConnection *) conn,
TP_CONNECTION_STATUS_DISCONNECTED,
(err_code == TP_ERROR_INVALID_ARGUMENT) ?
TP_CONNECTION_STATUS_REASON_NAME_IN_USE :
@@ -1754,7 +1754,7 @@ connection_open_cb (LmConnection *lmconn,
{
GabbleConnection *conn = GABBLE_CONNECTION (data);
GabbleConnectionPrivate *priv = GABBLE_CONNECTION_GET_PRIVATE (conn);
- TpBaseConnection *base = (TpBaseConnection *)conn;
+ TpBaseConnection *base = (TpBaseConnection *) conn;
if ((base->status != TP_CONNECTION_STATUS_CONNECTING) &&
(base->status != TP_INTERNAL_CONNECTION_STATUS_NEW))
@@ -1786,13 +1786,13 @@ connection_open_cb (LmConnection *lmconn,
if (priv->ssl_error)
{
- tp_base_connection_change_status ((TpBaseConnection *)conn,
+ tp_base_connection_change_status ((TpBaseConnection *) conn,
TP_CONNECTION_STATUS_DISCONNECTED,
priv->ssl_error);
}
else
{
- tp_base_connection_change_status ((TpBaseConnection *)conn,
+ tp_base_connection_change_status ((TpBaseConnection *) conn,
TP_CONNECTION_STATUS_DISCONNECTED,
TP_CONNECTION_STATUS_REASON_NETWORK_ERROR);
}
@@ -1819,7 +1819,7 @@ connection_auth_cb (LmConnection *lmconn,
gpointer data)
{
GabbleConnection *conn = GABBLE_CONNECTION (data);
- TpBaseConnection *base = (TpBaseConnection *)conn;
+ TpBaseConnection *base = (TpBaseConnection *) conn;
TpHandleRepoIface *contact_handles = tp_base_connection_get_handles (base,
TP_HANDLE_TYPE_CONTACT);
GabbleConnectionPrivate *priv = GABBLE_CONNECTION_GET_PRIVATE (conn);
@@ -1839,7 +1839,7 @@ connection_auth_cb (LmConnection *lmconn,
{
DEBUG ("failed");
- tp_base_connection_change_status ((TpBaseConnection *)conn,
+ tp_base_connection_change_status ((TpBaseConnection *) conn,
TP_CONNECTION_STATUS_DISCONNECTED,
TP_CONNECTION_STATUS_REASON_AUTHENTICATION_FAILED);
@@ -1857,7 +1857,7 @@ connection_auth_cb (LmConnection *lmconn,
g_error_free (error);
- tp_base_connection_change_status ((TpBaseConnection *)conn,
+ tp_base_connection_change_status ((TpBaseConnection *) conn,
TP_CONNECTION_STATUS_DISCONNECTED,
TP_CONNECTION_STATUS_REASON_NETWORK_ERROR);
@@ -1871,7 +1871,7 @@ connection_auth_cb (LmConnection *lmconn,
g_error_free (error);
- tp_base_connection_change_status ((TpBaseConnection *)conn,
+ tp_base_connection_change_status ((TpBaseConnection *) conn,
TP_CONNECTION_STATUS_DISCONNECTED,
TP_CONNECTION_STATUS_REASON_NETWORK_ERROR);
@@ -1900,7 +1900,7 @@ connection_auth_cb (LmConnection *lmconn,
g_error_free (error);
- tp_base_connection_change_status ((TpBaseConnection *)conn,
+ tp_base_connection_change_status ((TpBaseConnection *) conn,
TP_CONNECTION_STATUS_DISCONNECTED,
TP_CONNECTION_STATUS_REASON_NETWORK_ERROR);
}
@@ -1924,7 +1924,7 @@ connection_disco_cb (GabbleDisco *disco,
gpointer user_data)
{
GabbleConnection *conn = user_data;
- TpBaseConnection *base = (TpBaseConnection *)conn;
+ TpBaseConnection *base = (TpBaseConnection *) conn;
GabbleConnectionPrivate *priv;
GError *error = NULL;
@@ -2120,7 +2120,7 @@ gabble_connection_advertise_capabilities (TpSvcConnectionInterfaceCapabilities *
DBusGMethodInvocation *context)
{
GabbleConnection *self = GABBLE_CONNECTION (iface);
- TpBaseConnection *base = (TpBaseConnection *)self;
+ TpBaseConnection *base = (TpBaseConnection *) self;
guint i;
GabblePresence *pres = self->self_presence;
GabblePresenceCapabilities add_caps = 0, remove_caps = 0, caps, save_caps;
@@ -2241,7 +2241,7 @@ gabble_connection_get_capabilities (TpSvcConnectionInterfaceCapabilities *iface,
DBusGMethodInvocation *context)
{
GabbleConnection *self = GABBLE_CONNECTION (iface);
- TpBaseConnection *base = (TpBaseConnection *)self;
+ TpBaseConnection *base = (TpBaseConnection *) self;
TpHandleRepoIface *contact_handles = tp_base_connection_get_handles (base,
TP_HANDLE_TYPE_CONTACT);
guint i;
@@ -2449,7 +2449,7 @@ room_verify_batch_new (GabbleConnection *conn,
guint count,
const gchar **jids)
{
- TpBaseConnection *base = (TpBaseConnection *)conn;
+ TpBaseConnection *base = (TpBaseConnection *) conn;
TpHandleRepoIface *room_handles = tp_base_connection_get_handles (base,
TP_HANDLE_TYPE_ROOM);
RoomVerifyBatch *batch = g_slice_new (RoomVerifyBatch);
@@ -2502,7 +2502,7 @@ room_verify_batch_try_return (RoomVerifyBatch *batch)
{
guint i;
TpHandleRepoIface *room_handles = tp_base_connection_get_handles (
- (TpBaseConnection *)batch->conn, TP_HANDLE_TYPE_ROOM);
+ (TpBaseConnection *) batch->conn, TP_HANDLE_TYPE_ROOM);
gchar *sender;
GError *error = NULL;
@@ -2549,7 +2549,7 @@ room_jid_disco_cb (GabbleDisco *disco,
RoomVerifyContext *rvctx = user_data;
RoomVerifyBatch *batch = rvctx->batch;
TpHandleRepoIface *room_handles = tp_base_connection_get_handles (
- (TpBaseConnection *)batch->conn, TP_HANDLE_TYPE_ROOM);
+ (TpBaseConnection *) batch->conn, TP_HANDLE_TYPE_ROOM);
LmMessageNode *lm_node;
gboolean found = FALSE;
TpHandle handle;
@@ -2686,7 +2686,7 @@ gabble_connection_request_handles (TpSvcConnection *iface,
DBusGMethodInvocation *context)
{
GabbleConnection *self = GABBLE_CONNECTION (iface);
- TpBaseConnection *base = (TpBaseConnection *)self;
+ TpBaseConnection *base = (TpBaseConnection *) self;
g_assert (GABBLE_IS_CONNECTION (self));
@@ -2764,7 +2764,7 @@ gabble_connection_ensure_capabilities (GabbleConnection *self,
static void
conn_service_iface_init (gpointer g_iface, gpointer iface_data)
{
- TpSvcConnectionClass *klass = (TpSvcConnectionClass *)g_iface;
+ TpSvcConnectionClass *klass = (TpSvcConnectionClass *) g_iface;
#define IMPLEMENT(x) tp_svc_connection_implement_##x (klass, \
gabble_connection_##x)
@@ -2776,7 +2776,7 @@ static void
capabilities_service_iface_init (gpointer g_iface, gpointer iface_data)
{
TpSvcConnectionInterfaceCapabilitiesClass *klass =
- (TpSvcConnectionInterfaceCapabilitiesClass *)g_iface;
+ (TpSvcConnectionInterfaceCapabilitiesClass *) g_iface;
#define IMPLEMENT(x) tp_svc_connection_interface_capabilities_implement_##x (\
klass, gabble_connection_##x)
diff --git a/src/gabble.c b/src/gabble.c
index fbc1723..3780bdd 100644
--- a/src/gabble.c
+++ b/src/gabble.c
@@ -32,7 +32,7 @@
static TpBaseConnectionManager *
construct_cm (void)
{
- return (TpBaseConnectionManager *)g_object_new (
+ return (TpBaseConnectionManager *) g_object_new (
GABBLE_TYPE_CONNECTION_MANAGER, NULL);
}
diff --git a/src/im-channel.c b/src/im-channel.c
index b66b3c6..0940b66 100644
--- a/src/im-channel.c
+++ b/src/im-channel.c
@@ -89,7 +89,7 @@ struct _GabbleIMChannelPrivate
};
#define GABBLE_IM_CHANNEL_GET_PRIVATE(obj) \
- ((GabbleIMChannelPrivate *)obj->priv)
+ ((GabbleIMChannelPrivate *) obj->priv)
static void
gabble_im_channel_init (GabbleIMChannel *self)
@@ -114,7 +114,7 @@ gabble_im_channel_constructor (GType type, guint n_props,
obj = G_OBJECT_CLASS (gabble_im_channel_parent_class)->
constructor (type, n_props, props);
priv = GABBLE_IM_CHANNEL_GET_PRIVATE (GABBLE_IM_CHANNEL (obj));
- conn = (TpBaseConnection *)priv->conn;
+ conn = (TpBaseConnection *) priv->conn;
contact_handles = tp_base_connection_get_handles (conn,
TP_HANDLE_TYPE_CONTACT);
@@ -335,7 +335,7 @@ gabble_im_channel_finalize (GObject *object)
{
GabbleIMChannel *self = GABBLE_IM_CHANNEL (object);
GabbleIMChannelPrivate *priv = GABBLE_IM_CHANNEL_GET_PRIVATE (self);
- TpBaseConnection *conn = (TpBaseConnection *)priv->conn;
+ TpBaseConnection *conn = (TpBaseConnection *) priv->conn;
TpHandleRepoIface *contact_handles = tp_base_connection_get_handles (conn,
TP_HANDLE_TYPE_CONTACT);
@@ -604,7 +604,7 @@ gabble_im_channel_set_chat_state (TpSvcChannelInterfaceChatState *iface,
static void
channel_iface_init (gpointer g_iface, gpointer iface_data)
{
- TpSvcChannelClass *klass = (TpSvcChannelClass *)g_iface;
+ TpSvcChannelClass *klass = (TpSvcChannelClass *) g_iface;
#define IMPLEMENT(x) tp_svc_channel_implement_##x (\
klass, gabble_im_channel_##x)
@@ -618,7 +618,7 @@ channel_iface_init (gpointer g_iface, gpointer iface_data)
static void
text_iface_init (gpointer g_iface, gpointer iface_data)
{
- TpSvcChannelTypeTextClass *klass = (TpSvcChannelTypeTextClass *)g_iface;
+ TpSvcChannelTypeTextClass *klass = (TpSvcChannelTypeTextClass *) g_iface;
tp_text_mixin_iface_init (g_iface, iface_data);
#define IMPLEMENT(x) tp_svc_channel_type_text_implement_##x (\
@@ -631,7 +631,7 @@ static void
chat_state_iface_init (gpointer g_iface, gpointer iface_data)
{
TpSvcChannelInterfaceChatStateClass *klass =
- (TpSvcChannelInterfaceChatStateClass *)g_iface;
+ (TpSvcChannelInterfaceChatStateClass *) g_iface;
#define IMPLEMENT(x) tp_svc_channel_interface_chat_state_implement_##x (\
klass, gabble_im_channel_##x)
IMPLEMENT(set_chat_state);
diff --git a/src/im-factory.c b/src/im-factory.c
index 464a881..9932ce6 100644
--- a/src/im-factory.c
+++ b/src/im-factory.c
@@ -204,7 +204,7 @@ im_factory_message_cb (LmMessageHandler *handler,
{
GabbleImFactory *fac = GABBLE_IM_FACTORY (user_data);
GabbleImFactoryPrivate *priv = GABBLE_IM_FACTORY_GET_PRIVATE (fac);
- TpBaseConnection *conn = (TpBaseConnection *)priv->conn;
+ TpBaseConnection *conn = (TpBaseConnection *) priv->conn;
TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (conn,
TP_HANDLE_TYPE_CONTACT);
const gchar *from, *body;
@@ -273,7 +273,7 @@ im_factory_message_cb (LmMessageHandler *handler,
DEBUG ("got error sending to %s (handle %u), msgtype %u, body:\n%s",
from, handle, msgtype, body);
- tp_svc_channel_type_text_emit_send_error ((TpSvcChannelTypeText *)chan,
+ tp_svc_channel_type_text_emit_send_error ((TpSvcChannelTypeText *) chan,
send_error, stamp, msgtype, body);
return LM_HANDLER_RESULT_REMOVE_MESSAGE;
@@ -325,7 +325,7 @@ new_im_channel (GabbleImFactory *fac, TpHandle handle)
g_assert (GABBLE_IS_IM_FACTORY (fac));
priv = GABBLE_IM_FACTORY_GET_PRIVATE (fac);
- conn = (TpBaseConnection *)priv->conn;
+ conn = (TpBaseConnection *) priv->conn;
object_path = g_strdup_printf ("%s/ImChannel%u",
conn->object_path, handle);
@@ -342,7 +342,7 @@ new_im_channel (GabbleImFactory *fac, TpHandle handle)
g_hash_table_insert (priv->channels, GINT_TO_POINTER (handle), chan);
- tp_channel_factory_iface_emit_new_channel (fac, (TpChannelIface *)chan,
+ tp_channel_factory_iface_emit_new_channel (fac, (TpChannelIface *) chan,
NULL);
g_free (object_path);
@@ -448,7 +448,7 @@ gabble_im_factory_iface_request (TpChannelFactoryIface *iface,
GabbleImFactory *fac = GABBLE_IM_FACTORY (iface);
GabbleImFactoryPrivate *priv = GABBLE_IM_FACTORY_GET_PRIVATE (fac);
TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (
- (TpBaseConnection *)priv->conn, TP_HANDLE_TYPE_CONTACT);
+ (TpBaseConnection *) priv->conn, TP_HANDLE_TYPE_CONTACT);
GabbleIMChannel *chan;
TpChannelFactoryRequestStatus status;
diff --git a/src/media-channel.c b/src/media-channel.c
index 8bb71d8..fb3d93e 100644
--- a/src/media-channel.c
+++ b/src/media-channel.c
@@ -184,7 +184,7 @@ gabble_media_channel_constructor (GType type, guint n_props,
constructor (type, n_props, props);
priv = GABBLE_MEDIA_CHANNEL_GET_PRIVATE (GABBLE_MEDIA_CHANNEL (obj));
- conn = (TpBaseConnection *)priv->conn;
+ conn = (TpBaseConnection *) priv->conn;
contact_handles = tp_base_connection_get_handles (conn,
TP_HANDLE_TYPE_CONTACT);
@@ -352,13 +352,13 @@ _gabble_media_channel_dispatch_session_action (GabbleMediaChannel *chan,
set = tp_intset_new ();
tp_intset_add (set, mixin->self_handle);
- tp_group_mixin_change_members ((GObject *)chan,
+ tp_group_mixin_change_members ((GObject *) chan,
"", NULL, NULL, set, NULL, peer, 0);
tp_intset_destroy (set);
/* and update flags accordingly */
- tp_group_mixin_change_flags ((GObject *)chan,
+ tp_group_mixin_change_flags ((GObject *) chan,
TP_CHANNEL_GROUP_FLAG_CAN_ADD | TP_CHANNEL_GROUP_FLAG_CAN_REMOVE,
0);
}
@@ -1055,7 +1055,7 @@ gabble_media_channel_request_streams (TpSvcChannelTypeStreamedMedia *iface,
/* FIXME: disallow this if we've put the other guy on hold? */
priv = GABBLE_MEDIA_CHANNEL_GET_PRIVATE (self);
- conn = (TpBaseConnection *)priv->conn;
+ conn = (TpBaseConnection *) priv->conn;
contact_handles = tp_base_connection_get_handles (conn,
TP_HANDLE_TYPE_CONTACT);
@@ -1274,11 +1274,11 @@ session_terminated_cb (GabbleMediaSession *session,
tp_intset_add (set, mixin->self_handle);
tp_intset_add (set, peer);
- tp_group_mixin_change_members ((GObject *)channel,
+ tp_group_mixin_change_members ((GObject *) channel,
"", NULL, set, NULL, NULL, terminator, reason);
/* update flags accordingly -- allow adding, deny removal */
- tp_group_mixin_change_flags ((GObject *)channel,
+ tp_group_mixin_change_flags ((GObject *) channel,
TP_CHANNEL_GROUP_FLAG_CAN_ADD,
TP_CHANNEL_GROUP_FLAG_CAN_REMOVE);
@@ -1347,7 +1347,7 @@ session_state_changed_cb (GabbleMediaSession *session,
priv->creator == mixin->self_handle)
{
/* add the peer to the member list */
- tp_group_mixin_change_members ((GObject *)channel,
+ tp_group_mixin_change_members ((GObject *) channel,
"", set, NULL, NULL, NULL, 0, 0);
/* update flags accordingly -- allow removal, deny adding and
@@ -1810,7 +1810,7 @@ gabble_media_channel_request_hold (TpSvcChannelInterfaceHold *iface,
static void
channel_iface_init (gpointer g_iface, gpointer iface_data)
{
- TpSvcChannelClass *klass = (TpSvcChannelClass *)g_iface;
+ TpSvcChannelClass *klass = (TpSvcChannelClass *) g_iface;
#define IMPLEMENT(x, suffix) tp_svc_channel_implement_##x (\
klass, gabble_media_channel_##x##suffix)
@@ -1825,7 +1825,7 @@ static void
streamed_media_iface_init (gpointer g_iface, gpointer iface_data)
{
TpSvcChannelTypeStreamedMediaClass *klass =
- (TpSvcChannelTypeStreamedMediaClass *)g_iface;
+ (TpSvcChannelTypeStreamedMediaClass *) g_iface;
#define IMPLEMENT(x) tp_svc_channel_type_streamed_media_implement_##x (\
klass, gabble_media_channel_##x)
@@ -1840,7 +1840,7 @@ static void
media_signalling_iface_init (gpointer g_iface, gpointer iface_data)
{
TpSvcChannelInterfaceMediaSignallingClass *klass =
- (TpSvcChannelInterfaceMediaSignallingClass *)g_iface;
+ (TpSvcChannelInterfaceMediaSignallingClass *) g_iface;
#define IMPLEMENT(x) tp_svc_channel_interface_media_signalling_implement_##x (\
klass, gabble_media_channel_##x)
diff --git a/src/media-factory.c b/src/media-factory.c
index 0b66216..76b7d44 100644
--- a/src/media-factory.c
+++ b/src/media-factory.c
@@ -222,7 +222,7 @@ media_factory_jingle_cb (LmMessageHandler *handler,
GabbleMediaFactory *fac = GABBLE_MEDIA_FACTORY (user_data);
GabbleMediaFactoryPrivate *priv = GABBLE_MEDIA_FACTORY_GET_PRIVATE (fac);
TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (
- (TpBaseConnection *)priv->conn, TP_HANDLE_TYPE_CONTACT);
+ (TpBaseConnection *) priv->conn, TP_HANDLE_TYPE_CONTACT);
LmMessageNode *iq_node, *session_node;
const gchar *from, *id, *action, *sid, *resource;
TpHandle handle = 0;
@@ -336,7 +336,7 @@ media_factory_jingle_cb (LmMessageHandler *handler,
{
if (chan_is_new)
tp_channel_factory_iface_emit_new_channel (fac,
- (TpChannelIface *)chan, NULL);
+ (TpChannelIface *) chan, NULL);
}
else
{
@@ -484,7 +484,7 @@ new_media_channel (GabbleMediaFactory *fac, TpHandle creator)
g_assert (GABBLE_IS_MEDIA_FACTORY (fac));
priv = GABBLE_MEDIA_FACTORY_GET_PRIVATE (fac);
- conn = (TpBaseConnection *)priv->conn;
+ conn = (TpBaseConnection *) priv->conn;
object_path = g_strdup_printf ("%s/MediaChannel%u",
conn->object_path, priv->channel_index);
@@ -805,7 +805,7 @@ gabble_media_factory_iface_request (TpChannelFactoryIface *iface,
{
GabbleMediaFactory *fac = GABBLE_MEDIA_FACTORY (iface);
GabbleMediaFactoryPrivate *priv = GABBLE_MEDIA_FACTORY_GET_PRIVATE (fac);
- TpBaseConnection *conn = (TpBaseConnection *)priv->conn;
+ TpBaseConnection *conn = (TpBaseConnection *) priv->conn;
GabbleMediaChannel *chan = NULL;
if (strcmp (chan_type, TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA))
@@ -820,7 +820,7 @@ gabble_media_factory_iface_request (TpChannelFactoryIface *iface,
{
chan = new_media_channel (fac, conn->self_handle);
- if (!_gabble_media_channel_add_member ((GObject *)chan, handle, "",
+ if (!_gabble_media_channel_add_member ((GObject *) chan, handle, "",
error))
{
gabble_media_channel_close (chan);
@@ -834,7 +834,7 @@ gabble_media_factory_iface_request (TpChannelFactoryIface *iface,
}
g_assert (chan != NULL);
- tp_channel_factory_iface_emit_new_channel (fac, (TpChannelIface *)chan,
+ tp_channel_factory_iface_emit_new_channel (fac, (TpChannelIface *) chan,
request);
*ret = TP_CHANNEL_IFACE (chan);
diff --git a/src/media-session.c b/src/media-session.c
index 6001797..2928c59 100644
--- a/src/media-session.c
+++ b/src/media-session.c
@@ -115,7 +115,7 @@ struct _GabbleMediaSessionPrivate
};
#define GABBLE_MEDIA_SESSION_GET_PRIVATE(obj) \
- ((GabbleMediaSessionPrivate *)obj->priv)
+ ((GabbleMediaSessionPrivate *) obj->priv)
typedef struct {
gchar *name;
@@ -2092,7 +2092,7 @@ get_jid_for_contact (GabbleMediaSession *session,
g_assert (GABBLE_IS_MEDIA_SESSION (session));
priv = GABBLE_MEDIA_SESSION_GET_PRIVATE (session);
- conn = (TpBaseConnection *)priv->conn;
+ conn = (TpBaseConnection *) priv->conn;
contact_handles = tp_base_connection_get_handles (conn,
TP_HANDLE_TYPE_CONTACT);
self = conn->self_handle;
@@ -2132,7 +2132,7 @@ _gabble_media_session_message_new (GabbleMediaSession *session,
g_assert (GABBLE_IS_MEDIA_SESSION (session));
priv = GABBLE_MEDIA_SESSION_GET_PRIVATE (session);
- conn = (TpBaseConnection *)priv->conn;
+ conn = (TpBaseConnection *) priv->conn;
peer_jid = get_jid_for_contact (session, priv->peer);
@@ -2396,7 +2396,7 @@ _gabble_media_session_terminate (GabbleMediaSession *session,
TpChannelGroupChangeReason why)
{
GabbleMediaSessionPrivate *priv = GABBLE_MEDIA_SESSION_GET_PRIVATE (session);
- TpBaseConnection *conn = (TpBaseConnection *)priv->conn;
+ TpBaseConnection *conn = (TpBaseConnection *) priv->conn;
TpHandle actor;
if (priv->state == JS_STATE_ENDED)
@@ -2928,7 +2928,7 @@ static void
session_handler_iface_init (gpointer g_iface, gpointer iface_data)
{
TpSvcMediaSessionHandlerClass *klass =
- (TpSvcMediaSessionHandlerClass *)g_iface;
+ (TpSvcMediaSessionHandlerClass *) g_iface;
#define IMPLEMENT(x) tp_svc_media_session_handler_implement_##x (\
klass, gabble_media_session_##x)
diff --git a/src/media-stream.c b/src/media-stream.c
index 3d90bb3..90a15de 100644
--- a/src/media-stream.c
+++ b/src/media-stream.c
@@ -119,7 +119,7 @@ struct _GabbleMediaStreamPrivate
};
#define GABBLE_MEDIA_STREAM_GET_PRIVATE(obj) \
- ((GabbleMediaStreamPrivate *)obj->priv)
+ ((GabbleMediaStreamPrivate *) obj->priv)
#ifdef ENABLE_DEBUG
#if _GMS_DEBUG_LEVEL > 1
@@ -1824,7 +1824,7 @@ static void
stream_handler_iface_init (gpointer g_iface, gpointer iface_data)
{
TpSvcMediaStreamHandlerClass *klass =
- (TpSvcMediaStreamHandlerClass *)g_iface;
+ (TpSvcMediaStreamHandlerClass *) g_iface;
#define IMPLEMENT(x,suffix) tp_svc_media_stream_handler_implement_##x (\
klass, gabble_media_stream_##x##suffix)
diff --git a/src/muc-channel.c b/src/muc-channel.c
index 49c7242..8a57695 100644
--- a/src/muc-channel.c
+++ b/src/muc-channel.c
@@ -285,7 +285,7 @@ gabble_muc_channel_constructor (GType type, guint n_props,
constructor (type, n_props, props);
priv = GABBLE_MUC_CHANNEL_GET_PRIVATE (obj);
- conn = (TpBaseConnection *)priv->conn;
+ conn = (TpBaseConnection *) priv->conn;
room_handles = tp_base_connection_get_handles (conn, TP_HANDLE_TYPE_ROOM);
contact_handles = tp_base_connection_get_handles (conn,
@@ -612,7 +612,7 @@ contact_handle_to_room_identity (GabbleMucChannel *chan, TpHandle main_handle,
gchar *username, *jid;
priv = GABBLE_MUC_CHANNEL_GET_PRIVATE (chan);
- conn = (TpBaseConnection *)priv->conn;
+ conn = (TpBaseConnection *) priv->conn;
contact_repo = tp_base_connection_get_handles (conn, TP_HANDLE_TYPE_CONTACT);
main_jid = tp_handle_inspect (contact_repo, main_handle);
@@ -999,7 +999,7 @@ gabble_muc_channel_finalize (GObject *object)
GabbleMucChannel *self = GABBLE_MUC_CHANNEL (object);
GabbleMucChannelPrivate *priv = GABBLE_MUC_CHANNEL_GET_PRIVATE (self);
TpHandleRepoIface *room_handles = tp_base_connection_get_handles (
- (TpBaseConnection *)priv->conn, TP_HANDLE_TYPE_ROOM);
+ (TpBaseConnection *) priv->conn, TP_HANDLE_TYPE_ROOM);
DEBUG ("called");
@@ -1203,7 +1203,7 @@ close_channel (GabbleMucChannel *chan, const gchar *reason,
set = tp_intset_new ();
tp_intset_add (set, TP_GROUP_MIXIN (chan)->self_handle);
- tp_group_mixin_change_members ((GObject *)chan,
+ tp_group_mixin_change_members ((GObject *) chan,
(reason != NULL) ? reason : "",
NULL, set, NULL, NULL, actor,
reason_code);
@@ -1678,7 +1678,7 @@ _gabble_muc_channel_member_presence_updated (GabbleMucChannel *chan,
g_assert (handle != 0);
priv = GABBLE_MUC_CHANNEL_GET_PRIVATE (chan);
- conn = (TpBaseConnection *)priv->conn;
+ conn = (TpBaseConnection *) priv->conn;
contact_handles = tp_base_connection_get_handles (conn,
TP_HANDLE_TYPE_CONTACT);
@@ -1925,7 +1925,7 @@ _gabble_muc_channel_member_presence_updated (GabbleMucChannel *chan,
if (handle != mixin->self_handle)
{
- tp_group_mixin_change_members ((GObject *)chan, reason,
+ tp_group_mixin_change_members ((GObject *) chan, reason,
NULL, set, NULL, NULL,
actor, reason_code);
}
@@ -2127,7 +2127,7 @@ _gabble_muc_channel_handle_invited (GabbleMucChannel *chan,
g_assert (GABBLE_IS_MUC_CHANNEL (chan));
priv = GABBLE_MUC_CHANNEL_GET_PRIVATE (chan);
- conn = (TpBaseConnection *)priv->conn;
+ conn = (TpBaseConnection *) priv->conn;
contact_handles = tp_base_connection_get_handles (conn,
TP_HANDLE_TYPE_CONTACT);
@@ -2145,7 +2145,7 @@ _gabble_muc_channel_handle_invited (GabbleMucChannel *chan,
tp_group_mixin_add_handle_owner ((GObject *) chan, self_handle,
conn->self_handle);
- tp_group_mixin_change_members ((GObject *)chan, message, set_members,
+ tp_group_mixin_change_members ((GObject *) chan, message, set_members,
NULL, set_pending, NULL, inviter,
TP_CHANNEL_GROUP_CHANGE_REASON_INVITED);
@@ -3009,7 +3009,7 @@ gabble_muc_channel_send_presence (GabbleMucChannel *self,
static void
channel_iface_init (gpointer g_iface, gpointer iface_data)
{
- TpSvcChannelClass *klass = (TpSvcChannelClass *)g_iface;
+ TpSvcChannelClass *klass = (TpSvcChannelClass *) g_iface;
#define IMPLEMENT(x) tp_svc_channel_implement_##x (\
klass, gabble_muc_channel_##x)
@@ -3023,7 +3023,7 @@ channel_iface_init (gpointer g_iface, gpointer iface_data)
static void
text_iface_init (gpointer g_iface, gpointer iface_data)
{
- TpSvcChannelTypeTextClass *klass = (TpSvcChannelTypeTextClass *)g_iface;
+ TpSvcChannelTypeTextClass *klass = (TpSvcChannelTypeTextClass *) g_iface;
tp_text_mixin_iface_init (g_iface, iface_data);
#define IMPLEMENT(x) tp_svc_channel_type_text_implement_##x (\
@@ -3036,7 +3036,7 @@ static void
password_iface_init (gpointer g_iface, gpointer iface_data)
{
TpSvcChannelInterfacePasswordClass *klass =
- (TpSvcChannelInterfacePasswordClass *)g_iface;
+ (TpSvcChannelInterfacePasswordClass *) g_iface;
#define IMPLEMENT(x) tp_svc_channel_interface_password_implement_##x (\
klass, gabble_muc_channel_##x)
@@ -3049,7 +3049,7 @@ static void
chat_state_iface_init (gpointer g_iface, gpointer iface_data)
{
TpSvcChannelInterfaceChatStateClass *klass =
- (TpSvcChannelInterfaceChatStateClass *)g_iface;
+ (TpSvcChannelInterfaceChatStateClass *) g_iface;
#define IMPLEMENT(x) tp_svc_channel_interface_chat_state_implement_##x (\
klass, gabble_muc_channel_##x)
diff --git a/src/presence-cache.c b/src/presence-cache.c
index 4f62e2c..76b6be7 100644
--- a/src/presence-cache.c
+++ b/src/presence-cache.c
@@ -62,7 +62,7 @@ enum
static guint signals[LAST_SIGNAL] = { 0 };
#define GABBLE_PRESENCE_CACHE_PRIV(account) \
- ((GabblePresenceCachePrivate *)account->priv)
+ ((GabblePresenceCachePrivate *) account->priv)
typedef struct _GabblePresenceCachePrivate GabblePresenceCachePrivate;
@@ -423,7 +423,7 @@ gabble_presence_cache_set_property (GObject *object,
case PROP_CONNECTION:
priv->conn = g_value_get_object (value);
contact_repo = tp_base_connection_get_handles (
- (TpBaseConnection *)priv->conn, TP_HANDLE_TYPE_CONTACT);
+ (TpBaseConnection *) priv->conn, TP_HANDLE_TYPE_CONTACT);
new_presence_handles = tp_handle_set_new (contact_repo);
@@ -708,7 +708,7 @@ _caps_disco_cb (GabbleDisco *disco,
cache = GABBLE_PRESENCE_CACHE (user_data);
priv = GABBLE_PRESENCE_CACHE_PRIV (cache);
contact_repo = tp_base_connection_get_handles (
- (TpBaseConnection *)priv->conn, TP_HANDLE_TYPE_CONTACT);
+ (TpBaseConnection *) priv->conn, TP_HANDLE_TYPE_CONTACT);
if (NULL == node)
{
@@ -960,7 +960,7 @@ _process_caps_uri (GabblePresenceCache *cache,
priv = GABBLE_PRESENCE_CACHE_PRIV (cache);
contact_repo = tp_base_connection_get_handles (
- (TpBaseConnection *)priv->conn, TP_HANDLE_TYPE_CONTACT);
+ (TpBaseConnection *) priv->conn, TP_HANDLE_TYPE_CONTACT);
info = capability_info_get (cache, uri, 0);
if (info->trust >= CAPABILITY_BUNDLE_ENOUGH_TRUST
@@ -1223,7 +1223,7 @@ gabble_presence_cache_lm_message_cb (LmMessageHandler *handler,
GabblePresenceCache *cache = GABBLE_PRESENCE_CACHE (user_data);
GabblePresenceCachePrivate *priv = GABBLE_PRESENCE_CACHE_PRIV (cache);
TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (
- (TpBaseConnection *)priv->conn, TP_HANDLE_TYPE_CONTACT);
+ (TpBaseConnection *) priv->conn, TP_HANDLE_TYPE_CONTACT);
const char *from;
LmHandlerResult ret;
TpHandle handle;
@@ -1277,7 +1277,7 @@ gabble_presence_cache_get (GabblePresenceCache *cache, TpHandle handle)
{
GabblePresenceCachePrivate *priv = GABBLE_PRESENCE_CACHE_PRIV (cache);
TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (
- (TpBaseConnection *)priv->conn, TP_HANDLE_TYPE_CONTACT);
+ (TpBaseConnection *) priv->conn, TP_HANDLE_TYPE_CONTACT);
g_assert (tp_handle_is_valid (contact_repo, handle, NULL));
@@ -1291,7 +1291,7 @@ gabble_presence_cache_maybe_remove (
{
GabblePresenceCachePrivate *priv = GABBLE_PRESENCE_CACHE_PRIV (cache);
TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (
- (TpBaseConnection *)priv->conn, TP_HANDLE_TYPE_CONTACT);
+ (TpBaseConnection *) priv->conn, TP_HANDLE_TYPE_CONTACT);
GabblePresence *presence;
presence = gabble_presence_cache_get (cache, handle);
@@ -1337,7 +1337,7 @@ gabble_presence_cache_update (
{
GabblePresenceCachePrivate *priv = GABBLE_PRESENCE_CACHE_PRIV (cache);
TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (
- (TpBaseConnection *)priv->conn, TP_HANDLE_TYPE_CONTACT);
+ (TpBaseConnection *) priv->conn, TP_HANDLE_TYPE_CONTACT);
const gchar *jid;
GabblePresence *presence;
GabblePresenceCapabilities caps_before;
@@ -1381,7 +1381,7 @@ gabble_presence_cache_really_remove (
{
GabblePresenceCachePrivate *priv = GABBLE_PRESENCE_CACHE_PRIV (cache);
TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (
- (TpBaseConnection *)priv->conn, TP_HANDLE_TYPE_CONTACT);
+ (TpBaseConnection *) priv->conn, TP_HANDLE_TYPE_CONTACT);
const gchar *jid;
jid = tp_handle_inspect (contact_repo, handle);
diff --git a/src/presence.c b/src/presence.c
index 4807935..3d81ea9 100644
--- a/src/presence.c
+++ b/src/presence.c
@@ -34,7 +34,7 @@
G_DEFINE_TYPE (GabblePresence, gabble_presence, G_TYPE_OBJECT);
-#define GABBLE_PRESENCE_PRIV(account) ((GabblePresencePrivate *)account->priv)
+#define GABBLE_PRESENCE_PRIV(account) ((GabblePresencePrivate *) account->priv)
typedef struct _Resource Resource;
@@ -107,7 +107,7 @@ gabble_presence_init (GabblePresence *self)
{
self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
GABBLE_TYPE_PRESENCE, GabblePresencePrivate);
- ((GabblePresencePrivate *)self->priv)->resources = NULL;
+ ((GabblePresencePrivate *) self->priv)->resources = NULL;
}
GabblePresence*
diff --git a/src/private-tubes-factory.c b/src/private-tubes-factory.c
index decc49b..baa0e2f 100644
--- a/src/private-tubes-factory.c
+++ b/src/private-tubes-factory.c
@@ -397,7 +397,7 @@ gabble_private_tubes_factory_iface_request (TpChannelFactoryIface *iface,
{
status = TP_CHANNEL_FACTORY_REQUEST_STATUS_CREATED;
chan = new_tubes_channel (fac, handle);
- tp_channel_factory_iface_emit_new_channel (fac, (TpChannelIface *)chan,
+ tp_channel_factory_iface_emit_new_channel (fac, (TpChannelIface *) chan,
request);
}
diff --git a/src/pubsub.c b/src/pubsub.c
index e6d6b9a..fd1a52d 100644
--- a/src/pubsub.c
+++ b/src/pubsub.c
@@ -141,7 +141,7 @@ pubsub_msg_event_cb (LmMessageHandler *handler,
{
GabbleConnection *conn = GABBLE_CONNECTION (user_data);
TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (
- (TpBaseConnection *)conn, TP_HANDLE_TYPE_CONTACT);
+ (TpBaseConnection *) conn, TP_HANDLE_TYPE_CONTACT);
LmMessageNode *node;
TpHandle handle;
const gchar *event_ns, *from;
diff --git a/src/roomlist-channel.c b/src/roomlist-channel.c
index a687370..ffe9903 100644
--- a/src/roomlist-channel.c
+++ b/src/roomlist-channel.c
@@ -100,7 +100,7 @@ struct _GabbleRoomlistChannelPrivate
};
#define GABBLE_ROOMLIST_CHANNEL_GET_PRIVATE(obj) \
- ((GabbleRoomlistChannelPrivate *)obj->priv)
+ ((GabbleRoomlistChannelPrivate *) obj->priv)
#define ROOM_SIGNAL_INTERVAL 300
@@ -200,7 +200,7 @@ gabble_roomlist_channel_set_property (GObject *object,
break;
case PROP_CONNECTION:
priv->conn = g_value_get_object (value);
- conn = (TpBaseConnection *)priv->conn;
+ conn = (TpBaseConnection *) priv->conn;
room_handles = tp_base_connection_get_handles (conn,
TP_HANDLE_TYPE_ROOM);
@@ -326,7 +326,7 @@ gabble_roomlist_channel_dispose (GObject *object)
if (!priv->closed)
{
- tp_svc_channel_emit_closed ((TpSvcChannel *)object);
+ tp_svc_channel_emit_closed ((TpSvcChannel *) object);
priv->closed = TRUE;
}
@@ -387,7 +387,7 @@ emit_room_signal (gpointer data)
return TRUE;
tp_svc_channel_type_room_list_emit_got_rooms (
- (TpSvcChannelTypeRoomList *)chan, priv->pending_room_signals);
+ (TpSvcChannelTypeRoomList *) chan, priv->pending_room_signals);
while (priv->pending_room_signals->len != 0)
{
@@ -423,7 +423,7 @@ room_info_cb (gpointer pipeline, GabbleDiscoItem *item, gpointer user_data)
g_assert (GABBLE_IS_ROOMLIST_CHANNEL (chan));
priv = GABBLE_ROOMLIST_CHANNEL_GET_PRIVATE (chan);
room_handles = tp_base_connection_get_handles (
- (TpBaseConnection *)priv->conn, TP_HANDLE_TYPE_ROOM);
+ (TpBaseConnection *) priv->conn, TP_HANDLE_TYPE_ROOM);
jid = item->jid;
name = item->name;
@@ -537,7 +537,7 @@ rooms_end_cb (gpointer data, gpointer user_data)
priv->listing = FALSE;
tp_svc_channel_type_room_list_emit_listing_rooms (
- (TpSvcChannelTypeRoomList *)chan, FALSE);
+ (TpSvcChannelTypeRoomList *) chan, FALSE);
g_source_remove (priv->timer_source_id);
priv->timer_source_id = 0;
@@ -554,7 +554,7 @@ stop_listing (GabbleRoomlistChannel *self)
emit_room_signal (self);
priv->listing = FALSE;
tp_svc_channel_type_room_list_emit_listing_rooms (
- (TpSvcChannelTypeRoomList *)self, FALSE);
+ (TpSvcChannelTypeRoomList *) self, FALSE);
}
if (priv->disco_pipeline != NULL)
@@ -727,7 +727,7 @@ gabble_roomlist_channel_stop_listing (TpSvcChannelTypeRoomList *iface,
static void
channel_iface_init (gpointer g_iface, gpointer iface_data)
{
- TpSvcChannelClass *klass = (TpSvcChannelClass *)g_iface;
+ TpSvcChannelClass *klass = (TpSvcChannelClass *) g_iface;
#define IMPLEMENT(x) tp_svc_channel_implement_##x (\
klass, gabble_roomlist_channel_##x)
@@ -742,7 +742,7 @@ static void
roomlist_iface_init (gpointer g_iface, gpointer iface_data)
{
TpSvcChannelTypeRoomListClass *klass =
- (TpSvcChannelTypeRoomListClass *)g_iface;
+ (TpSvcChannelTypeRoomListClass *) g_iface;
#define IMPLEMENT(x) tp_svc_channel_type_room_list_implement_##x (\
klass, gabble_roomlist_channel_##x)
diff --git a/src/roster-channel.c b/src/roster-channel.c
index 5ffd191..51765b3 100644
--- a/src/roster-channel.c
+++ b/src/roster-channel.c
@@ -82,7 +82,7 @@ struct _GabbleRosterChannelPrivate
};
#define GABBLE_ROSTER_CHANNEL_GET_PRIVATE(obj) \
- ((GabbleRosterChannelPrivate *)obj->priv)
+ ((GabbleRosterChannelPrivate *) obj->priv)
static void
gabble_roster_channel_init (GabbleRosterChannel *self)
@@ -110,7 +110,7 @@ gabble_roster_channel_constructor (GType type, guint n_props,
obj = G_OBJECT_CLASS (gabble_roster_channel_parent_class)->
constructor (type, n_props, props);
priv = GABBLE_ROSTER_CHANNEL_GET_PRIVATE (GABBLE_ROSTER_CHANNEL (obj));
- conn = (TpBaseConnection *)priv->conn;
+ conn = (TpBaseConnection *) priv->conn;
handle_type = priv->handle_type;
handle_repo = tp_base_connection_get_handles (conn, handle_type);
contact_repo = tp_base_connection_get_handles (conn, TP_HANDLE_TYPE_CONTACT);
@@ -341,7 +341,7 @@ gabble_roster_channel_dispose (GObject *object)
priv->dispose_has_run = TRUE;
if (!priv->closed)
- tp_svc_channel_emit_closed ((TpSvcChannel *)object);
+ tp_svc_channel_emit_closed ((TpSvcChannel *) object);
/* release any references held by the object here */
@@ -354,7 +354,7 @@ gabble_roster_channel_finalize (GObject *object)
{
GabbleRosterChannel *self = GABBLE_ROSTER_CHANNEL (object);
GabbleRosterChannelPrivate *priv = GABBLE_ROSTER_CHANNEL_GET_PRIVATE (self);
- TpBaseConnection *conn = (TpBaseConnection *)priv->conn;
+ TpBaseConnection *conn = (TpBaseConnection *) priv->conn;
TpHandleRepoIface *handle_repo = tp_base_connection_get_handles (conn,
priv->handle_type);
@@ -385,7 +385,7 @@ _gabble_roster_channel_send_presence (GabbleRosterChannel *chan,
gboolean result;
priv = GABBLE_ROSTER_CHANNEL_GET_PRIVATE (chan);
- conn = (TpBaseConnection *)priv->conn;
+ conn = (TpBaseConnection *) priv->conn;
repo = tp_base_connection_get_handles (conn, TP_HANDLE_TYPE_CONTACT);
contact = tp_handle_inspect (repo, handle);
@@ -426,10 +426,10 @@ _gabble_roster_channel_add_member_cb (GObject *obj,
priv = GABBLE_ROSTER_CHANNEL_GET_PRIVATE (GABBLE_ROSTER_CHANNEL (obj));
#ifdef ENABLE_DEBUG
- handle_repo = tp_base_connection_get_handles ((TpBaseConnection *)priv->conn,
+ handle_repo = tp_base_connection_get_handles ((TpBaseConnection *) priv->conn,
priv->handle_type);
contact_repo = tp_base_connection_get_handles (
- (TpBaseConnection *)priv->conn, TP_HANDLE_TYPE_CONTACT);
+ (TpBaseConnection *) priv->conn, TP_HANDLE_TYPE_CONTACT);
#endif
DEBUG ("called on %s with handle %u (%s) \"%s\"",
@@ -500,7 +500,7 @@ _gabble_roster_channel_remove_member_cb (GObject *obj,
priv = GABBLE_ROSTER_CHANNEL_GET_PRIVATE (GABBLE_ROSTER_CHANNEL (obj));
#ifdef ENABLE_DEBUG
- conn = (TpBaseConnection *)priv->conn;
+ conn = (TpBaseConnection *) priv->conn;
handle_repo = tp_base_connection_get_handles (conn, priv->handle_type);
contact_repo = tp_base_connection_get_handles (conn, TP_HANDLE_TYPE_CONTACT);
#endif
@@ -602,7 +602,7 @@ gabble_roster_channel_close (TpSvcChannel *iface,
* so just close the channel */
priv->closed = TRUE;
- tp_svc_channel_emit_closed ((TpSvcChannel *)self);
+ tp_svc_channel_emit_closed ((TpSvcChannel *) self);
tp_svc_channel_return_from_close (context);
return;
}
@@ -673,7 +673,7 @@ gabble_roster_channel_get_interfaces (TpSvcChannel *self,
static void
channel_iface_init (gpointer g_iface, gpointer iface_data)
{
- TpSvcChannelClass *klass = (TpSvcChannelClass *)g_iface;
+ TpSvcChannelClass *klass = (TpSvcChannelClass *) g_iface;
#define IMPLEMENT(x) tp_svc_channel_implement_##x (\
klass, gabble_roster_channel_##x)
diff --git a/src/roster.c b/src/roster.c
index 08c1a52..ef36ca5 100644
--- a/src/roster.c
+++ b/src/roster.c
@@ -230,7 +230,7 @@ item_handle_unref_foreach (gpointer key, gpointer data, gpointer user_data)
TpHandle handle = GPOINTER_TO_UINT (key);
GabbleRosterPrivate *priv = (GabbleRosterPrivate *) user_data;
TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (
- (TpBaseConnection *)priv->conn, TP_HANDLE_TYPE_CONTACT);
+ (TpBaseConnection *) priv->conn, TP_HANDLE_TYPE_CONTACT);
tp_handle_unref (contact_repo, handle);
}
@@ -455,9 +455,9 @@ _gabble_roster_item_get (GabbleRoster *roster,
{
GabbleRosterPrivate *priv = GABBLE_ROSTER_GET_PRIVATE (roster);
TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (
- (TpBaseConnection *)priv->conn, TP_HANDLE_TYPE_CONTACT);
+ (TpBaseConnection *) priv->conn, TP_HANDLE_TYPE_CONTACT);
TpHandleRepoIface *group_repo = tp_base_connection_get_handles (
- (TpBaseConnection *)priv->conn, TP_HANDLE_TYPE_GROUP);
+ (TpBaseConnection *) priv->conn, TP_HANDLE_TYPE_GROUP);
GabbleRosterItem *item;
g_assert (roster != NULL);
@@ -497,7 +497,7 @@ _gabble_roster_item_remove (GabbleRoster *roster,
{
GabbleRosterPrivate *priv = GABBLE_ROSTER_GET_PRIVATE (roster);
TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (
- (TpBaseConnection *)priv->conn, TP_HANDLE_TYPE_CONTACT);
+ (TpBaseConnection *) priv->conn, TP_HANDLE_TYPE_CONTACT);
g_assert (roster != NULL);
g_assert (GABBLE_IS_ROSTER (roster));
@@ -556,7 +556,7 @@ group_mem_update_ensure (GroupsUpdateContext *ctx,
static void
_update_add_to_group (guint group_handle, gpointer user_data)
{
- GroupsUpdateContext *ctx = (GroupsUpdateContext *)user_data;
+ GroupsUpdateContext *ctx = (GroupsUpdateContext *) user_data;
GroupMembershipUpdate *update = group_mem_update_ensure (ctx, group_handle);
DEBUG ("- contact#%u added to group#%u", ctx->contact_handle,
@@ -567,7 +567,7 @@ _update_add_to_group (guint group_handle, gpointer user_data)
static void
_update_remove_from_group (guint group_handle, gpointer user_data)
{
- GroupsUpdateContext *ctx = (GroupsUpdateContext *)user_data;
+ GroupsUpdateContext *ctx = (GroupsUpdateContext *) user_data;
GroupMembershipUpdate *update = group_mem_update_ensure (ctx, group_handle);
DEBUG ("- contact#%u removed from group#%u", ctx->contact_handle,
@@ -648,7 +648,7 @@ _gabble_roster_item_update (GabbleRoster *roster,
}
new_groups_handle_set = _parse_item_groups (node,
- (TpBaseConnection *)priv->conn);
+ (TpBaseConnection *) priv->conn);
new_groups = tp_handle_set_peek (new_groups_handle_set);
removed_from = tp_intset_difference (tp_handle_set_peek (item->groups),
@@ -677,7 +677,7 @@ _gabble_roster_item_update (GabbleRoster *roster,
static void
_gabble_roster_item_dump_group (guint handle, gpointer user_data)
{
- g_string_append_printf ((GString *)user_data, "group#%u ", handle);
+ g_string_append_printf ((GString *) user_data, "group#%u ", handle);
}
static gchar *
@@ -782,12 +782,12 @@ _gabble_roster_item_to_message (GabbleRoster *roster,
{
GabbleRosterPrivate *priv = GABBLE_ROSTER_GET_PRIVATE (roster);
TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (
- (TpBaseConnection *)priv->conn, TP_HANDLE_TYPE_CONTACT);
+ (TpBaseConnection *) priv->conn, TP_HANDLE_TYPE_CONTACT);
LmMessage *message;
LmMessageNode *query_node, *item_node;
const gchar *jid;
struct _ItemToMessageContext ctx = {
- (TpBaseConnection *)priv->conn,
+ (TpBaseConnection *) priv->conn,
};
g_assert (roster != NULL);
@@ -846,7 +846,7 @@ _gabble_roster_create_channel (GabbleRoster *roster,
TpHandle handle)
{
GabbleRosterPrivate *priv = GABBLE_ROSTER_GET_PRIVATE (roster);
- TpBaseConnection *conn = (TpBaseConnection *)priv->conn;
+ TpBaseConnection *conn = (TpBaseConnection *) priv->conn;
TpHandleRepoIface *handle_repo = tp_base_connection_get_handles (conn,
handle_type);
GabbleRosterChannel *chan;
@@ -891,7 +891,7 @@ _gabble_roster_create_channel (GabbleRoster *roster,
object_path);
tp_channel_factory_iface_emit_new_channel (roster,
- (TpChannelIface *)chan, NULL);
+ (TpChannelIface *) chan, NULL);
}
else
{
@@ -911,7 +911,7 @@ _gabble_roster_get_channel (GabbleRoster *roster,
{
GabbleRosterPrivate *priv = GABBLE_ROSTER_GET_PRIVATE (roster);
TpHandleRepoIface *handle_repo = tp_base_connection_get_handles (
- (TpBaseConnection *)priv->conn, handle_type);
+ (TpBaseConnection *) priv->conn, handle_type);
GabbleRosterChannel *chan;
GHashTable *channels = (handle_type == TP_HANDLE_TYPE_LIST
? priv->list_channels
@@ -958,7 +958,7 @@ _gabble_roster_emit_one (gpointer key,
#ifdef ENABLE_DEBUG
GabbleRosterPrivate *priv = GABBLE_ROSTER_GET_PRIVATE (roster);
TpHandleRepoIface *handle_repo = tp_base_connection_get_handles (
- (TpBaseConnection *)priv->conn, data_struct->handle_type);
+ (TpBaseConnection *) priv->conn, data_struct->handle_type);
TpHandle handle = GPOINTER_TO_INT (key);
const gchar *name;
@@ -971,7 +971,7 @@ _gabble_roster_emit_one (gpointer key,
name);
#endif
- tp_channel_factory_iface_emit_new_channel (roster, (TpChannelIface *)chan,
+ tp_channel_factory_iface_emit_new_channel (roster, (TpChannelIface *) chan,
NULL);
}
@@ -1048,7 +1048,7 @@ gabble_roster_iq_cb (LmMessageHandler *handler,
{
GabbleRoster *roster = GABBLE_ROSTER (user_data);
GabbleRosterPrivate *priv = GABBLE_ROSTER_GET_PRIVATE (roster);
- TpBaseConnection *conn = (TpBaseConnection *)priv->conn;
+ TpBaseConnection *conn = (TpBaseConnection *) priv->conn;
TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (conn,
TP_HANDLE_TYPE_CONTACT);
LmMessageNode *iq_node, *query_node;
@@ -1329,7 +1329,7 @@ gabble_roster_iq_cb (LmMessageHandler *handler,
NULL);
DEBUG ("calling change members on known channel");
- tp_group_mixin_change_members ((GObject *)chan,
+ tp_group_mixin_change_members ((GObject *) chan,
"", known_add, known_rem, NULL, NULL, 0, 0);
DEBUG ("calling change members on any group channels");
@@ -1342,7 +1342,7 @@ gabble_roster_iq_cb (LmMessageHandler *handler,
handle, NULL);
DEBUG ("calling change members on deny channel");
- tp_group_mixin_change_members ((GObject *)chan,
+ tp_group_mixin_change_members ((GObject *) chan,
"", deny_add, deny_rem, NULL, NULL, 0, 0);
tp_intset_destroy (deny_add);
@@ -1447,7 +1447,7 @@ gabble_roster_presence_cb (LmMessageHandler *handler,
{
GabbleRoster *roster = GABBLE_ROSTER (user_data);
GabbleRosterPrivate *priv = GABBLE_ROSTER_GET_PRIVATE (roster);
- TpBaseConnection *conn = (TpBaseConnection *)priv->conn;
+ TpBaseConnection *conn = (TpBaseConnection *) priv->conn;
TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (conn,
TP_HANDLE_TYPE_CONTACT);
LmMessageNode *pres_node, *child_node;
@@ -1512,7 +1512,7 @@ gabble_roster_presence_cb (LmMessageHandler *handler,
list_handle = GABBLE_LIST_HANDLE_PUBLISH;
chan = _gabble_roster_get_channel (roster, TP_HANDLE_TYPE_LIST,
list_handle, NULL);
- tp_group_mixin_change_members ((GObject *)chan, status_message,
+ tp_group_mixin_change_members ((GObject *) chan, status_message,
NULL, NULL, tmp, NULL, 0, 0);
tp_intset_destroy (tmp);
@@ -1529,7 +1529,7 @@ gabble_roster_presence_cb (LmMessageHandler *handler,
list_handle = GABBLE_LIST_HANDLE_PUBLISH;
chan = _gabble_roster_get_channel (roster, TP_HANDLE_TYPE_LIST,
list_handle, NULL);
- changed = tp_group_mixin_change_members ((GObject *)chan,
+ changed = tp_group_mixin_change_members ((GObject *) chan,
status_message, NULL, tmp, NULL, NULL, 0, 0);
_gabble_roster_send_presence_ack (roster, from, sub_type, changed);
@@ -1548,7 +1548,7 @@ gabble_roster_presence_cb (LmMessageHandler *handler,
list_handle = GABBLE_LIST_HANDLE_SUBSCRIBE;
chan = _gabble_roster_get_channel (roster, TP_HANDLE_TYPE_LIST,
list_handle, NULL);
- changed = tp_group_mixin_change_members ((GObject *)chan,
+ changed = tp_group_mixin_change_members ((GObject *) chan,
status_message, tmp, NULL, NULL, NULL, 0, 0);
_gabble_roster_send_presence_ack (roster, from, sub_type, changed);
@@ -1567,7 +1567,7 @@ gabble_roster_presence_cb (LmMessageHandler *handler,
list_handle = GABBLE_LIST_HANDLE_SUBSCRIBE;
chan = _gabble_roster_get_channel (roster, TP_HANDLE_TYPE_LIST,
list_handle, NULL);
- changed = tp_group_mixin_change_members ((GObject *)chan,
+ changed = tp_group_mixin_change_members ((GObject *) chan,
status_message, NULL, tmp, NULL, NULL, 0, 0);
_gabble_roster_send_presence_ack (roster, from, sub_type, changed);
@@ -1718,7 +1718,7 @@ gabble_roster_factory_iface_request (TpChannelFactoryIface *iface,
GabbleRoster *roster = GABBLE_ROSTER (iface);
GabbleRosterPrivate *priv = GABBLE_ROSTER_GET_PRIVATE (roster);
TpHandleRepoIface *handle_repo = tp_base_connection_get_handles (
- (TpBaseConnection *)priv->conn, handle_type);
+ (TpBaseConnection *) priv->conn, handle_type);
gboolean created;
GabbleRosterChannel *chan;
@@ -1821,7 +1821,7 @@ roster_item_apply_edits (GabbleRoster *roster,
TpIntSet *intset;
GabbleRosterPrivate *priv = GABBLE_ROSTER_GET_PRIVATE (roster);
TpHandleRepoIface *group_repo = tp_base_connection_get_handles (
- (TpBaseConnection *)priv->conn, TP_HANDLE_TYPE_GROUP);
+ (TpBaseConnection *) priv->conn, TP_HANDLE_TYPE_GROUP);
GabbleRosterItemEdit *edits = item->unsent_edits;
LmMessage *message;
@@ -1991,7 +1991,7 @@ gabble_roster_handle_get_subscription (GabbleRoster *roster,
{
GabbleRosterPrivate *priv = GABBLE_ROSTER_GET_PRIVATE (roster);
TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (
- (TpBaseConnection *)priv->conn, TP_HANDLE_TYPE_CONTACT);
+ (TpBaseConnection *) priv->conn, TP_HANDLE_TYPE_CONTACT);
GabbleRosterItem *item;
g_return_val_if_fail (roster != NULL, GABBLE_ROSTER_SUBSCRIPTION_NONE);
@@ -2016,7 +2016,7 @@ gabble_roster_handle_set_blocked (GabbleRoster *roster,
{
GabbleRosterPrivate *priv = GABBLE_ROSTER_GET_PRIVATE (roster);
TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (
- (TpBaseConnection *)priv->conn, TP_HANDLE_TYPE_CONTACT);
+ (TpBaseConnection *) priv->conn, TP_HANDLE_TYPE_CONTACT);
GabbleRosterItem *item;
GoogleItemType orig_type;
LmMessage *message;
@@ -2083,7 +2083,7 @@ gabble_roster_handle_has_entry (GabbleRoster *roster,
{
GabbleRosterPrivate *priv = GABBLE_ROSTER_GET_PRIVATE (roster);
TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (
- (TpBaseConnection *)priv->conn, TP_HANDLE_TYPE_CONTACT);
+ (TpBaseConnection *) priv->conn, TP_HANDLE_TYPE_CONTACT);
GabbleRosterItem *item;
g_return_val_if_fail (roster != NULL, FALSE);
@@ -2102,7 +2102,7 @@ gabble_roster_handle_get_name (GabbleRoster *roster,
{
GabbleRosterPrivate *priv = GABBLE_ROSTER_GET_PRIVATE (roster);
TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (
- (TpBaseConnection *)priv->conn, TP_HANDLE_TYPE_CONTACT);
+ (TpBaseConnection *) priv->conn, TP_HANDLE_TYPE_CONTACT);
GabbleRosterItem *item;
g_return_val_if_fail (roster != NULL, NULL);
@@ -2126,7 +2126,7 @@ gabble_roster_handle_set_name (GabbleRoster *roster,
{
GabbleRosterPrivate *priv = GABBLE_ROSTER_GET_PRIVATE (roster);
TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (
- (TpBaseConnection *)priv->conn, TP_HANDLE_TYPE_CONTACT);
+ (TpBaseConnection *) priv->conn, TP_HANDLE_TYPE_CONTACT);
GabbleRosterItem *item;
LmMessage *message;
LmMessageNode *item_node;
@@ -2179,7 +2179,7 @@ gabble_roster_handle_remove (GabbleRoster *roster,
{
GabbleRosterPrivate *priv = GABBLE_ROSTER_GET_PRIVATE (roster);
TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (
- (TpBaseConnection *)priv->conn, TP_HANDLE_TYPE_CONTACT);
+ (TpBaseConnection *) priv->conn, TP_HANDLE_TYPE_CONTACT);
GabbleRosterItem *item;
GabbleRosterSubscription subscription;
LmMessage *message;
@@ -2230,7 +2230,7 @@ gabble_roster_handle_add (GabbleRoster *roster,
{
GabbleRosterPrivate *priv = GABBLE_ROSTER_GET_PRIVATE (roster);
TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (
- (TpBaseConnection *)priv->conn, TP_HANDLE_TYPE_CONTACT);
+ (TpBaseConnection *) priv->conn, TP_HANDLE_TYPE_CONTACT);
GabbleRosterItem *item;
LmMessage *message;
gboolean do_add = FALSE;
@@ -2288,9 +2288,9 @@ gabble_roster_handle_add_to_group (GabbleRoster *roster,
{
GabbleRosterPrivate *priv = GABBLE_ROSTER_GET_PRIVATE (roster);
TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (
- (TpBaseConnection *)priv->conn, TP_HANDLE_TYPE_CONTACT);
+ (TpBaseConnection *) priv->conn, TP_HANDLE_TYPE_CONTACT);
TpHandleRepoIface *group_repo = tp_base_connection_get_handles (
- (TpBaseConnection *)priv->conn, TP_HANDLE_TYPE_GROUP);
+ (TpBaseConnection *) priv->conn, TP_HANDLE_TYPE_GROUP);
GabbleRosterItem *item;
LmMessage *message;
gboolean ret;
@@ -2348,9 +2348,9 @@ gabble_roster_handle_remove_from_group (GabbleRoster *roster,
{
GabbleRosterPrivate *priv = GABBLE_ROSTER_GET_PRIVATE (roster);
TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (
- (TpBaseConnection *)priv->conn, TP_HANDLE_TYPE_CONTACT);
+ (TpBaseConnection *) priv->conn, TP_HANDLE_TYPE_CONTACT);
TpHandleRepoIface *group_repo = tp_base_connection_get_handles (
- (TpBaseConnection *)priv->conn, TP_HANDLE_TYPE_GROUP);
+ (TpBaseConnection *) priv->conn, TP_HANDLE_TYPE_GROUP);
GabbleRosterItem *item;
LmMessage *message;
gboolean ret, was_in_group;
diff --git a/src/tubes-channel.c b/src/tubes-channel.c
index 7acb8cd..11eecaa 100644
--- a/src/tubes-channel.c
+++ b/src/tubes-channel.c
@@ -2518,7 +2518,7 @@ static void
tubes_iface_init (gpointer g_iface,
gpointer iface_data)
{
- TpSvcChannelTypeTubesClass *klass = (TpSvcChannelTypeTubesClass *)g_iface;
+ TpSvcChannelTypeTubesClass *klass = (TpSvcChannelTypeTubesClass *) g_iface;
#define IMPLEMENT(x) tp_svc_channel_type_tubes_implement_##x (\
klass, gabble_tubes_channel_##x)
@@ -2540,7 +2540,7 @@ static void
channel_iface_init (gpointer g_iface,
gpointer iface_data)
{
- TpSvcChannelClass *klass = (TpSvcChannelClass *)g_iface;
+ TpSvcChannelClass *klass = (TpSvcChannelClass *) g_iface;
#define IMPLEMENT(x, suffix) tp_svc_channel_implement_##x (\
klass, gabble_tubes_channel_##x##suffix)
diff --git a/src/util.c b/src/util.c
index 183ac76..5f86d2a 100644
--- a/src/util.c
+++ b/src/util.c
@@ -87,7 +87,7 @@ lm_message_node_add_own_nick (LmMessageNode *node,
{
gchar *nick;
GabbleConnectionAliasSource source;
- TpBaseConnection *base = (TpBaseConnection *)connection;
+ TpBaseConnection *base = (TpBaseConnection *) connection;
source = _gabble_connection_get_cached_alias (connection,
base->self_handle, &nick);
diff --git a/src/vcard-manager.c b/src/vcard-manager.c
index e4f3964..167d98a 100644
--- a/src/vcard-manager.c
+++ b/src/vcard-manager.c
@@ -72,7 +72,7 @@ struct _GabbleVCardManagerPrivate
/* TpHandle borrowed from the entry => owned (GabbleVCardCacheEntry *) */
GHashTable *cache;
- /* Those (GabbleVCardCacheEntry *)s that have not expired, ordered by
+ /* Those (GabbleVCardCacheEntry *) s that have not expired, ordered by
* increasing expiry time; borrowed from @cache */
TpHeap *timed_cache;
@@ -331,7 +331,7 @@ cache_entry_get (GabbleVCardManager *manager, TpHandle handle)
{
GabbleVCardManagerPrivate *priv = GABBLE_VCARD_MANAGER_GET_PRIVATE (manager);
TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (
- (TpBaseConnection *)priv->connection, TP_HANDLE_TYPE_CONTACT);
+ (TpBaseConnection *) priv->connection, TP_HANDLE_TYPE_CONTACT);
GabbleVCardCacheEntry *entry;
entry = g_hash_table_lookup (priv->cache, GUINT_TO_POINTER (handle));
@@ -429,7 +429,7 @@ gabble_vcard_manager_invalidate_cache (GabbleVCardManager *manager,
GabbleVCardCacheEntry *entry = g_hash_table_lookup (priv->cache,
GUINT_TO_POINTER (handle));
TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (
- (TpBaseConnection *)priv->connection, TP_HANDLE_TYPE_CONTACT);
+ (TpBaseConnection *) priv->connection, TP_HANDLE_TYPE_CONTACT);
g_return_if_fail (tp_handle_is_valid (contact_repo, handle, NULL));
@@ -582,7 +582,7 @@ initial_request_cb (GabbleVCardManager *self,
gpointer user_data)
{
GabbleVCardManagerPrivate *priv = GABBLE_VCARD_MANAGER_GET_PRIVATE (self);
- gchar *alias = (gchar *)user_data;
+ gchar *alias = (gchar *) user_data;
gchar *sha1;
if (vcard)
@@ -614,7 +614,7 @@ status_changed_cb (GObject *object,
GabbleVCardManager *self = GABBLE_VCARD_MANAGER (user_data);
GabbleVCardManagerPrivate *priv = GABBLE_VCARD_MANAGER_GET_PRIVATE (self);
GabbleConnection *conn = GABBLE_CONNECTION (object);
- TpBaseConnection *base = (TpBaseConnection *)conn;
+ TpBaseConnection *base = (TpBaseConnection *) conn;
if (status == TP_CONNECTION_STATUS_CONNECTED)
{
@@ -771,7 +771,7 @@ observe_vcard (GabbleConnection *conn,
LmMessageNode *vcard_node)
{
TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (
- (TpBaseConnection *)conn, TP_HANDLE_TYPE_CONTACT);
+ (TpBaseConnection *) conn, TP_HANDLE_TYPE_CONTACT);
const gchar *field = "<NICKNAME>";
gchar *alias;
const gchar *old_alias;
@@ -1203,7 +1203,7 @@ gabble_vcard_manager_request (GabbleVCardManager *self,
GObject *object)
{
GabbleVCardManagerPrivate *priv = GABBLE_VCARD_MANAGER_GET_PRIVATE (self);
- TpBaseConnection *connection = (TpBaseConnection *)priv->connection;
+ TpBaseConnection *connection = (TpBaseConnection *) priv->connection;
TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (
connection, TP_HANDLE_TYPE_CONTACT);
GabbleVCardManagerRequest *request;
@@ -1247,7 +1247,7 @@ gabble_vcard_manager_edit (GabbleVCardManager *self,
va_list ap;
size_t i;
GabbleVCardManagerPrivate *priv = GABBLE_VCARD_MANAGER_GET_PRIVATE (self);
- TpBaseConnection *base = (TpBaseConnection *)priv->connection;
+ TpBaseConnection *base = (TpBaseConnection *) priv->connection;
GabbleVCardManagerEditRequest *req;
GabbleVCardCacheEntry *entry;
@@ -1375,7 +1375,7 @@ gabble_vcard_manager_get_cached (GabbleVCardManager *self,
GabbleVCardCacheEntry *entry = g_hash_table_lookup (priv->cache,
GUINT_TO_POINTER (handle));
TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (
- (TpBaseConnection *)priv->connection, TP_HANDLE_TYPE_CONTACT);
+ (TpBaseConnection *) priv->connection, TP_HANDLE_TYPE_CONTACT);
g_return_val_if_fail (tp_handle_is_valid (contact_repo, handle, NULL),
FALSE);
@@ -1405,7 +1405,7 @@ gabble_vcard_manager_get_cached_alias (GabbleVCardManager *manager,
priv = GABBLE_VCARD_MANAGER_GET_PRIVATE (manager);
contact_repo = tp_base_connection_get_handles (
- (TpBaseConnection *)priv->connection, TP_HANDLE_TYPE_CONTACT);
+ (TpBaseConnection *) priv->connection, TP_HANDLE_TYPE_CONTACT);
g_return_val_if_fail (tp_handle_is_valid (contact_repo, handle, NULL), NULL);
@@ -1433,7 +1433,7 @@ gabble_vcard_manager_has_cached_alias (GabbleVCardManager *manager,
priv = GABBLE_VCARD_MANAGER_GET_PRIVATE (manager);
contact_repo = tp_base_connection_get_handles (
- (TpBaseConnection *)priv->connection, TP_HANDLE_TYPE_CONTACT);
+ (TpBaseConnection *) priv->connection, TP_HANDLE_TYPE_CONTACT);
g_return_val_if_fail (tp_handle_is_valid (contact_repo, handle, NULL),
FALSE);
diff --git a/tests/test-handles.c b/tests/test-handles.c
index a224d9c..8190b84 100644
--- a/tests/test-handles.c
+++ b/tests/test-handles.c
@@ -93,7 +93,7 @@ test_handles (guint handle_type)
for (i = 0; i < NUM_TP_HANDLE_TYPES; i++)
{
if (repos[i])
- g_object_unref ((GObject *)repos[i]);
+ g_object_unref ((GObject *) repos[i]);
}
}
--
1.5.6.3
More information about the Telepathy-commits
mailing list