[Telepathy-commits] [telepathy-gabble/master] More coding style nits re: casts
Simon McVittie
simon.mcvittie at collabora.co.uk
Tue Aug 19 10:53:22 PDT 2008
20080721131628-53eee-79be88afb4a9d9d84cb424e389a17586db8ca1e0.gz
---
src/connection.c | 2 +-
src/disco.c | 6 +++---
src/im-channel.c | 2 +-
src/muc-factory.c | 2 +-
src/presence.c | 2 +-
src/private-tubes-factory.c | 2 +-
src/roster.c | 2 +-
src/tube-stream.c | 4 ++--
src/vcard-manager.c | 4 ++--
9 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/connection.c b/src/connection.c
index d4a5d1f..c4c385a 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -2407,7 +2407,7 @@ struct _RoomVerifyContext {
static void
room_verify_batch_free (RoomVerifyBatch *batch)
{
- TpBaseConnection *base = (TpBaseConnection *)(batch->conn);
+ TpBaseConnection *base = (TpBaseConnection *) (batch->conn);
TpHandleRepoIface *room_handles = tp_base_connection_get_handles (base,
TP_HANDLE_TYPE_ROOM);
guint i;
diff --git a/src/disco.c b/src/disco.c
index 89994a9..ea4765f 100644
--- a/src/disco.c
+++ b/src/disco.c
@@ -82,7 +82,7 @@ gabble_disco_error_quark (void)
return quark;
}
-#define GABBLE_DISCO_GET_PRIVATE(o) ((GabbleDiscoPrivate*)((o)->priv))
+#define GABBLE_DISCO_GET_PRIVATE(o) ((GabbleDiscoPrivate *) ((o)->priv))
static void
gabble_disco_init (GabbleDisco *obj)
@@ -292,7 +292,7 @@ delete_request (GabbleDiscoRequest *request)
static gboolean
timeout_request (gpointer data)
{
- GabbleDiscoRequest *request = (GabbleDiscoRequest*) data;
+ GabbleDiscoRequest *request = (GabbleDiscoRequest *) data;
GabbleDisco *disco;
GError *err /* doesn't need initializing */;
g_return_val_if_fail (data != NULL, FALSE);
@@ -364,7 +364,7 @@ static LmHandlerResult
request_reply_cb (GabbleConnection *conn, LmMessage *sent_msg,
LmMessage *reply_msg, GObject *object, gpointer user_data)
{
- GabbleDiscoRequest *request = (GabbleDiscoRequest*) user_data;
+ GabbleDiscoRequest *request = (GabbleDiscoRequest *) user_data;
GabbleDisco *disco = GABBLE_DISCO (object);
GabbleDiscoPrivate *priv = GABBLE_DISCO_GET_PRIVATE (disco);
LmMessageNode *query_node;
diff --git a/src/im-channel.c b/src/im-channel.c
index 0940b66..c99de42 100644
--- a/src/im-channel.c
+++ b/src/im-channel.c
@@ -401,7 +401,7 @@ _gabble_im_channel_state_receive (GabbleIMChannel *chan,
priv = GABBLE_IM_CHANNEL_GET_PRIVATE (chan);
tp_svc_channel_interface_chat_state_emit_chat_state_changed (
- (TpSvcChannelInterfaceChatState*)chan,
+ (TpSvcChannelInterfaceChatState *) chan,
priv->handle, state);
}
diff --git a/src/muc-factory.c b/src/muc-factory.c
index e2ed6e0..c13b17b 100644
--- a/src/muc-factory.c
+++ b/src/muc-factory.c
@@ -1207,7 +1207,7 @@ gabble_muc_factory_handle_si_stream_request (GabbleMucFactory *self,
{
GabbleMucFactoryPrivate *priv = GABBLE_MUC_FACTORY_GET_PRIVATE (self);
TpHandleRepoIface *room_repo = tp_base_connection_get_handles (
- (TpBaseConnection*) priv->conn, TP_HANDLE_TYPE_ROOM);
+ (TpBaseConnection *) priv->conn, TP_HANDLE_TYPE_ROOM);
GabbleTubesChannel *chan;
g_return_if_fail (tp_handle_is_valid (room_repo, room_handle, NULL));
diff --git a/src/presence.c b/src/presence.c
index 3d81ea9..4d6f92f 100644
--- a/src/presence.c
+++ b/src/presence.c
@@ -110,7 +110,7 @@ gabble_presence_init (GabblePresence *self)
((GabblePresencePrivate *) self->priv)->resources = NULL;
}
-GabblePresence*
+GabblePresence *
gabble_presence_new (void)
{
return g_object_new (GABBLE_TYPE_PRESENCE, NULL);
diff --git a/src/private-tubes-factory.c b/src/private-tubes-factory.c
index baa0e2f..aceec1a 100644
--- a/src/private-tubes-factory.c
+++ b/src/private-tubes-factory.c
@@ -383,7 +383,7 @@ gabble_private_tubes_factory_iface_request (TpChannelFactoryIface *iface,
return TP_CHANNEL_FACTORY_REQUEST_STATUS_INVALID_HANDLE;
/* Don't support opening a channel to our self handle */
- if (handle == ((TpBaseConnection*) priv->conn)->self_handle)
+ if (handle == ((TpBaseConnection *) priv->conn)->self_handle)
{
g_set_error (error, TP_ERRORS, TP_ERROR_NOT_AVAILABLE,
"Can't open a channel to your self handle");
diff --git a/src/roster.c b/src/roster.c
index ef36ca5..54f9317 100644
--- a/src/roster.c
+++ b/src/roster.c
@@ -129,7 +129,7 @@ G_DEFINE_TYPE_WITH_CODE (GabbleRoster, gabble_roster, G_TYPE_OBJECT,
G_IMPLEMENT_INTERFACE (TP_TYPE_CHANNEL_FACTORY_IFACE,
gabble_roster_factory_iface_init));
-#define GABBLE_ROSTER_GET_PRIVATE(o) ((GabbleRosterPrivate*) ((o)->priv))
+#define GABBLE_ROSTER_GET_PRIVATE(o) ((GabbleRosterPrivate *) ((o)->priv))
static void
gabble_roster_class_init (GabbleRosterClass *gabble_roster_class)
diff --git a/src/tube-stream.c b/src/tube-stream.c
index b87a34b..6ee3a23 100644
--- a/src/tube-stream.c
+++ b/src/tube-stream.c
@@ -325,7 +325,7 @@ start_stream_initiation (GabbleTubeStream *self,
priv = GABBLE_TUBE_STREAM_GET_PRIVATE (self);
contact_repo = tp_base_connection_get_handles (
- (TpBaseConnection*) priv->conn, TP_HANDLE_TYPE_CONTACT);
+ (TpBaseConnection *) priv->conn, TP_HANDLE_TYPE_CONTACT);
jid = tp_handle_inspect (contact_repo, priv->initiator);
@@ -1330,7 +1330,7 @@ gabble_tube_stream_close (GabbleTubeIface *tube)
LmMessage *msg;
const gchar *jid;
TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (
- (TpBaseConnection*) priv->conn, TP_HANDLE_TYPE_CONTACT);
+ (TpBaseConnection *) priv->conn, TP_HANDLE_TYPE_CONTACT);
gchar *id_str;
jid = tp_handle_inspect (contact_repo, priv->handle);
diff --git a/src/vcard-manager.c b/src/vcard-manager.c
index 167d98a..e3dc02f 100644
--- a/src/vcard-manager.c
+++ b/src/vcard-manager.c
@@ -173,7 +173,7 @@ gabble_vcard_manager_cache_quark (void)
}
#define GABBLE_VCARD_MANAGER_GET_PRIVATE(o)\
- ((GabbleVCardManagerPrivate*)((o)->priv))
+ ((GabbleVCardManagerPrivate *) ((o)->priv))
static void cache_entry_free (void *data);
static gint cache_entry_compare (gconstpointer a, gconstpointer b);
@@ -708,7 +708,7 @@ delete_request (GabbleVCardManagerRequest *request)
static gboolean
timeout_request (gpointer data)
{
- GabbleVCardManagerRequest *request = (GabbleVCardManagerRequest*) data;
+ GabbleVCardManagerRequest *request = (GabbleVCardManagerRequest *) data;
GError err = { GABBLE_VCARD_MANAGER_ERROR,
GABBLE_VCARD_MANAGER_ERROR_TIMEOUT, "Request timed out" };
--
1.5.6.3
More information about the Telepathy-commits
mailing list