[Telepathy-commits] [telepathy-gabble/master] Fix a number of coding style violations.

[Will Thompson]

In particular:
 - trim trailing spaces;
 - function calls are written as foo () not foo();
 - casts and pointer types are written as (Foo *) foo rather than
   (Foo*)foo.
---
 src/jingle-content.c           |    2 +-
 src/jingle-description-iface.c |    4 ++--
 src/jingle-factory.c           |    2 +-
 src/jingle-media-rtp.c         |    2 +-
 src/jingle-session.c           |   12 ++++++------
 src/jingle-transport-google.c  |    2 +-
 src/jingle-transport-iface.c   |    6 +++---
 src/media-channel.c            |    4 ++--
 8 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/jingle-content.c b/src/jingle-content.c
index 0129e4b..efc3e9d 100644
--- a/src/jingle-content.c
+++ b/src/jingle-content.c
@@ -79,7 +79,7 @@ struct _GabbleJingleContentPrivate
 };
 
 #define GABBLE_JINGLE_CONTENT_GET_PRIVATE(o)\
-  ((GabbleJingleContentPrivate*)((o)->priv))
+  ((GabbleJingleContentPrivate *) ((o)->priv))
 
 /* lookup tables */
 
diff --git a/src/jingle-description-iface.c b/src/jingle-description-iface.c
index fd75c51..6005cbc 100644
--- a/src/jingle-description-iface.c
+++ b/src/jingle-description-iface.c
@@ -26,7 +26,7 @@ void
 gabble_jingle_description_iface_produce (GabbleJingleDescriptionIface *self,
     LmMessageNode *node)
 {
-  void (*virtual_method)(GabbleJingleDescriptionIface *, 
+  void (*virtual_method)(GabbleJingleDescriptionIface *,
       LmMessageNode *) =
     GABBLE_JINGLE_DESCRIPTION_IFACE_GET_CLASS (self)->produce;
 
@@ -38,7 +38,7 @@ void
 gabble_jingle_description_iface_parse (GabbleJingleDescriptionIface *self,
     LmMessageNode *node, GError **error)
 {
-  void (*virtual_method)(GabbleJingleDescriptionIface *, 
+  void (*virtual_method)(GabbleJingleDescriptionIface *,
       LmMessageNode *, GError **) =
     GABBLE_JINGLE_DESCRIPTION_IFACE_GET_CLASS (self)->parse;
 
diff --git a/src/jingle-factory.c b/src/jingle-factory.c
index 7bd8fc9..96ab2f6 100644
--- a/src/jingle-factory.c
+++ b/src/jingle-factory.c
@@ -70,7 +70,7 @@ struct _GabbleJingleFactoryPrivate
 };
 
 #define GABBLE_JINGLE_FACTORY_GET_PRIVATE(o)\
-  ((GabbleJingleFactoryPrivate*)((o)->priv))
+  ((GabbleJingleFactoryPrivate *) ((o)->priv))
 
 static LmHandlerResult
 jingle_cb (LmMessageHandler *handler, LmConnection *lmconn,
diff --git a/src/jingle-media-rtp.c b/src/jingle-media-rtp.c
index 9ba8311..1986ea6 100644
--- a/src/jingle-media-rtp.c
+++ b/src/jingle-media-rtp.c
@@ -81,7 +81,7 @@ struct _GabbleJingleMediaRtpPrivate
 };
 
 #define GABBLE_JINGLE_MEDIA_RTP_GET_PRIVATE(o)\
-  ((GabbleJingleMediaRtpPrivate*)((o)->priv))
+  ((GabbleJingleMediaRtpPrivate *) ((o)->priv))
 
 static void
 gabble_jingle_media_rtp_init (GabbleJingleMediaRtp *obj)
diff --git a/src/jingle-session.c b/src/jingle-session.c
index 606f376..10e4fdb 100644
--- a/src/jingle-session.c
+++ b/src/jingle-session.c
@@ -81,7 +81,7 @@ struct _GabbleJingleSessionPrivate
 };
 
 #define GABBLE_JINGLE_SESSION_GET_PRIVATE(o)\
-  ((GabbleJingleSessionPrivate*)((o)->priv))
+  ((GabbleJingleSessionPrivate *) ((o)->priv))
 
 /* lookup tables */
 
@@ -151,7 +151,7 @@ gabble_jingle_session_dispose (GObject *object)
   GabbleJingleSession *sess = GABBLE_JINGLE_SESSION (object);
   GabbleJingleSessionPrivate *priv = GABBLE_JINGLE_SESSION_GET_PRIVATE (sess);
   TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (
-      (TpBaseConnection *)priv->conn, TP_HANDLE_TYPE_CONTACT);
+      (TpBaseConnection *) priv->conn, TP_HANDLE_TYPE_CONTACT);
 
   if (priv->dispose_has_run)
     return;
@@ -477,7 +477,7 @@ _foreach_content (GabbleJingleSession *sess, LmMessageNode *node,
     }
 }
 
-static void content_ready_cb (GabbleJingleContent *c, 
+static void content_ready_cb (GabbleJingleContent *c,
     GParamSpec *arg, GabbleJingleSession *sess);
 
 static void
@@ -541,7 +541,7 @@ _each_content_add (GabbleJingleSession *sess, GabbleJingleContent *c,
   g_signal_connect (c, "notify::ready",
       (GCallback) content_ready_cb, sess);
 
-  gabble_jingle_content_parse_add (c, content_node, 
+  gabble_jingle_content_parse_add (c, content_node,
     ((priv->dialect == JINGLE_DIALECT_GTALK3) ||
     (priv->dialect == JINGLE_DIALECT_GTALK4)), error);
 
@@ -1000,7 +1000,7 @@ get_jid_for_contact (GabbleJingleSession *session,
   g_assert (GABBLE_IS_JINGLE_SESSION (session));
 
   priv = GABBLE_JINGLE_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;
@@ -1384,7 +1384,7 @@ gabble_jingle_session_get_contents (GabbleJingleSession *sess)
 }
 
 static void
-content_ready_cb (GabbleJingleContent *c, 
+content_ready_cb (GabbleJingleContent *c,
     GParamSpec *arg, GabbleJingleSession *sess)
 {
   GabbleJingleSessionPrivate *priv = GABBLE_JINGLE_SESSION_GET_PRIVATE (sess);
diff --git a/src/jingle-transport-google.c b/src/jingle-transport-google.c
index 5d21a45..16b3158 100644
--- a/src/jingle-transport-google.c
+++ b/src/jingle-transport-google.c
@@ -82,7 +82,7 @@ struct _GabbleJingleTransportGooglePrivate
 };
 
 #define GABBLE_JINGLE_TRANSPORT_GOOGLE_GET_PRIVATE(o)\
-  ((GabbleJingleTransportGooglePrivate*)((o)->priv))
+  ((GabbleJingleTransportGooglePrivate *) ((o)->priv))
 
 static void transmit_candidates (GabbleJingleTransportGoogle *transport,
     GList *candidates);
diff --git a/src/jingle-transport-iface.c b/src/jingle-transport-iface.c
index 852c530..1e2611a 100644
--- a/src/jingle-transport-iface.c
+++ b/src/jingle-transport-iface.c
@@ -28,7 +28,7 @@ void
 gabble_jingle_transport_iface_parse_candidates (GabbleJingleTransportIface *self,
     LmMessageNode *node, GError **error)
 {
-  void (*virtual_method)(GabbleJingleTransportIface *, 
+  void (*virtual_method)(GabbleJingleTransportIface *,
       LmMessageNode *, GError **) =
     GABBLE_JINGLE_TRANSPORT_IFACE_GET_CLASS (self)->parse_candidates;
 
@@ -40,7 +40,7 @@ void
 gabble_jingle_transport_iface_produce (GabbleJingleTransportIface *self,
     LmMessageNode *node)
 {
-  void (*virtual_method)(GabbleJingleTransportIface *, 
+  void (*virtual_method)(GabbleJingleTransportIface *,
       LmMessageNode *) =
     GABBLE_JINGLE_TRANSPORT_IFACE_GET_CLASS (self)->produce;
 
@@ -52,7 +52,7 @@ void
 gabble_jingle_transport_iface_add_candidates (GabbleJingleTransportIface *self,
     GList *candidates)
 {
-  void (*virtual_method)(GabbleJingleTransportIface *, 
+  void (*virtual_method)(GabbleJingleTransportIface *,
       GList *) =
     GABBLE_JINGLE_TRANSPORT_IFACE_GET_CLASS (self)->add_candidates;
 
diff --git a/src/media-channel.c b/src/media-channel.c
index 432252c..a2ea9a0 100644
--- a/src/media-channel.c
+++ b/src/media-channel.c
@@ -1287,10 +1287,10 @@ _gabble_media_channel_request_streams (GabbleMediaChannel *chan,
         }
     }
 
-  g_object_get(priv->session, "dialect", &dialect, NULL);
+  g_object_get (priv->session, "dialect", &dialect, NULL);
 
   /* existing call; the recipient and the mode has already been decided */
-  if (dialect != JINGLE_DIALECT_ERROR) 
+  if (dialect != JINGLE_DIALECT_ERROR)
     {
       g_assert_not_reached ();
 
-- 
1.5.6.5