expand clean-up logic

1 files changed, 41 insertions, 5 deletions

diff --git a/src/conversation/gnunet-conversation-gtk_phone.c b/src/conversation/gnunet-conversation-gtk_phone.c
index bbd1cb53..7a08d87f 100644
--- a/src/conversation/gnunet-conversation-gtk_phone.c
+++ b/src/conversation/gnunet-conversation-gtk_phone.c
@@ -352,6 +352,44 @@ static GtkEntry *address_entry;
 
 
 /**
+ * Free data structure associated with an incoming call.
+ *
+ * @param ic incoming call to free
+ */
+static void
+destroy_in (struct IncomingCall *ic)
+{
+  if (NULL != ic->caller)
+  {
+    GNUNET_CONVERSATION_caller_hang_up (ic->caller);
+    ic->caller = NULL;
+  }
+  GNUNET_free (ic->caller_id);
+  gtk_tree_row_reference_free (ic->rr);
+  GNUNET_free (ic);
+}
+
+
+/**
+ * Free data structure associated with an outgoing call.
+ *
+ * @param oc outgoing call to free
+ */
+static void
+destroy_out (struct OutgoingCall *oc)
+{
+  if (NULL != oc->call)
+  {
+    GNUNET_CONVERSATION_call_stop (oc->call);
+    ic->caller = NULL;
+  }
+  GNUNET_free (oc->peer_name);
+  gtk_tree_row_reference_free (oc->rr);
+  GNUNET_free (oc);
+}
+
+
+/**
  * Update status based on current phone state.
  *
  * @param args arguments given to the command
@@ -1165,22 +1203,20 @@ GCG_PHONE_shutdown ()
 {
   if (NULL != active_in)
   {
-    GNUNET_CONVERSATION_caller_hang_up (active_in->caller);
-    // FIXME: memory leak
+    destroy_in (active_in);
     active_in = NULL;
   }
   if (NULL != active_out)
   {
-    GNUNET_CONVERSATION_call_stop (active_out->call);
-    // FIXME: memory leak
+    destroy_out (active_out);
     active_out = NULL;
   }
-  // FIXME: clean up tree view!
   if (NULL != phone)
   {
     GNUNET_CONVERSATION_phone_destroy (phone);
     phone = NULL;
   }
+  gtk_list_store_clear (active_liststore);
   GNUNET_SPEAKER_destroy (speaker);
   speaker = NULL;
   GNUNET_MICROPHONE_destroy (mic);