[GNUnet-SVN] r33484 - gnunet-gtk/src/conversation

[gnunet]

Author: grothoff
Date: 2014-06-02 23:31:58 +0200 (Mon, 02 Jun 2014)
New Revision: 33484

Modified:
   gnunet-gtk/src/conversation/gnunet-conversation-gtk_import.c
Log:
-fix shutdown, must disconnect from namestore asynchronously

Modified: gnunet-gtk/src/conversation/gnunet-conversation-gtk_import.c
===================================================================
--- gnunet-gtk/src/conversation/gnunet-conversation-gtk_import.c        
2014-06-02 21:14:19 UTC (rev 33483)
+++ gnunet-gtk/src/conversation/gnunet-conversation-gtk_import.c        
2014-06-02 21:31:58 UTC (rev 33484)
@@ -289,17 +289,31 @@
 
 
 /**
- * Run last parts of shutdown operation (after last
- * remove has completed).
+ * Asynchronously disconnect from the namestore.
+ *
+ * @param cls closure (NULL)
+ * @param tc scheduler context
  */
 static void
-finish_shutdown ()
+async_disconnect (void *cls,
+                  const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   if (NULL != ns)
   {
     GNUNET_NAMESTORE_disconnect (ns);
     ns = NULL;
   }
+}
+
+
+/**
+ * Run last parts of shutdown operation (after last
+ * remove has completed).
+ */
+static void
+finish_shutdown ()
+{
+  GNUNET_SCHEDULER_add_now (&async_disconnect, NULL);
   GNUNET_free_non_null (my_rd_data);
   memset (&my_rd, 0, sizeof (my_rd));
   GNUNET_CRYPTO_ecdsa_key_clear (&zone_pkey);