-fix double-free, clarify API

2 files changed, 3 insertions, 6 deletions

diff --git a/src/conversation/gnunet-conversation.c b/src/conversation/gnunet-conversation.c
index 90b98b36f..ce8a50a62 100644
--- a/src/conversation/gnunet-conversation.c
+++ b/src/conversation/gnunet-conversation.c
@@ -296,7 +296,6 @@ call_event_handler (void *cls,
     FPRINTF (stdout,
              _("Failed to resolve `%s'\n"),
              ego_name);
-    GNUNET_CONVERSATION_call_stop (call, NULL);
     call = NULL;
     start_phone ();
     break;
@@ -305,7 +304,6 @@ call_event_handler (void *cls,
     FPRINTF (stdout,
              "%s",
              _("Line busy\n"));
-    GNUNET_CONVERSATION_call_stop (call, NULL);
     call = NULL;
     start_phone ();
     break;
@@ -315,7 +313,6 @@ call_event_handler (void *cls,
     FPRINTF (stdout,
              _("Call terminated: %s\n"),
              va_arg (va, const char *));
-    GNUNET_CONVERSATION_call_stop (call, NULL);
     call = NULL;
     start_phone ();
     break;
diff --git a/src/conversation/gnunet-service-conversation.c b/src/conversation/gnunet-service-conversation.c
index 4b06ef3e8..4e2b1455d 100644
--- a/src/conversation/gnunet-service-conversation.c
+++ b/src/conversation/gnunet-service-conversation.c
@@ -295,7 +295,7 @@ handle_client_pickup_message (void *cls,
   }
   line->status = LS_CALLEE_CONNECTED;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Sending PICK_UP message to client with meta data `%s'\n",
+              "Sending PICK_UP message to mesh with meta data `%s'\n",
               meta);
   e = GNUNET_MQ_msg_extra (mppm,
                            len,
@@ -880,7 +880,7 @@ handle_mesh_pickup_message (void *cls,
   pick->header.type = htons (GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_PICKED_UP);
   memcpy (&pick[1], metadata, len);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Sending PICK UP message via mesh with metadata `%s'\n",
+              "Sending PICKED UP message to client with metadata `%s'\n",
               metadata);
   GNUNET_SERVER_notification_context_unicast (nc,
                                               line->client,
@@ -895,7 +895,7 @@ handle_mesh_pickup_message (void *cls,
   if (NULL == line->tunnel_unreliable)
   {
     GNUNET_break (0);
-  }
+  } 
   return GNUNET_OK;
 }