Mercurial > pidgin

diff libpurple/media-gst.h @ 32433:98520ee78f12

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use G_BEGIN/END_DECLS in public libpurple files. This was previously inconsistent. Sometimes there was even both the GLib macros and an extern "C" line.
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Tue, 03 Jan 2012 23:32:59 +0000
parents 02a2e8183b1d
children
line wrap: on
line diff
--- a/libpurple/media-gst.h	Tue Jan 03 19:29:43 2012 +0000
+++ b/libpurple/media-gst.h	Tue Jan 03 23:32:59 2012 +0000
@@ -32,8 +32,6 @@
 
 #include <gst/gst.h>
 
-G_BEGIN_DECLS
-
 #define PURPLE_TYPE_MEDIA_ELEMENT_TYPE           (purple_media_element_type_get_type())
 #define PURPLE_TYPE_MEDIA_ELEMENT_INFO           (purple_media_element_info_get_type())
 #define PURPLE_MEDIA_ELEMENT_INFO(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), PURPLE_TYPE_MEDIA_ELEMENT_INFO, PurpleMediaElementInfo))
@@ -73,9 +71,7 @@
 	PURPLE_MEDIA_ELEMENT_SINK = 1 << 10,		/** can be set as an active sink */
 } PurpleMediaElementType;
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
 
 /**
  * Gets the element type's GType.
@@ -176,10 +172,6 @@
 		PurpleMediaElementInfo *info, PurpleMedia *media,
 		const gchar *session_id, const gchar *participant);
 
-#ifdef __cplusplus
-}
-#endif
-
 G_END_DECLS
 
 #endif  /* _PURPLE_MEDIA_GST_H_ */