[Telepathy-commits] [telepathy-salut/master] Cast and assign the file channel user_data in the same block.

Jonny Lamb jonny.lamb at collabora.co.uk
Fri Nov 21 03:46:29 PST 2008


Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>
---
 src/salut-file-channel.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/salut-file-channel.c b/src/salut-file-channel.c
index 0f7cc51..dc482a5 100644
--- a/src/salut-file-channel.c
+++ b/src/salut-file-channel.c
@@ -1169,14 +1169,14 @@ accept_local_socket_connection (GIOChannel *source,
   socklen_t addrlen;
   GIOChannel *channel;
 
+  ft = SALUT_FILE_CHANNEL (user_data)->priv->ft;
+
+  g_assert (ft != NULL);
+
   if (condition & G_IO_IN)
     {
       DEBUG ("Client connected to local socket");
 
-      ft = ((SalutFileChannel *) user_data)->priv->ft;
-
-      g_assert (ft != NULL);
-
       addrlen = sizeof (addr);
       new_fd = accept (g_io_channel_unix_get_fd (source),
           (struct sockaddr *) &addr, &addrlen);
-- 
1.5.6.5




More information about the Telepathy-commits mailing list