pidgin: e3412a62: purple: Fix some compiler warnings relat...

[darkrain42 at pidgin.im]

----------------------------------------------------------------------
Revision: e3412a6219d7668318714021df92d7880656f447
Parent:   c0c17c8acb8a0c1a99cdfe686fac11c64474c5e6
Author:   darkrain42 at pidgin.im
Date:     05/03/11 01:19:14
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/e3412a6219d7668318714021df92d7880656f447

Changelog: 

purple: Fix some compiler warnings related to new API and missing prototypes.

Really just an excuse to cause everyone to need to rebuild everything.

Changes against parent c0c17c8acb8a0c1a99cdfe686fac11c64474c5e6

  patched  libpurple/dnsquery.c
  patched  libpurple/dnsquery.h
  patched  libpurple/dnssrv.c
  patched  libpurple/dnssrv.h
  patched  libpurple/proxy.c
  patched  libpurple/proxy.h

-------------- next part --------------
============================================================
--- libpurple/proxy.c	dd9485fbf7910ffe950e667772da2f6ba8b627cb
+++ libpurple/proxy.c	18c29e48d0e29eee890385a593b3fee5bf0994e5
@@ -29,6 +29,7 @@
 /* it is intended to : 1st handle http proxy, using the CONNECT command
  , 2nd provide an easy way to add socks support
  , 3rd draw women to it like flies to honey */
+#define _PURPLE_PROXY_C_
 
 #include "internal.h"
 #include "cipher.h"
============================================================
--- libpurple/proxy.h	ceae59ba93647845733eed2c844f5f3bdb8f5007
+++ libpurple/proxy.h	33c3b8e58416f270d0ca15dff33fe5d8b60e3272
@@ -312,7 +312,7 @@ PurpleProxyConnectData *purple_proxy_con
 			const char *host, int port,
 			PurpleProxyConnectFunction connect_cb, gpointer data);
 
-#ifndef PURPLE_DISABLE_DEPRECATED
+#if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_PROXY_C_)
 /**
  * Makes a connection through a SOCKS5 proxy.
  *
============================================================
--- libpurple/dnssrv.c	cba00135fe0c523deb64591125d43bbf9ed1c311
+++ libpurple/dnssrv.c	f0f0b672d16c88368ff684b3127ca914f5a1136c
@@ -20,6 +20,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
+#define _PURPLE_DNSSRV_C_
 
 #include "internal.h"
 #include "util.h"
============================================================
--- libpurple/dnssrv.h	e40d82c3321a74f9efdcde650f43ddc6ce179938
+++ libpurple/dnssrv.h	fb5a5c37acfea95ea78541872185ea5ae1e87991
@@ -114,7 +114,7 @@ PurpleSrvTxtQueryData *purple_srv_resolv
  */
 PurpleSrvTxtQueryData *purple_srv_resolve_account(PurpleAccount *account, const char *protocol, const char *transport, const char *domain, PurpleSrvCallback cb, gpointer extradata);
 
-#ifndef PURPLE_DISABLE_DEPRECATED
+#if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_DNSSRV_C_)
 /**
  * Queries an SRV record.
  *
@@ -149,7 +149,7 @@ PurpleSrvTxtQueryData *purple_txt_resolv
  */
 PurpleSrvTxtQueryData *purple_txt_resolve_account(PurpleAccount *account, const char *owner, const char *domain, PurpleTxtCallback cb, gpointer extradata);
 
-#ifndef PURPLE_DISABLE_DEPRECATED
+#if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_DNSSRV_C_)
 /**
  * Queries an TXT record.
  *
============================================================
--- libpurple/dnsquery.c	67bb94b47bc890d206582227262970f859477244
+++ libpurple/dnsquery.c	a887e0dcb02c86d36d2710ce1487a9dac7dcc340
@@ -24,6 +24,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
+#define _PURPLE_DNSQUERY_C_
 
 #include "internal.h"
 #include "debug.h"
============================================================
--- libpurple/dnsquery.h	7225dfc6bca4865f4b54e9103ba60aeea279cffc
+++ libpurple/dnsquery.h	be2134cced69bea1dea731f342425a27e1151037
@@ -102,7 +102,7 @@ PurpleDnsQueryData *purple_dnsquery_a_ac
  */
 PurpleDnsQueryData *purple_dnsquery_a_account(PurpleAccount *account, const char *hostname, int port, PurpleDnsQueryConnectFunction callback, gpointer data);
 
-#ifndef PURPLE_DISABLE_DEPRECATED
+#if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_DNSQUERY_C_)
 /**
  * Perform an asynchronous DNS query.
  *