[Telepathy-commits] [telepathy-salut/master] src/salut-direct-bytestream-manager.c: listener_io_in_cb must return TRUE to continue listening

Alban Crequy alban.crequy at collabora.co.uk
Tue Nov 25 03:59:22 PST 2008


---
 src/salut-direct-bytestream-manager.c |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/salut-direct-bytestream-manager.c b/src/salut-direct-bytestream-manager.c
index e36340d..5205080 100644
--- a/src/salut-direct-bytestream-manager.c
+++ b/src/salut-direct-bytestream-manager.c
@@ -265,7 +265,7 @@ listener_io_in_cb (GIOChannel *source,
 
   gibber_bytestream_direct_accept_socket (bytestream, listen_fd);
 
-  return FALSE;
+  return TRUE;
 }
 
 
@@ -425,12 +425,8 @@ void salut_direct_bytestream_manager_stop_listen (
     {
       GSource* source = g_main_context_find_source_by_id (NULL,
           listener->listen_io_channel_source_id);
-
-      /* FIXME: why source is already destroyed here!? */
-      if (source != NULL)
-        {
-          g_source_destroy (source);
-        }
+      g_assert (source != NULL);
+      g_source_destroy (source);
       listener->listen_io_channel_source_id = 0;
     }
   
-- 
1.5.6.5




More information about the Telepathy-commits mailing list