/pidgin/main: 78c026f584bd: Remove extra extern "C". That's what...

Elliott Sales de Andrade qulogic at pidgin.im
Thu Jan 17 05:40:51 EST 2013


Changeset: 78c026f584bd5fc4a6baf0d500c51401e5925180
Author:	 Elliott Sales de Andrade <qulogic at pidgin.im>
Date:	 2013-01-17 05:00 -0500
Branch:	 default
URL: http://hg.pidgin.im/pidgin/main/rev/78c026f584bd

Description:

Remove extra extern "C". That's what G_BEGIN/END_DECLS does.

diffstat:

 libpurple/protocols/jabber/jingle/content.h   |  8 --------
 libpurple/protocols/jabber/jingle/iceudp.h    |  8 --------
 libpurple/protocols/jabber/jingle/jingle.h    |  8 --------
 libpurple/protocols/jabber/jingle/rawudp.h    |  8 --------
 libpurple/protocols/jabber/jingle/rtp.h       |  8 --------
 libpurple/protocols/jabber/jingle/session.h   |  8 --------
 libpurple/protocols/jabber/jingle/transport.h |  8 --------
 7 files changed, 0 insertions(+), 56 deletions(-)

diffs (175 lines):

diff --git a/libpurple/protocols/jabber/jingle/content.h b/libpurple/protocols/jabber/jingle/content.h
--- a/libpurple/protocols/jabber/jingle/content.h
+++ b/libpurple/protocols/jabber/jingle/content.h
@@ -68,10 +68,6 @@ struct _JingleContent
 	JingleContentPrivate *priv;      /**< The private data of this object. */
 };
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /**
  * Gets the content class's GType
  *
@@ -111,10 +107,6 @@ JingleContent *jingle_content_parse(xmln
 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 */
diff --git a/libpurple/protocols/jabber/jingle/iceudp.h b/libpurple/protocols/jabber/jingle/iceudp.h
--- a/libpurple/protocols/jabber/jingle/iceudp.h
+++ b/libpurple/protocols/jabber/jingle/iceudp.h
@@ -87,10 +87,6 @@ struct _JingleIceUdpCandidate
 				 * about this candidate */
 };
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 GType jingle_iceudp_candidate_get_type(void);
 
 /**
@@ -106,10 +102,6 @@ JingleIceUdpCandidate *jingle_iceudp_can
 		const gchar *protocol, const gchar *type,
 		const gchar *username, const gchar *password);
 
-#ifdef __cplusplus
-}
-#endif
-
 G_END_DECLS
 
 #endif /* PURPLE_JABBER_JINGLE_ICEUDP_H */
diff --git a/libpurple/protocols/jabber/jingle/jingle.h b/libpurple/protocols/jabber/jingle/jingle.h
--- a/libpurple/protocols/jabber/jingle/jingle.h
+++ b/libpurple/protocols/jabber/jingle/jingle.h
@@ -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 @@ GParameter *jingle_get_params(JabberStre
     const gchar *relay_username, const gchar *relay_password, guint *num_params);
 #endif
 
-#ifdef __cplusplus
-}
-#endif
-
 G_END_DECLS
 
 #endif /* PURPLE_JABBER_JINGLE_H */
diff --git a/libpurple/protocols/jabber/jingle/rawudp.h b/libpurple/protocols/jabber/jingle/rawudp.h
--- a/libpurple/protocols/jabber/jingle/rawudp.h
+++ b/libpurple/protocols/jabber/jingle/rawudp.h
@@ -77,10 +77,6 @@ struct _JingleRawUdpCandidate
 				 * about this candidate */
 };
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 GType jingle_rawudp_candidate_get_type(void);
 
 /**
@@ -93,10 +89,6 @@ GType jingle_rawudp_get_type(void);
 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 */
diff --git a/libpurple/protocols/jabber/jingle/rtp.h b/libpurple/protocols/jabber/jingle/rtp.h
--- a/libpurple/protocols/jabber/jingle/rtp.h
+++ b/libpurple/protocols/jabber/jingle/rtp.h
@@ -65,10 +65,6 @@ struct _JingleRtp
 	JingleRtpPrivate *priv;      /**< The private data of this object. */
 };
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /**
  * Gets the rtp class's GType
  *
@@ -84,10 +80,6 @@ gboolean jingle_rtp_initiate_media(Jabbe
 				   PurpleMediaSessionType type);
 void jingle_rtp_terminate_session(JabberStream *js, const gchar *who);
 
-#ifdef __cplusplus
-}
-#endif
-
 G_END_DECLS
 
 #endif /* USE_VV */
diff --git a/libpurple/protocols/jabber/jingle/session.h b/libpurple/protocols/jabber/jingle/session.h
--- a/libpurple/protocols/jabber/jingle/session.h
+++ b/libpurple/protocols/jabber/jingle/session.h
@@ -62,10 +62,6 @@ struct _JingleSession
 
 struct _JingleContent;
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /**
  * Gets the session class's GType
  *
@@ -109,10 +105,6 @@ void jingle_session_accept_session(Jingl
 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 */
diff --git a/libpurple/protocols/jabber/jingle/transport.h b/libpurple/protocols/jabber/jingle/transport.h
--- a/libpurple/protocols/jabber/jingle/transport.h
+++ b/libpurple/protocols/jabber/jingle/transport.h
@@ -66,10 +66,6 @@ struct _JingleTransport
 	JingleTransportPrivate *priv;      /**< The private data of this object. */
 };
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /**
  * Gets the transport class's GType
  *
@@ -86,10 +82,6 @@ GList *jingle_transport_get_remote_candi
 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 */



More information about the Commits mailing list