From 096adaa7479ccee6f328f650db063af4d2180dea Mon Sep 17 00:00:00 2001 From: Stefan Becker Date: Tue, 20 Dec 2016 13:56:45 +0200 Subject: [PATCH] conf: fix process_conference_appshare_endpoint C functions support a fancy feature called "return value"... --- src/core/sipe-conf.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/core/sipe-conf.c b/src/core/sipe-conf.c index 27e38051..95803cbc 100644 --- a/src/core/sipe-conf.c +++ b/src/core/sipe-conf.c @@ -1224,21 +1224,21 @@ sipe_core_conf_is_viewing_appshare(struct sipe_core_public *sipe_public, return FALSE; } -static void +static gboolean process_conference_appshare_endpoint(struct sipe_core_private *sipe_private, const sipe_xml *endpoint, - struct sip_session *session, - gboolean *presentation_added) + struct sip_session *session) { + gboolean presentation_added = FALSE; const sipe_xml *media; if (sipe_core_conf_is_viewing_appshare(SIPE_CORE_PUBLIC, session->chat_session)) { - return; + return(FALSE); } for (media = sipe_xml_child(endpoint, "media"); - media && !(*presentation_added); + media && !presentation_added; media = sipe_xml_twin(media)) { gchar *type; gchar *media_state; @@ -1251,13 +1251,15 @@ process_conference_appshare_endpoint(struct sipe_core_private *sipe_private, if (sipe_strequal(type, "applicationsharing") && sipe_strequal(media_state, "connected") && sipe_strequal(status, "sendonly")) { - *presentation_added = TRUE; + presentation_added = TRUE; } g_free(type); g_free(media_state); g_free(status); } + + return(presentation_added); } #endif // HAVE_APPSHARE #endif // HAVE_VV @@ -1409,10 +1411,9 @@ sipe_process_conference(struct sipe_core_private *sipe_private, #endif } else if (sipe_strequal("applicationsharing", session_type)) { #ifdef HAVE_APPSHARE - process_conference_appshare_endpoint(sipe_private, - endpoint, - session, - &presentation_was_added); + presentation_was_added = process_conference_appshare_endpoint(sipe_private, + endpoint, + session); #endif } } -- 2.11.4.GIT