/pidgin/main: 4e366d822656: Merge with release-2.x.y

[Daniel Atallah]

Changeset: 4e366d822656b6d5371cb28e7d9cfd076e3eed59
Author:	 Daniel Atallah <datallah at pidgin.im>
Date:	 2014-12-17 09:37 -0500
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/4e366d822656

Description:

Merge with release-2.x.y

diffstat:

 libpurple/protocols/bonjour/dns_sd_proxy.c |  9 ---------
 1 files changed, 0 insertions(+), 9 deletions(-)

diffs (41 lines):

diff --git a/libpurple/protocols/bonjour/dns_sd_proxy.c b/libpurple/protocols/bonjour/dns_sd_proxy.c
--- a/libpurple/protocols/bonjour/dns_sd_proxy.c
+++ b/libpurple/protocols/bonjour/dns_sd_proxy.c
@@ -22,7 +22,6 @@
 #include "internal.h"
 #include "dns_sd_proxy.h"
 
-#ifndef LINK_DNS_SD_DIRECTLY
 static DNSServiceErrorType (DNSSD_API* _DNSServiceAddRecord)(DNSServiceRef sdRef, DNSRecordRef *RecordRef, DNSServiceFlags flags,
 		uint16_t rrtype, uint16_t rdlen, const void *rdata, uint32_t ttl);
 static DNSServiceErrorType (DNSSD_API* _DNSServiceBrowse)(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex,
@@ -50,10 +49,8 @@ static int16_t (DNSSD_API* _TXTRecordGet
 static const void * (DNSSD_API* _TXTRecordGetValuePtr)(uint16_t txtLen, const void *txtRecord, const char *key, uint8_t *valueLen);
 static DNSServiceErrorType (DNSSD_API* _TXTRecordSetValue)(TXTRecordRef *txtRecord, const char *key, uint8_t valueSize, const void *value);
 
-#endif
 
 gboolean dns_sd_available(void) {
-#ifndef LINK_DNS_SD_DIRECTLY
 	static gboolean initialized = FALSE;
 	static gboolean loaded = FALSE;
 
@@ -81,12 +78,8 @@ gboolean dns_sd_available(void) {
 		}
 	}
 	return loaded;
-#else
-	return TRUE;
-#endif
 }
 
-#ifndef LINK_DNS_SD_DIRECTLY
 
 DNSServiceErrorType _wpurple_DNSServiceAddRecord(DNSServiceRef sdRef, DNSRecordRef *RecordRef, DNSServiceFlags flags,
 		uint16_t rrtype, uint16_t rdlen, const void *rdata, uint32_t ttl) {
@@ -187,5 +180,3 @@ DNSServiceErrorType _wpurple_TXTRecordSe
 	return (_TXTRecordSetValue)(txtRecord, key, valueSize, value);
 }
 
-#endif /*LINK_DNS_SD_DIRECTLY*/
-