add callback for successful connection to a conference

2 files changed, 14 insertions, 24 deletions

diff --git a/auto_tests/conference_simple_test.c b/auto_tests/conference_simple_test.c
index 5a286b4a..010ae029 100644
--- a/auto_tests/conference_simple_test.c
+++ b/auto_tests/conference_simple_test.c
@@ -87,22 +87,17 @@ static void handle_conference_peer_list_changed(Tox *tox, uint32_t conference_nu
 
     fprintf(stderr, "tox%d has %d peers online\n", state->id, count);
     state->peers = count;
+}
+
+static void handle_conference_connected(Tox *tox, uint32_t conference_number, void *user_data)
+{
+    State *state = (State *)user_data;
 
     // We're tox2, so now we invite tox3.
     if (state->id == 2 && !state->invited_next) {
-        // TODO(zugz): neater way to determine whether we are connected, and when
-        // we become so
-        TOX_ERR_CONFERENCE_PEER_QUERY peer_err;
-        tox_conference_peer_number_is_ours(tox, 0, 0, &peer_err);
-
-        if (peer_err != TOX_ERR_CONFERENCE_PEER_QUERY_OK) {
-            return;
-        }
-
-        TOX_ERR_CONFERENCE_INVITE err_invite;
-        tox_conference_invite(tox, 1, state->conference, &err_invite);
-        ck_assert_msg(err_invite == TOX_ERR_CONFERENCE_INVITE_OK,
-                      "tox2 failed to invite tox3: err = %d", err_invite);
+        TOX_ERR_CONFERENCE_INVITE err;
+        tox_conference_invite(tox, 1, state->conference, &err);
+        ck_assert_msg(err == TOX_ERR_CONFERENCE_INVITE_OK, "tox2 failed to invite tox3: err = %d", err);
 
         state->invited_next = true;
         fprintf(stderr, "tox2 invited tox3\n");
@@ -155,6 +150,10 @@ int main(void)
     tox_callback_conference_invite(tox2, handle_conference_invite);
     tox_callback_conference_invite(tox3, handle_conference_invite);
 
+    tox_callback_conference_connected(tox1, handle_conference_connected);
+    tox_callback_conference_connected(tox2, handle_conference_connected);
+    tox_callback_conference_connected(tox3, handle_conference_connected);
+
     tox_callback_conference_message(tox1, handle_conference_message);
     tox_callback_conference_message(tox2, handle_conference_message);
     tox_callback_conference_message(tox3, handle_conference_message);
diff --git a/auto_tests/conference_test.c b/auto_tests/conference_test.c
index fd4f41b4..8f8f9357 100644
--- a/auto_tests/conference_test.c
+++ b/auto_tests/conference_test.c
@@ -70,7 +70,7 @@ static void handle_conference_invite(
                   "tox #%u: joining groupchat twice should be impossible.", state->id);
 }
 
-static void handle_conference_peer_list_changed(
+static void handle_conference_connected(
     Tox *tox, uint32_t conference_number, void *user_data)
 {
     State *state = (State *)user_data;
@@ -79,15 +79,6 @@ static void handle_conference_peer_list_changed(
         return;
     }
 
-    // TODO(zugz): neater way to determine whether we are connected, and when
-    // we become so
-    TOX_ERR_CONFERENCE_PEER_QUERY peer_err;
-    tox_conference_peer_number_is_ours(tox, 0, 0, &peer_err);
-
-    if (peer_err != TOX_ERR_CONFERENCE_PEER_QUERY_OK) {
-        return;
-    }
-
     TOX_ERR_CONFERENCE_INVITE err;
     tox_conference_invite(tox, 1, 0, &err);
     ck_assert_msg(err == TOX_ERR_CONFERENCE_INVITE_OK, "tox #%u failed to invite next friend: err = %d", state->id, err);
@@ -190,7 +181,7 @@ static void test_many_group(void)
         tox_callback_self_connection_status(toxes[i], &handle_self_connection_status);
         tox_callback_friend_connection_status(toxes[i], &handle_friend_connection_status);
         tox_callback_conference_invite(toxes[i], &handle_conference_invite);
-        tox_callback_conference_peer_list_changed(toxes[i], &handle_conference_peer_list_changed);
+        tox_callback_conference_connected(toxes[i], &handle_conference_connected);
 
         char name[NAMELEN + 1];
         snprintf(name, NAMELEN + 1, NAME_FORMAT_STR, state[i].id);