summaryrefslogtreecommitdiff
path: root/libpurple/media-gst.h
diff options
context:
space:
mode:
authorElliott Sales de Andrade <qulogic@pidgin.im>2012-01-03 23:32:59 +0000
committerElliott Sales de Andrade <qulogic@pidgin.im>2012-01-03 23:32:59 +0000
commit1d7d489a65aa6485a0a47942334e0a498ba0ec3e (patch)
tree4cfb66486145c7669d842589946bbf92df0ea580 /libpurple/media-gst.h
parent180b887f86978ea92355b776a10475289b3dfecb (diff)
downloadpidgin-1d7d489a65aa6485a0a47942334e0a498ba0ec3e.tar.gz
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.
Diffstat (limited to 'libpurple/media-gst.h')
-rw-r--r--libpurple/media-gst.h10
1 files changed, 1 insertions, 9 deletions
diff --git a/libpurple/media-gst.h b/libpurple/media-gst.h
index 32d2b3c9d2..37581ec4f9 100644
--- a/libpurple/media-gst.h
+++ b/libpurple/media-gst.h
@@ -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 @@ typedef enum {
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 @@ GstElement *purple_media_element_info_call_create(
PurpleMediaElementInfo *info, PurpleMedia *media,
const gchar *session_id, const gchar *participant);
-#ifdef __cplusplus
-}
-#endif
-
G_END_DECLS
#endif /* _PURPLE_MEDIA_GST_H_ */