diff libpurple/media.h @ 32433:98520ee78f12

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.

--- a/libpurple/media.h	Tue Jan 03 19:29:43 2012 +0000
+++ b/libpurple/media.h	Tue Jan 03 23:32:59 2012 +0000
@@ -27,15 +27,13 @@
 #ifndef _PURPLE_MEDIA_H_
 #define _PURPLE_MEDIA_H_
 
+#include <glib.h>
+#include <glib-object.h>
+
 #include "media/candidate.h"
 #include "media/codec.h"
 #include "media/enum-types.h"
 
-#include <glib.h>
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
 #define PURPLE_TYPE_MEDIA            (purple_media_get_type())
 #define PURPLE_MEDIA(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), PURPLE_TYPE_MEDIA, PurpleMedia))
 #define PURPLE_MEDIA_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), PURPLE_TYPE_MEDIA, PurpleMediaClass))
@@ -49,9 +47,7 @@
 #include "signals.h"
 #include "util.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
 
 /**
  * Gets the media class's GType
@@ -379,10 +375,6 @@
  */
 void purple_media_remove_output_windows(PurpleMedia *media);
 
-#ifdef __cplusplus
-}
-#endif
-
 G_END_DECLS
 
 #endif  /* _PURPLE_MEDIA_H_ */