Mercurial > pidgin3 / changeset

--- a/libpurple/protocols/jabber/jingle/content.h	Thu Jan 17 04:45:01 2013 -0500
+++ b/libpurple/protocols/jabber/jingle/content.h	Thu Jan 17 05:00:00 2013 -0500
@@ -68,10 +68,6 @@
 	JingleContentPrivate *priv;      /**< The private data of this object. */
 };
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /**
  * Gets the content class's GType
  *
@@ -111,10 +107,6 @@
 xmlnode *jingle_content_to_xml(JingleContent *content, xmlnode *jingle, JingleActionType action);
 void jingle_content_handle_action(JingleContent *content, xmlnode *xmlcontent, JingleActionType action);
 
-#ifdef __cplusplus
-}
-#endif
-
 G_END_DECLS
 
 #endif /* PURPLE_JABBER_JINGLE_CONTENT_H */

--- a/libpurple/protocols/jabber/jingle/iceudp.h	Thu Jan 17 04:45:01 2013 -0500
+++ b/libpurple/protocols/jabber/jingle/iceudp.h	Thu Jan 17 05:00:00 2013 -0500
@@ -87,10 +87,6 @@
 				 * about this candidate */
 };
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 GType jingle_iceudp_candidate_get_type(void);
 
 /**
@@ -106,10 +102,6 @@
 		const gchar *protocol, const gchar *type,
 		const gchar *username, const gchar *password);
 
-#ifdef __cplusplus
-}
-#endif
-
 G_END_DECLS
 
 #endif /* PURPLE_JABBER_JINGLE_ICEUDP_H */

--- a/libpurple/protocols/jabber/jingle/jingle.h	Thu Jan 17 04:45:01 2013 -0500
+++ b/libpurple/protocols/jabber/jingle/jingle.h	Thu Jan 17 05:00:00 2013 -0500
@@ -30,10 +30,6 @@
 
 G_BEGIN_DECLS
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #define JINGLE "urn:xmpp:jingle:1"
 #define JINGLE_ERROR "urn:xmpp:jingle:errors:0"
 #define JINGLE_APP_FT "urn:xmpp:jingle:apps:file-transfer:1"
@@ -86,10 +82,6 @@
     const gchar *relay_username, const gchar *relay_password, guint *num_params);
 #endif
 
-#ifdef __cplusplus
-}
-#endif
-
 G_END_DECLS
 
 #endif /* PURPLE_JABBER_JINGLE_H */

--- a/libpurple/protocols/jabber/jingle/rawudp.h	Thu Jan 17 04:45:01 2013 -0500
+++ b/libpurple/protocols/jabber/jingle/rawudp.h	Thu Jan 17 05:00:00 2013 -0500
@@ -77,10 +77,6 @@
 				 * about this candidate */
 };
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 GType jingle_rawudp_candidate_get_type(void);
 
 /**
@@ -93,10 +89,6 @@
 JingleRawUdpCandidate *jingle_rawudp_candidate_new(const gchar *id,
 		guint generation, guint component, const gchar *ip, guint port);
 
-#ifdef __cplusplus
-}
-#endif
-
 G_END_DECLS
 
 #endif /* PURPLE_JABBER_JINGLE_RAWUDP_H */

--- a/libpurple/protocols/jabber/jingle/rtp.h	Thu Jan 17 04:45:01 2013 -0500
+++ b/libpurple/protocols/jabber/jingle/rtp.h	Thu Jan 17 05:00:00 2013 -0500
@@ -65,10 +65,6 @@
 	JingleRtpPrivate *priv;      /**< The private data of this object. */
 };
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /**
  * Gets the rtp class's GType
  *
@@ -84,10 +80,6 @@
 				   PurpleMediaSessionType type);
 void jingle_rtp_terminate_session(JabberStream *js, const gchar *who);
 
-#ifdef __cplusplus
-}
-#endif
-
 G_END_DECLS
 
 #endif /* USE_VV */

--- a/libpurple/protocols/jabber/jingle/session.h	Thu Jan 17 04:45:01 2013 -0500
+++ b/libpurple/protocols/jabber/jingle/session.h	Thu Jan 17 05:00:00 2013 -0500
@@ -62,10 +62,6 @@
 
 struct _JingleContent;
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /**
  * Gets the session class's GType
  *
@@ -109,10 +105,6 @@
 JabberIq *jingle_session_terminate_packet(JingleSession *session, const gchar *reason);
 JabberIq *jingle_session_redirect_packet(JingleSession *session, const gchar *sid);
 
-#ifdef __cplusplus
-}
-#endif
-
 G_END_DECLS
 
 #endif /* PURPLE_JABBER_JINGLE_SESSION_H */

--- a/libpurple/protocols/jabber/jingle/transport.h	Thu Jan 17 04:45:01 2013 -0500
+++ b/libpurple/protocols/jabber/jingle/transport.h	Thu Jan 17 05:00:00 2013 -0500
@@ -66,10 +66,6 @@
 	JingleTransportPrivate *priv;      /**< The private data of this object. */
 };
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /**
  * Gets the transport class's GType
  *
@@ -86,10 +82,6 @@
 JingleTransport *jingle_transport_parse(xmlnode *transport);
 xmlnode *jingle_transport_to_xml(JingleTransport *transport, xmlnode *content, JingleActionType action);
 
-#ifdef __cplusplus
-}
-#endif
-
 G_END_DECLS
 
 #endif /* PURPLE_JABBER_JINGLE_TRANSPORT_H */