[GNUnet-SVN] r29869 - gnunet/src/conversation

[gnunet]

Author: grothoff
Date: 2013-10-05 19:59:22 +0200 (Sat, 05 Oct 2013)
New Revision: 29869

Modified:
   gnunet/src/conversation/conversation_api.c
   gnunet/src/conversation/gnunet-service-conversation.c
Log:
-misc minor bugfixes

Modified: gnunet/src/conversation/conversation_api.c
===================================================================
--- gnunet/src/conversation/conversation_api.c  2013-10-05 17:52:28 UTC (rev 
29868)
+++ gnunet/src/conversation/conversation_api.c  2013-10-05 17:59:22 UTC (rev 
29869)
@@ -272,6 +272,8 @@
     phone->event_handler (phone->event_handler_cls,
                           GNUNET_CONVERSATION_EC_TERMINATED,
                           reason);
+    phone->speaker->disable_speaker (phone->speaker->cls);
+    phone->mic->disable_microphone (phone->mic->cls);
     break;
   }
 }

Modified: gnunet/src/conversation/gnunet-service-conversation.c
===================================================================
--- gnunet/src/conversation/gnunet-service-conversation.c       2013-10-05 
17:52:28 UTC (rev 29868)
+++ gnunet/src/conversation/gnunet-service-conversation.c       2013-10-05 
17:59:22 UTC (rev 29869)
@@ -223,11 +223,11 @@
   line = GNUNET_new (struct Line);
   line->client = client;
   GNUNET_SERVER_notification_context_add (nc, client);
+  GNUNET_SERVER_client_set_user_context (client, line);
   GNUNET_CONTAINER_DLL_insert (lines_head,
                                lines_tail,
                                line);
   line->local_line = ntohl (msg->line);
-  GNUNET_SERVER_client_set_user_context (client, line);
   GNUNET_SERVER_receive_done (client, GNUNET_OK);
 }
 
@@ -478,6 +478,9 @@
     return;
   }
   line = GNUNET_new (struct Line);
+  line->client = client;
+  GNUNET_SERVER_client_set_user_context (client, line);
+  GNUNET_SERVER_notification_context_add (nc, client);
   line->target = msg->target;
   GNUNET_CONTAINER_DLL_insert (lines_head,
                                lines_tail,
@@ -509,7 +512,6 @@
                           &ring->purpose,
                           &ring->signature);
   GNUNET_MQ_send (line->reliable_mq, e);
-  GNUNET_SERVER_client_set_user_context (client, line);
   GNUNET_SERVER_receive_done (client, GNUNET_OK);
 }