pidgin.vv.yahoo.voice: b5a5c8ee: Combine #ifdefs into single #ifs. Thanks...

[maiku at pidgin.im]

-----------------------------------------------------------------
Revision: b5a5c8ee2d8620284a4457631c7fc64817ef2b0c
Ancestor: 6a654dbf8d08e46b68e5b9996ded883afe1146f6
Author: maiku at pidgin.im
Date: 2009-08-30T01:01:07
Branch: im.pidgin.pidgin.vv.yahoo.voice
URL: http://d.pidgin.im/viewmtn/revision/info/b5a5c8ee2d8620284a4457631c7fc64817ef2b0c

Modified files:
        libpurple/protocols/yahoo/yahoo_sip.c

ChangeLog: 

Combine #ifdefs into single #ifs. Thanks again to Stu.

-------------- next part --------------
============================================================
--- libpurple/protocols/yahoo/yahoo_sip.c	f9c07e06639a2aaf10b5f24c09511d24c6c381d0
+++ libpurple/protocols/yahoo/yahoo_sip.c	edf3dab3806b651b09526aaeabfb62de126ee1a8
@@ -32,19 +32,16 @@
 #include "yahoo_sip.h"
 #include "libymsg.h"
 
-#ifdef USE_VV
-#ifdef USE_SOFIASIP
+#if defined(USE_VV) && defined(USE_SOFIASIP)
 #include <sofia-sip/nua.h>
 #include <sofia-sip/su_glib.h>
 #include <sofia-sip/soa.h>
 #include <sofia-sip/sip_header.h>
 #include <sofia-sip/sdp.h>
-#endif /* USE_SOFIASIP */
-#endif /* USE_VV */
+#endif /* defined(USE_VV) && defined(USE_SOFIASIP) */
 
 struct _YahooSip {
-#ifdef USE_VV
-#ifdef USE_SOFIASIP
+#if defined(USE_VV) && defined(USE_SOFIASIP)
 	su_root_t *root;
 	nua_t *nua;
 	nua_handle_t *nh;
@@ -52,12 +49,10 @@ struct _YahooSip {
 	guint yahooref_timeout_handle;
 	gchar *to_str;
 	gboolean shutdown;
-#endif /* USE_SOFIASIP */
-#endif /* USE_VV */
+#endif /* defined(USE_VV) && defined(USE_SOFIASIP) */
 };
 
-#ifdef USE_VV
-#ifdef USE_SOFIASIP
+#if defined(USE_VV) && defined(USE_SOFIASIP)
 static void yahoo_sip_candidates_prepared_cb(PurpleMedia *media,
 		gchar *sid, gchar *name, nua_handle_t *nh);
 static void yahoo_sip_codecs_changed_cb(PurpleMedia *media,
@@ -523,27 +518,23 @@ yahoo_start_sip(GSList *hosts, gpointer 
 #endif
 			TAG_END());
 }
-#endif /* USE_SOFIASIP */
-#endif /* USE_VV */
+#endif /* defined(USE_VV) && defined(USE_SOFIASIP) */
 
 void
 yahoo_sip_init(PurpleAccount *account)
 {
-#ifdef USE_VV
-#ifdef USE_SOFIASIP
+#if defined(USE_VV) && defined(USE_SOFIASIP)
 	if (purple_dnsquery_a(YAHOO_SIP_HOST, 443,
 			yahoo_start_sip, account) == NULL)
 		purple_debug_warning("yahoo", "Error starting SIP "
 				"server dns query\n");
-#endif /* USE_SOFIASIP */
-#endif /* USE_VV */
+#endif /* defined(USE_VV) && defined(USE_SOFIASIP) */
 }
 
 void
 yahoo_sip_uninit(PurpleAccount *account)
 {
-#ifdef USE_VV
-#ifdef USE_SOFIASIP
+#if defined(USE_VV) && defined(USE_SOFIASIP)
 	PurpleConnection *pc = purple_account_get_connection(account);
 	YahooData *yd = purple_connection_get_protocol_data(pc);
 	YahooSip *ysip = yd->ysip;
@@ -571,6 +562,5 @@ yahoo_sip_uninit(PurpleAccount *account)
 	nua_destroy(ysip->nua);
 	g_free(ysip->to_str);
 	g_free(ysip);
-#endif /* USE_SOFIASIP */
-#endif /* USE_VV */
+#endif /* defined(USE_VV) && defined(USE_SOFIASIP) */
 }