Mercurial > pidgin
comparison libpurple/mediamanager.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.
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Tue, 03 Jan 2012 23:32:59 +0000 |
parents | 02a2e8183b1d |
children |
comparison
equal
deleted
inserted
replaced
32432:79fdae8fa875 | 32433:98520ee78f12 |
---|---|
35 /** The GObject class structure of the PurpleMediaManager object. */ | 35 /** The GObject class structure of the PurpleMediaManager object. */ |
36 typedef struct _PurpleMediaManagerClass PurpleMediaManagerClass; | 36 typedef struct _PurpleMediaManagerClass PurpleMediaManagerClass; |
37 | 37 |
38 #include "account.h" | 38 #include "account.h" |
39 #include "media.h" | 39 #include "media.h" |
40 | |
41 G_BEGIN_DECLS | |
42 | 40 |
43 #define PURPLE_TYPE_MEDIA_MANAGER (purple_media_manager_get_type()) | 41 #define PURPLE_TYPE_MEDIA_MANAGER (purple_media_manager_get_type()) |
44 #define PURPLE_MEDIA_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), PURPLE_TYPE_MEDIA_MANAGER, PurpleMediaManager)) | 42 #define PURPLE_MEDIA_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), PURPLE_TYPE_MEDIA_MANAGER, PurpleMediaManager)) |
45 #define PURPLE_MEDIA_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), PURPLE_TYPE_MEDIA_MANAGER, PurpleMediaManagerClass)) | 43 #define PURPLE_MEDIA_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), PURPLE_TYPE_MEDIA_MANAGER, PurpleMediaManagerClass)) |
46 #define PURPLE_IS_MEDIA_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), PURPLE_TYPE_MEDIA_MANAGER)) | 44 #define PURPLE_IS_MEDIA_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), PURPLE_TYPE_MEDIA_MANAGER)) |
47 #define PURPLE_IS_MEDIA_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), PURPLE_TYPE_MEDIA_MANAGER)) | 45 #define PURPLE_IS_MEDIA_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), PURPLE_TYPE_MEDIA_MANAGER)) |
48 #define PURPLE_MEDIA_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), PURPLE_TYPE_MEDIA_MANAGER, PurpleMediaManagerClass)) | 46 #define PURPLE_MEDIA_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), PURPLE_TYPE_MEDIA_MANAGER, PurpleMediaManagerClass)) |
49 | 47 |
50 #ifdef __cplusplus | 48 G_BEGIN_DECLS |
51 extern "C" { | |
52 #endif | |
53 | 49 |
54 /**************************************************************************/ | 50 /**************************************************************************/ |
55 /** @name Media Manager API */ | 51 /** @name Media Manager API */ |
56 /**************************************************************************/ | 52 /**************************************************************************/ |
57 /*@{*/ | 53 /*@{*/ |
207 */ | 203 */ |
208 GType purple_media_manager_get_backend_type(PurpleMediaManager *manager); | 204 GType purple_media_manager_get_backend_type(PurpleMediaManager *manager); |
209 | 205 |
210 /*}@*/ | 206 /*}@*/ |
211 | 207 |
212 #ifdef __cplusplus | |
213 } | |
214 #endif | |
215 | |
216 G_END_DECLS | 208 G_END_DECLS |
217 | 209 |
218 #endif /* _PURPLE_MEDIA_MANAGER_H_ */ | 210 #endif /* _PURPLE_MEDIA_MANAGER_H_ */ |