1 files changed, 32 insertions, 2 deletions

diff --git a/src/conversation/gnunet-conversation-gtk_import.c b/src/conversation/gnunet-conversation-gtk_import.c
index e8e1eede..199ed9e2 100644
--- a/src/conversation/gnunet-conversation-gtk_import.c
+++ b/src/conversation/gnunet-conversation-gtk_import.c
@@ -251,13 +251,27 @@ add_phone_handle_existing_records (void *cls,
   add_phone_qe = GNUNET_NAMESTORE_records_store (ns,
                                                  zone,
                                                  label,
-                                                 rd_count + 1, rd_new,
+                                                 rd_count + 1,
+                                                 rd_new,
                                                  &add_phone_continuation,
                                                  NULL);
 }
 
 
 /**
+ * Called on error communicating with the namestore.
+ */
+static void
+handle_add_error (void *cls)
+{
+  add_phone_qe = NULL;
+  GCG_log (_("Error communicating with namestore!\n"));
+  GNUNET_free (phone_label);
+  phone_label = NULL;
+}
+
+
+/**
  * Add the data from #my_rd under the #phone_label to the namestore.
  */
 static void
@@ -273,6 +287,8 @@ add_phone ()
   add_phone_qe = GNUNET_NAMESTORE_records_lookup (ns,
                                                   &zone_pkey,
                                                   phone_label,
+                                                  &handle_add_error,
+                                                  NULL,
                                                   &add_phone_handle_existing_records,
                                                   NULL);
 }
@@ -409,6 +425,19 @@ remove_phone_handle_existing_records (void *cls,
 
 
 /**
+ * Called on error communicating with the namestore.
+ */
+static void
+handle_remove_error (void *cls)
+{
+  remove_phone_qe = NULL;
+  GCG_log (_("Error communicating with namestore!\n"));
+  if (GNUNET_YES == in_shutdown)
+    finish_shutdown ();
+}
+
+
+/**
  * Remove previously added phone address from namestore.
  */
 void
@@ -420,6 +449,8 @@ GSC_remove_phone ()
   remove_phone_qe = GNUNET_NAMESTORE_records_lookup (ns,
                                                      &zone_pkey,
                                                      phone_label,
+                                                     &handle_remove_error,
+                                                     NULL,
                                                      &remove_phone_handle_existing_records,
                                                      NULL);
   GNUNET_free (phone_label);
@@ -492,4 +523,3 @@ GCG_IMPORT_shutdown ()
 
 
 /* end of gnunet-conversation-gtk_import.c */
-