On branch mob
Your branch is up-to-date with 'origin/mob'.
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
modified: src/purple/purple-media.c
Untracked files:
(use "git add <file>..." to include in what will be committed)
pidgin-sipe-fedora-libpurple-2.10.11-build-fix.patch
diff --git a/src/purple/purple-media.c b/src/purple/purple-media.c
index 59f462e..bd5b304 100644
--- a/src/purple/purple-media.c
+++ b/src/purple/purple-media.c
@@ -244,7 +244,8 @@ on_candidate_pair_established_cb(SIPE_UNUSED_PARAMETER PurpleMedia *media,
SIPE_UNUSED_PARAMETER PurpleMediaCandidate *remote_candidate,
SIPE_UNUSED_PARAMETER struct sipe_media_call *call)
{
-#if PURPLE_VERSION_CHECK(2,10,12) || PURPLE_VERSION_CHECK(3,0,0)
+// on Fedora 22+ libpurple-2.10.11 is actually closer to -2.10.12
+#if PURPLE_VERSION_CHECK(2,10,11) || PURPLE_VERSION_CHECK(3,0,0)
if (purple_media_candidate_get_protocol(local_candidate) != PURPLE_MEDIA_NETWORK_PROTOCOL_UDP) {
purple_media_set_send_rtcp_mux(media, sessionid, participant, TRUE);
}
@@ -399,7 +400,8 @@ sipe_backend_media_relays_convert(GSList *media_relays, gchar *username, gchar *
append_relay(relay_info, relay->hostname, relay->udp_port,
"udp", username, password);
-#if PURPLE_VERSION_CHECK(2,10,12) || PURPLE_VERSION_CHECK(3,0,0)
+// on Fedora 22+ libpurple-2.10.11 is actually closer to -2.10.12
+#if PURPLE_VERSION_CHECK(2,10,11) || PURPLE_VERSION_CHECK(3,0,0)
if (relay->tcp_port != 0) {
gchar *type = "tcp";
if (relay->tcp_port == 443)
@@ -500,7 +502,8 @@ sipe_backend_media_add_remote_candidates(struct sipe_media_call *media,
{
GList *udp_candidates = NULL;
-#if !(PURPLE_VERSION_CHECK(2,10,12) || PURPLE_VERSION_CHECK(3,0,0))
+// on Fedora 22+ libpurple-2.10.11 is actually closer to -2.10.12
+#if PURPLE_VERSION_CHECK(2,10,11) || PURPLE_VERSION_CHECK(3,0,0)
while (candidates) {
PurpleMediaCandidate *candidate = candidates->data;
PurpleMediaNetworkProtocol proto;
@@ -1005,7 +1008,8 @@ static PurpleMediaNetworkProtocol
sipe_network_protocol_to_purple(SipeNetworkProtocol proto)
{
switch (proto) {
-#if PURPLE_VERSION_CHECK(2,10,12) || PURPLE_VERSION_CHECK(3,0,0)
+// on Fedora 22+ libpurple-2.10.11 is actually closer to -2.10.12
+#if PURPLE_VERSION_CHECK(2,10,11) || PURPLE_VERSION_CHECK(3,0,0)
case SIPE_NETWORK_PROTOCOL_TCP_ACTIVE:
return PURPLE_MEDIA_NETWORK_PROTOCOL_TCP_ACTIVE;
case SIPE_NETWORK_PROTOCOL_TCP_PASSIVE:
@@ -1028,7 +1032,8 @@ static SipeNetworkProtocol
purple_network_protocol_to_sipe(PurpleMediaNetworkProtocol proto)
{
switch (proto) {
-#if PURPLE_VERSION_CHECK(2,10,12) || PURPLE_VERSION_CHECK(3,0,0)
+// on Fedora 22+ libpurple-2.10.11 is actually closer to -2.10.12
+#if PURPLE_VERSION_CHECK(2,10,11) || PURPLE_VERSION_CHECK(3,0,0)
case PURPLE_MEDIA_NETWORK_PROTOCOL_TCP_ACTIVE:
return SIPE_NETWORK_PROTOCOL_TCP_ACTIVE;
case PURPLE_MEDIA_NETWORK_PROTOCOL_TCP_PASSIVE: