From b1e993ba2c6783d48fbf8d4a06efd45d933fad94 Mon Sep 17 00:00:00 2001
From: Jakub Adam <jakub.adam@ktknet.cz>
Date: Mon, 12 Dec 2016 12:07:49 +0100
Subject: [PATCH] appshare: move connect_conference to core

---
 src/api/sipe-core.h      | 14 ++++++++++++++
 src/core/sipe-appshare.c | 10 +++++-----
 src/core/sipe-appshare.h |  5 -----
 src/core/sipe-conf.c     | 10 +++-------
 4 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/src/api/sipe-core.h b/src/api/sipe-core.h
index 2cd9f1f7..0d8d06d3 100644
--- a/src/api/sipe-core.h
+++ b/src/api/sipe-core.h
@@ -509,6 +509,20 @@ sipe_core_ft_create_outgoing(struct sipe_core_public *sipe_public,
 			     const gchar *who,
 			     const gchar *file);
 
+/* application sharing */
+
+/**
+ * Connects to a meeting's presentation
+ *
+ * @param sipe_public (in) SIPE core data.
+ * @param chat_session (in) chat session structure
+ * @param user_must_accept (in) @c TRUE if user should be shown accept/decline
+ * 			   dialog before the action can proceed.
+ */
+void sipe_core_appshare_connect_conference(struct sipe_core_public *sipe_public,
+					   struct sipe_chat_session *chat_session,
+					   gboolean user_must_accept);
+
 /* group chat */
 gboolean sipe_core_groupchat_query_rooms(struct sipe_core_public *sipe_public);
 void sipe_core_groupchat_join(struct sipe_core_public *sipe_public,
diff --git a/src/core/sipe-appshare.c b/src/core/sipe-appshare.c
index 01277cfa..182bd62f 100644
--- a/src/core/sipe-appshare.c
+++ b/src/core/sipe-appshare.c
@@ -576,9 +576,9 @@ connect_conference(struct sipe_core_private *sipe_private,
 }
 
 void
-sipe_appshare_connect_conference(struct sipe_core_private *sipe_private,
-				 struct sipe_chat_session *chat_session,
-				 gboolean user_must_accept)
+sipe_core_appshare_connect_conference(struct sipe_core_public *sipe_public,
+				      struct sipe_chat_session *chat_session,
+				      gboolean user_must_accept)
 {
 	if (user_must_accept) {
 		const gchar *from;
@@ -591,12 +591,12 @@ sipe_appshare_connect_conference(struct sipe_core_private *sipe_private,
 			from = chat_session->id;
 		}
 
-		ask_accept_applicationsharing(sipe_private, from,
+		ask_accept_applicationsharing(SIPE_CORE_PRIVATE, from,
 					      (SipeUserAskCb)connect_conference,
 					      NULL,
 					      chat_session);
 	} else {
-		connect_conference(sipe_private, chat_session);
+		connect_conference(SIPE_CORE_PRIVATE, chat_session);
 	}
 }
 
diff --git a/src/core/sipe-appshare.h b/src/core/sipe-appshare.h
index 5769a654..8fb9245f 100644
--- a/src/core/sipe-appshare.h
+++ b/src/core/sipe-appshare.h
@@ -22,7 +22,6 @@
 
 /* Forward declarations */
 struct sipe_core_private;
-struct sipe_chat_session;
 struct sipe_media_stream;
 struct sipmsg;
 
@@ -38,7 +37,3 @@ struct sipe_rdp_client {
 
 void process_incoming_invite_appshare(struct sipe_core_private *sipe_private,
 				      struct sipmsg *msg);
-
-void sipe_appshare_connect_conference(struct sipe_core_private *sipe_private,
-				      struct sipe_chat_session *chat_session,
-				      gboolean user_must_accept);
diff --git a/src/core/sipe-conf.c b/src/core/sipe-conf.c
index 797448d0..18bf15d4 100644
--- a/src/core/sipe-conf.c
+++ b/src/core/sipe-conf.c
@@ -41,11 +41,6 @@
 
 #include <glib.h>
 
-#ifdef HAVE_GIO
-#include <gio/gio.h>
-#include "sipe-appshare.h"
-#endif
-
 #include "sipe-common.h"
 #include "sipmsg.h"
 #include "sip-transport.h"
@@ -1414,8 +1409,9 @@ sipe_process_conference(struct sipe_core_private *sipe_private,
 	}
 #if defined(HAVE_XDATA) && defined(HAVE_GIO)
 	if (presentation_was_added) {
-		sipe_appshare_connect_conference(sipe_private, session->chat_session,
-						 TRUE);
+		sipe_core_appshare_connect_conference(SIPE_CORE_PUBLIC,
+						      session->chat_session,
+						      TRUE);
 	}
 #endif // defined(HAVE_XDATA) && defined(HAVE_GIO)
 #endif // HAVE_VV
-- 
2.11.4.GIT