more psycey method names in test_social.c

2 files changed, 10 insertions, 8 deletions

diff --git a/po/POTFILES.in b/po/POTFILES.in
index ad6c57a90..f0822c03c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -75,6 +75,7 @@ src/core/gnunet-service-core_neighbours.c
 src/core/gnunet-service-core_sessions.c
 src/core/gnunet-service-core_typemap.c
 src/curl/curl.c
+src/curl/curl_reschedule.c
 src/datacache/datacache.c
 src/datacache/plugin_datacache_heap.c
 src/datacache/plugin_datacache_postgres.c
@@ -212,6 +213,7 @@ src/identity-provider/gnunet-service-identity-provider.c
 src/identity-provider/identity_provider_api.c
 src/identity-provider/identity_token.c
 src/identity-provider/plugin_rest_identity_provider.c
+src/jsonapi/jsonapi.c
 src/json/json.c
 src/json/json_generator.c
 src/json/json_helper.c
diff --git a/src/social/test_social.c b/src/social/test_social.c
index e2639f4d6..d781561e5 100644
--- a/src/social/test_social.c
+++ b/src/social/test_social.c
@@ -568,7 +568,7 @@ guest_leave()
 
   struct GNUNET_PSYC_Environment *env = GNUNET_PSYC_env_create ();
   GNUNET_PSYC_env_add (env, GNUNET_PSYC_OP_SET,
-                       "_message", DATA2ARG ("Leaving."));
+                       "_notice_place_leave", DATA2ARG ("Leaving."));
   GNUNET_SOCIAL_guest_leave (gst, env, &guest_left, NULL);
   GNUNET_PSYC_env_destroy (env);
   gst = NULL;
@@ -943,7 +943,7 @@ guest_talk ()
   tmit.data_count = 3;
 
   tmit.guest_talk
-    = GNUNET_SOCIAL_guest_talk (gst, "_message_guest", tmit.env,
+    = GNUNET_SOCIAL_guest_talk (gst, "_converse_guest", tmit.env,
                                 &notify_data, &tmit,
                                 GNUNET_SOCIAL_TALK_NONE);
 }
@@ -973,7 +973,7 @@ host_announce ()
   tmit.data_count = 4;
 
   tmit.host_ann
-    = GNUNET_SOCIAL_host_announce (hst, "_message_host", tmit.env,
+    = GNUNET_SOCIAL_host_announce (hst, "_converse_host", tmit.env,
                                    &notify_data, &tmit,
                                    GNUNET_SOCIAL_ANNOUNCE_NONE);
 }
@@ -1005,7 +1005,7 @@ host_announce2 ()
   tmit.data_count = 3;
 
   tmit.host_ann
-    = GNUNET_SOCIAL_host_announce (hst, "_message_host_two", tmit.env,
+    = GNUNET_SOCIAL_host_announce (hst, "_converse_host_two", tmit.env,
                                    &notify_data, &tmit,
                                    GNUNET_SOCIAL_ANNOUNCE_NONE);
 }
@@ -1081,7 +1081,7 @@ host_answer_door (void *cls,
   {
   case TEST_HOST_ANSWER_DOOR_REFUSE:
     test = TEST_GUEST_RECV_ENTRY_DCSN_REFUSE;
-    join_resp = GNUNET_PSYC_message_create ("_refuse_nym", env,
+    join_resp = GNUNET_PSYC_message_create ("_notice_place_refuse", env,
                                             DATA2ARG ("Go away!"));
     GNUNET_SOCIAL_host_entry_decision (hst, nym, GNUNET_NO, join_resp);
     break;
@@ -1089,7 +1089,7 @@ host_answer_door (void *cls,
   case TEST_HOST_ANSWER_DOOR_ADMIT:
     test = TEST_GUEST_RECV_ENTRY_DCSN_ADMIT;
   case TEST_GUEST_ENTER_BY_NAME:
-    join_resp = GNUNET_PSYC_message_create ("_admit_nym", env,
+    join_resp = GNUNET_PSYC_message_create ("_notice_place_admit", env,
                                             DATA2ARG ("Welcome, nym!"));
     GNUNET_SOCIAL_host_entry_decision (hst, nym, GNUNET_YES, join_resp);
     break;
@@ -1139,7 +1139,7 @@ guest_enter ()
                                    guest_recv_entry_decision, NULL);
   gst_plc = GNUNET_SOCIAL_guest_get_place (gst);
 
-  GNUNET_SOCIAL_place_msg_proc_set (gst_plc, "_message",
+  GNUNET_SOCIAL_place_msg_proc_set (gst_plc, "_converse",
                                     GNUNET_SOCIAL_MSG_PROC_SAVE);
 }
 
@@ -1249,7 +1249,7 @@ host_enter ()
                                   host_answer_door, host_farewell, NULL);
   hst_plc = GNUNET_SOCIAL_host_get_place (hst);
 
-  GNUNET_SOCIAL_place_msg_proc_set (hst_plc, "_message",
+  GNUNET_SOCIAL_place_msg_proc_set (hst_plc, "_converse",
                                     GNUNET_SOCIAL_MSG_PROC_RELAY);
 }