don't run set with valgrind per default

[oweals/gnunet.git] / src / conversation / conversation_api.c

diff --git a/src/conversation/conversation_api.c b/src/conversation/conversation_api.c
index 5dd9cf79e6a0dd45448a1e40e6dff02eefa67f11..0b3920633443bbbe8ce50c734c533988ff782e20 100644 (file)
--- a/src/conversation/conversation_api.c
+++ b/src/conversation/conversation_api.c
@@ -551,27 +551,27 @@ clean_up_callers (struct GNUNET_CONVERSATION_Phone *phone)
 static void
 reconnect_phone (struct GNUNET_CONVERSATION_Phone *phone)
 {
-  GNUNET_MQ_hd_fixed_size (phone_ring,
-                          GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_RING,
-                          struct ClientPhoneRingMessage);
-  GNUNET_MQ_hd_fixed_size (phone_hangup,
-                          GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_HANG_UP,
-                          struct ClientPhoneHangupMessage);
-  GNUNET_MQ_hd_fixed_size (phone_suspend,
-                          GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_SUSPEND,
-                          struct ClientPhoneSuspendMessage);
-  GNUNET_MQ_hd_fixed_size (phone_resume,
-                          GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_RESUME,
-                          struct ClientPhoneResumeMessage);
-  GNUNET_MQ_hd_var_size (phone_audio,
-                        GNUNET_MESSAGE_TYPE_CONVERSATION_CS_AUDIO,
-                        struct ClientAudioMessage);
   struct GNUNET_MQ_MessageHandler handlers[] = {
-    make_phone_ring_handler (phone),
-    make_phone_hangup_handler (phone),
-    make_phone_suspend_handler (phone),
-    make_phone_resume_handler (phone),
-    make_phone_audio_handler (phone),
+    GNUNET_MQ_hd_fixed_size (phone_ring,
+                             GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_RING,
+                             struct ClientPhoneRingMessage,
+                             phone),
+    GNUNET_MQ_hd_fixed_size (phone_hangup,
+                             GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_HANG_UP,
+                             struct ClientPhoneHangupMessage,
+                             phone),
+    GNUNET_MQ_hd_fixed_size (phone_suspend,
+                             GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_SUSPEND,
+                             struct ClientPhoneSuspendMessage,
+                             phone),
+    GNUNET_MQ_hd_fixed_size (phone_resume,
+                             GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_RESUME,
+                             struct ClientPhoneResumeMessage,
+                             phone),
+    GNUNET_MQ_hd_var_size (phone_audio,
+                           GNUNET_MESSAGE_TYPE_CONVERSATION_CS_AUDIO,
+                           struct ClientAudioMessage,
+                           phone),
     GNUNET_MQ_handler_end ()
   };
   struct GNUNET_MQ_Envelope *e;
@@ -584,7 +584,7 @@ reconnect_phone (struct GNUNET_CONVERSATION_Phone *phone)
     phone->mq = NULL;
   }
   phone->state = PS_REGISTER;
-  phone->mq = GNUNET_CLIENT_connecT (phone->cfg,
+  phone->mq = GNUNET_CLIENT_connect (phone->cfg,
                                      "conversation",
                                      handlers,
                                      &phone_error_handler,