Prevents Conference.getParticipants() from including the URI of the conference focus

coreapi/conference.cc

@@ -66,7 +66,7 @@ public:
 	bool microphoneIsMuted() const {return m_isMuted;}
 	float getInputVolume() const;
 	
-	virtual int getParticipantCount() const {return m_participants.size();}
+	virtual int getParticipantCount() const {return m_participants.size() + (isIn()?1:0);}
 	const std::list<Participant> &getParticipants() const {return m_participants;}
 	
 	virtual int startRecording(const char *path) = 0;
@@ -585,7 +585,7 @@ int RemoteConference::addParticipant(LinphoneCall *call) {
 				m_pendingCalls = ms_list_append(m_pendingCalls, linphone_call_ref(call));
 				m_state = ConnectingToFocus;
 				linphone_address_unref(addr);
-				addParticipant(m_focusCall);
+				call->conf_ref = (LinphoneConference *)this;
 				return 0;
 			} else return -1;
 

tester/multi_call_tester.c

@@ -263,7 +263,8 @@ static void simple_conference_base(LinphoneCoreManager* marie, LinphoneCoreManag
 	if(conference) {
 		MSList *participants = linphone_conference_get_participants(conference);
 		BC_ASSERT_EQUAL(linphone_conference_get_participant_count(conference), linphone_core_get_conference_size(marie->lc), int, "%d");
-		BC_ASSERT_EQUAL(linphone_conference_get_participant_count(conference), ms_list_size(participants), int, "%d");
+		BC_ASSERT_EQUAL(linphone_conference_get_participant_count(conference), ms_list_size(participants)+(linphone_conference_is_in(conference)?1:0), int, "%d");
+		BC_ASSERT_TRUE(linphone_conference_is_in(conference));
 		ms_list_free_with_data(participants, (void(*)(void *))linphone_address_destroy);
 	}