pidgin: d04a7e53: Use G_BEGIN/END_DECLS in public libpurpl..
qulogic at pidgin.im
qulogic at pidgin.im
Wed Jan 4 02:08:57 EST 2012
----------------------------------------------------------------------
Revision: d04a7e536bcefab217ed08532df97475a6adb882
Parent: 78c8d89c7ea5ba6b82e03f5a9462b85bd98f339d
Author: qulogic at pidgin.im
Date: 01/03/12 18:32:59
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/d04a7e536bcefab217ed08532df97475a6adb882
Changelog:
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.
Changes against parent 78c8d89c7ea5ba6b82e03f5a9462b85bd98f339d
patched libpurple/account.h
patched libpurple/accountopt.h
patched libpurple/blist.h
patched libpurple/buddyicon.h
patched libpurple/certificate.h
patched libpurple/circbuffer.h
patched libpurple/cmds.h
patched libpurple/connection.h
patched libpurple/conversation.h
patched libpurple/core.h
patched libpurple/dbus-bindings.h
patched libpurple/dbus-useful.h
patched libpurple/debug.h
patched libpurple/dnsquery.h
patched libpurple/dnssrv.h
patched libpurple/eventloop.h
patched libpurple/ft.h
patched libpurple/idle.h
patched libpurple/imgstore.h
patched libpurple/log.h
patched libpurple/media-gst.h
patched libpurple/media.h
patched libpurple/mediamanager.h
patched libpurple/mime.h
patched libpurple/nat-pmp.h
patched libpurple/network.h
patched libpurple/notify.h
patched libpurple/ntlm.h
patched libpurple/plugin.h
patched libpurple/pluginpref.h
patched libpurple/pounce.h
patched libpurple/prefs.h
patched libpurple/privacy.h
patched libpurple/proxy.h
patched libpurple/prpl.h
patched libpurple/request.h
patched libpurple/roomlist.h
patched libpurple/savedstatuses.h
patched libpurple/server.h
patched libpurple/signals.h
patched libpurple/smiley.h
patched libpurple/sound.h
patched libpurple/sslconn.h
patched libpurple/status.h
patched libpurple/stringref.h
patched libpurple/stun.h
patched libpurple/upnp.h
patched libpurple/util.h
patched libpurple/value.h
patched libpurple/whiteboard.h
patched libpurple/xmlnode.h
-------------- next part --------------
============================================================
--- libpurple/proxy.h 8accbffb37e646594884b153827cd44da9cc905b
+++ libpurple/proxy.h 12a8e5838426f4bb43dfa592a71035557637495c
@@ -56,9 +56,7 @@ typedef void (*PurpleProxyConnectFunctio
#include "account.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
/**************************************************************************/
/** @name Proxy structure API */
@@ -326,8 +324,6 @@ void purple_proxy_connect_cancel_with_ha
/*@}*/
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
#endif /* _PURPLE_PROXY_H_ */
============================================================
--- libpurple/prpl.h c4fa00ba5df1000f637df6e40b8d764dd2436b94
+++ libpurple/prpl.h 1ae7bb1d459bb65fcd87cf9276c06a3843295df0
@@ -621,9 +621,7 @@ struct _PurplePluginProtocolInfo
#define PURPLE_PLUGIN_PROTOCOL_INFO(plugin) \
((PurplePluginProtocolInfo *)(plugin)->info->extra_info)
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
/**************************************************************************/
/** @name Attention Type API */
@@ -951,8 +949,6 @@ PurplePlugin *purple_find_prpl(const cha
/*@}*/
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
#endif /* _PRPL_H_ */
============================================================
--- libpurple/core.h 2bdddafcdbb28a23fad8695496d96d5b08686fbb
+++ libpurple/core.h 558dce05a30cad8930b62b15c8594040dda1c014
@@ -76,9 +76,7 @@ typedef struct
void (*_purple_reserved3)(void);
} PurpleCoreUiOps;
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
/**
* Initializes the core of purple.
@@ -197,9 +195,7 @@ GHashTable* purple_core_get_ui_info(void
*/
GHashTable* purple_core_get_ui_info(void);
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
#endif /* _PURPLE_CORE_H_ */
============================================================
--- libpurple/conversation.h b0f0a42820a06953a73980cbf1734e3034f56fce
+++ libpurple/conversation.h 8e6737d3d795ff149f667fd640256b84cbae001d
@@ -249,9 +249,7 @@ struct _PurpleConversationUiOps
void (*_purple_reserved4)(void);
};
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
/**************************************************************************/
/** @name Conversation API */
@@ -1402,8 +1400,6 @@ void purple_conversations_uninit(void);
/*@}*/
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
#endif /* _PURPLE_CONVERSATION_H_ */
============================================================
--- libpurple/ft.h dd906b053187da009f745186df5b8c5671198056
+++ libpurple/ft.h 8d45e8ad12a6ac60079bd09f6f5e4b1a90012e00
@@ -184,9 +184,7 @@ struct _PurpleXfer
void *proto_data; /**< prpl-specific data. */
};
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
/**************************************************************************/
/** @name File Transfer API */
@@ -843,9 +841,7 @@ PurpleXferUiOps *purple_xfers_get_ui_ops
/*@}*/
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
#endif /* _PURPLE_FT_H_ */
============================================================
--- libpurple/sound.h 30093629843255e520d88f7c232dd66ab962159e
+++ libpurple/sound.h fe23a5f27a404858f698a3d8fa754aa72b43dc73
@@ -72,9 +72,7 @@ typedef struct _PurpleSoundUiOps
void (*_purple_reserved4)(void);
} PurpleSoundUiOps;
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
/**************************************************************************/
/** @name Sound API */
@@ -136,8 +134,6 @@ void *purple_sounds_get_handle(void);
/*@}*/
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
#endif /* _PURPLE_SOUND_H_ */
============================================================
--- libpurple/pounce.h 499a5d7ebe4a1be6ddd418e8d20368c21a347cb2
+++ libpurple/pounce.h 64c0aa804be593d30cd474c71189954b65e05203
@@ -59,9 +59,7 @@ typedef void (*PurplePounceCb)(PurplePou
/** A pounce callback. */
typedef void (*PurplePounceCb)(PurplePounce *, PurplePounceEvent, void *);
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
/**************************************************************************/
/** @name Buddy Pounce API */
@@ -354,8 +352,6 @@ void purple_pounces_uninit(void);
/*@}*/
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
#endif /* _PURPLE_POUNCE_H_ */
============================================================
--- libpurple/privacy.h 03378ca5a6c6c8af9bbd294ca1bb8c787eb5805e
+++ libpurple/privacy.h 03fe8ba9c513f997f3c4c1d01abf7affc98c0917
@@ -40,10 +40,6 @@ typedef enum
#include "account.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
/**
* Privacy core/UI operations.
*/
@@ -60,6 +56,8 @@ typedef struct
void (*_purple_reserved4)(void);
} PurplePrivacyUiOps;
+G_BEGIN_DECLS
+
/**
* Adds a user to the account's permit list.
*
@@ -187,8 +185,6 @@ void purple_privacy_init(void);
*/
void purple_privacy_init(void);
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
#endif /* _PURPLE_PRIVACY_H_ */
============================================================
--- libpurple/util.h 44d8b59f9e919c1bdb5be60237127d26c3642e3c
+++ libpurple/util.h c9a0bb8be56a4a3f322f06214757f06c664b7f40
@@ -58,10 +58,6 @@ typedef struct _PurpleKeyValuePair Purpl
#include "notify.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
typedef char *(*PurpleInfoFieldFormatCallback)(const char *field, size_t len);
struct _PurpleKeyValuePair
@@ -71,6 +67,8 @@ struct _PurpleKeyValuePair
};
+G_BEGIN_DECLS
+
/**
* Creates a new PurpleMenuAction.
*
@@ -1459,8 +1457,6 @@ gchar *purple_uuid_random(void);
*/
gchar *purple_uuid_random(void);
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
#endif /* _PURPLE_UTIL_H_ */
============================================================
--- libpurple/plugin.h 9490a14a777df5db74357039be3e45edff1e8324
+++ libpurple/plugin.h cdf947b79a19c38d26ad6f4ce26a51730e7a4a99
@@ -239,9 +239,7 @@ struct _PurplePluginAction {
#endif
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
/**************************************************************************/
/** @name Plugin API */
@@ -663,8 +661,6 @@ void purple_plugin_action_free(PurplePlu
*/
void purple_plugin_action_free(PurplePluginAction *action);
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
#endif /* _PURPLE_PLUGIN_H_ */
============================================================
--- libpurple/debug.h 953d02706b77c840054be3a7dd86d68be9f98925
+++ libpurple/debug.h 93d449626eb8ffe7923091466c0a116155e21ea9
@@ -59,9 +59,7 @@ typedef struct
void (*_purple_reserved4)(void);
} PurpleDebugUiOps;
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
/**************************************************************************/
/** @name Debug API */
@@ -228,8 +226,6 @@ void purple_debug_init(void);
/*@}*/
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
#endif /* _PURPLE_DEBUG_H_ */
============================================================
--- libpurple/blist.h e8112c0978fc5773f75801df4caf016b417b7eea
+++ libpurple/blist.h 40d9ff9d90555932795e182096d851e6a580f6c9
@@ -244,9 +244,7 @@ struct _PurpleBlistUiOps
void (*_purple_reserved1)(void);
};
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
/**************************************************************************/
/** @name Buddy List API */
@@ -1202,8 +1200,6 @@ void purple_blist_uninit(void);
/*@}*/
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
#endif /* _PURPLE_BLIST_H_ */
============================================================
--- libpurple/notify.h 5c94bb2a3af6824ca4d0cda1fe44c233511bae6c
+++ libpurple/notify.h 228d22418a4797e9ab506bfa07c1e1f18d441207
@@ -175,9 +175,7 @@ typedef struct
} PurpleNotifyUiOps;
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
/**************************************************************************/
@@ -734,8 +732,6 @@ void purple_notify_uninit(void);
/*@}*/
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
#endif /* _PURPLE_NOTIFY_H_ */
============================================================
--- libpurple/prefs.h 96616faf790ad983d3cdb7d8cd49cd776f51bbc7
+++ libpurple/prefs.h 22786149ef7b9103aeb2903e8a3819e8dea6e3b9
@@ -62,9 +62,7 @@ typedef void (*PurplePrefCallback) (cons
typedef void (*PurplePrefCallback) (const char *name, PurplePrefType type,
gconstpointer val, gpointer data);
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
/**************************************************************************/
/** @name Prefs API
@@ -362,8 +360,6 @@ void purple_prefs_update_old(void);
/*@}*/
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
#endif /* _PURPLE_PREFS_H_ */
============================================================
--- libpurple/request.h 7470e8c9ba6e2ec79dbb946ad68d5b4740d827eb
+++ libpurple/request.h dd4070ebb0dbe574885c0425c7bca2d7d7cb623a
@@ -158,9 +158,7 @@ typedef void (*PurpleRequestFileCb)(void
typedef void (*PurpleRequestFieldsCb)(void *, PurpleRequestFields *fields);
typedef void (*PurpleRequestFileCb)(void *, const char *filename);
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
/**************************************************************************/
/** @name Field List API */
@@ -1527,8 +1525,6 @@ PurpleRequestUiOps *purple_request_get_u
/*@}*/
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
#endif /* _PURPLE_REQUEST_H_ */
============================================================
--- libpurple/account.h 1b1cfdea540c3749c52bb6252274779b78350cb6
+++ libpurple/account.h 49c3547ca95ee816bac92e71424a650eb525f975
@@ -171,9 +171,7 @@ struct _PurpleAccount
PurpleConnectionErrorInfo *current_error; /**< Errors */
};
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
/**************************************************************************/
/** @name Account API */
@@ -1191,8 +1189,6 @@ void purple_accounts_uninit(void);
/*@}*/
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
#endif /* _PURPLE_ACCOUNT_H_ */
============================================================
--- libpurple/connection.h 7d28070255aadfd8e25213fdeb2a6fc63bd512a5
+++ libpurple/connection.h cf033828a08f814c94a3a24deedb37f72126a54c
@@ -258,9 +258,7 @@ struct _PurpleConnection
prpl to avoid sending unneeded keepalives */
};
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
/**************************************************************************/
/** @name Connection API */
@@ -543,8 +541,6 @@ void *purple_connections_get_handle(void
/*@}*/
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
#endif /* _PURPLE_CONNECTION_H_ */
============================================================
--- libpurple/accountopt.h 6fb3f74e2639a79103025c11b27cbb0702eaf2ed
+++ libpurple/accountopt.h f7e0b67fc994783660cf8b5ee55485770cf9dfdd
@@ -37,11 +37,8 @@ typedef struct _PurpleAccountUserSplit P
/** @copydoc _PurpleAccountUserSplit */
typedef struct _PurpleAccountUserSplit PurpleAccountUserSplit;
+G_BEGIN_DECLS
-#ifdef __cplusplus
-extern "C" {
-#endif
-
/**************************************************************************/
/** @name Account Option API */
/**************************************************************************/
@@ -353,8 +350,6 @@ void purple_account_user_split_set_rever
/*@}*/
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
#endif /* _PURPLE_ACCOUNTOPT_H_ */
============================================================
--- libpurple/log.h 0edac1da98c11c1936b7948a963507e6f378ea91
+++ libpurple/log.h 98180178600dfeabdaf205063fa1d360eecdb11c
@@ -181,9 +181,7 @@ struct _PurpleLogSet {
* IMPORTANT: Update that code if you add members here. */
};
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
/***************************************/
/** @name Log Functions */
@@ -574,8 +572,6 @@ void purple_log_uninit(void);
/*@}*/
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
#endif /* _PURPLE_LOG_H_ */
============================================================
--- libpurple/server.h aa2992d9f813d62e61f234e5a81b139230d5b89f
+++ libpurple/server.h 4612b14a073ec00c2e83842ad16e218b3c541335
@@ -30,9 +30,7 @@
#include "conversation.h"
#include "prpl.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
/**
* Send a typing message to a given user over a given connection.
@@ -185,8 +183,7 @@ void serv_send_file(PurpleConnection *gc
PurpleMessageFlags flags, const char *message, time_t mtime);
void serv_send_file(PurpleConnection *gc, const char *who, const char *file);
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
#endif /* _PURPLE_SERVER_H_ */
+
============================================================
--- libpurple/status.h 76bd1e123d36bdeb5f5dc7f745a56705606cb605
+++ libpurple/status.h a4ff60962412409e8b8dd1c70aff0e175658cba7
@@ -148,9 +148,7 @@ typedef enum
#define PURPLE_MOOD_NAME "mood"
#define PURPLE_MOOD_COMMENT "moodtext"
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
/**************************************************************************/
/** @name PurpleStatusPrimitive API */
@@ -945,8 +943,7 @@ void purple_status_uninit(void);
/*@}*/
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
#endif /* _PURPLE_STATUS_H_ */
+
============================================================
--- libpurple/signals.h f2e4abc4cce9bd0cdb659f0bf88180aa1005723e
+++ libpurple/signals.h 4d012181cf81692365eef380b2db1ae232d05f7b
@@ -35,9 +35,7 @@ typedef void (*PurpleSignalMarshalFunc)(
typedef void (*PurpleSignalMarshalFunc)(PurpleCallback cb, va_list args,
void *data, void **return_val);
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
/**************************************************************************/
/** @name Signal API */
@@ -373,8 +371,7 @@ void purple_marshal_POINTER__POINTER_POI
PurpleCallback cb, va_list args, void *data, void **return_val);
/*@}*/
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
#endif /* _PURPLE_SIGNALS_H_ */
+
============================================================
--- libpurple/value.h ca533ddfea5937c410bf315a1fa288b7eeaf089a
+++ libpurple/value.h edeb6753c1d23eaedc5bb8e6d1c307112fb4a706
@@ -88,9 +88,7 @@ typedef struct _PurpleValue PurpleValue;
*/
typedef struct _PurpleValue PurpleValue;
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
/**
* Creates a new PurpleValue.
@@ -464,8 +462,6 @@ void *purple_value_get_boxed(const Purpl
*/
void *purple_value_get_boxed(const PurpleValue *value);
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
#endif /* _PURPLE_VALUE_H_ */
============================================================
--- libpurple/sslconn.h cc5210a131c86bd8dc61876fbaaaa19da735b001
+++ libpurple/sslconn.h b0fcd3a830093eba05e47225214ccfe67c89e2b9
@@ -140,9 +140,7 @@ typedef struct
void (*_purple_reserved4)(void);
} PurpleSslOps;
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
/**************************************************************************/
/** @name SSL API */
@@ -311,8 +309,6 @@ void purple_ssl_uninit(void);
/*@}*/
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
#endif /* _PURPLE_SSLCONN_H_ */
============================================================
--- libpurple/buddyicon.h 1bfd811e67d43946eeb9354158d7c9edeba41655
+++ libpurple/buddyicon.h 504f91d05621a402b58bd7118c6cf6354615fe68
@@ -39,11 +39,8 @@ typedef struct _PurpleBuddyIcon PurpleBu
#include "prpl.h"
#include "util.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
-
/**************************************************************************/
/** @name Buddy Icon API */
/**************************************************************************/
@@ -397,8 +394,6 @@ void purple_buddy_icon_get_scale_size(Pu
/*@}*/
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
#endif /* _PURPLE_BUDDYICON_H_ */
============================================================
--- libpurple/imgstore.h 986f77512b321b47e1f370d637ba2db7663fc195
+++ libpurple/imgstore.h 513849405784e0aa495507a5ef8d607d7d764124
@@ -34,9 +34,7 @@ typedef struct _PurpleStoredImage Purple
*/
typedef struct _PurpleStoredImage PurpleStoredImage;
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
/**
* Add an image to the store.
@@ -206,8 +204,6 @@ void purple_imgstore_uninit(void);
*/
void purple_imgstore_uninit(void);
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
#endif /* _PURPLE_IMGSTORE_H_ */
============================================================
--- libpurple/xmlnode.h 5908475d5f2b76bc27c23a0f926e513224d1b0c0
+++ libpurple/xmlnode.h 85a9682bc54ff4f95beb22697eabe39343e5b7ab
@@ -28,10 +28,6 @@
#include <glib.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-
/**
* The valid types for an xmlnode
*/
@@ -61,6 +57,8 @@ struct _xmlnode
GHashTable *namespace_map; /**< The namespace map. */
};
+G_BEGIN_DECLS
+
/**
* Creates a new xmlnode.
*
@@ -360,9 +358,7 @@ xmlnode *xmlnode_from_file(const char *d
xmlnode *xmlnode_from_file(const char *dir, const char *filename,
const char *description, const char *process);
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
#endif /* _PURPLE_XMLNODE_H_ */
============================================================
--- libpurple/stringref.h ba5428fc886f1b6e4bc3c2d5abd9b300562f6177
+++ libpurple/stringref.h a9e3fd2e70324ed1f5d135831abeda126bfa9c41
@@ -29,11 +29,9 @@
#ifndef _PURPLE_STRINGREF_H_
#define _PURPLE_STRINGREF_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
+typedef struct _PurpleStringref PurpleStringref;
-typedef struct _PurpleStringref PurpleStringref;
+G_BEGIN_DECLS
/**
* Creates an immutable reference-counted string object. The newly
@@ -131,8 +129,6 @@ size_t purple_stringref_len(const Purple
*/
size_t purple_stringref_len(const PurpleStringref *stringref);
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
#endif /* _PURPLE_STRINGREF_H_ */
============================================================
--- libpurple/roomlist.h a9488ea8f08ee5985cab0edb2deb6998c16cea13
+++ libpurple/roomlist.h b6ad619ab3159b5c6b09acc34022e8e2379a7335
@@ -81,9 +81,7 @@ struct _PurpleRoomlistUiOps {
};
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
/**************************************************************************/
/** @name Room List API */
@@ -412,8 +410,6 @@ PurpleRoomlistUiOps *purple_roomlist_get
/*@}*/
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
#endif /* _PURPLE_ROOMLIST_H_ */
============================================================
--- libpurple/network.h 4d5b843e10702d86e4effc4c4d52a9226927396f
+++ libpurple/network.h 0ed322a1a1d513b3a6e735cec958e10d3a70c4e7
@@ -26,10 +26,10 @@
#ifndef _PURPLE_NETWORK_H_
#define _PURPLE_NETWORK_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <glib.h>
+G_BEGIN_DECLS
+
/**************************************************************************/
/** @name Network API */
/**************************************************************************/
@@ -316,8 +316,6 @@ void purple_network_uninit(void);
/*@}*/
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
#endif /* _PURPLE_NETWORK_H_ */
============================================================
--- libpurple/eventloop.h b02d72c5ce4fa2064c69891ee6faa57803890256
+++ libpurple/eventloop.h 0eb5204960bacae171ba2fb9f5d9ce2f06d526f3
@@ -28,10 +28,6 @@
#include <glib.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-
/**
* An input condition.
*/
@@ -154,6 +150,8 @@ struct _PurpleEventLoopUiOps
void (*_purple_reserved4)(void);
};
+G_BEGIN_DECLS
+
/**************************************************************************/
/** @name Event Loop API */
/**************************************************************************/
@@ -266,8 +264,6 @@ PurpleEventLoopUiOps *purple_eventloop_g
/*@}*/
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
#endif /* _PURPLE_EVENTLOOP_H_ */
============================================================
--- libpurple/pluginpref.h 9eeb7193d708790b45548ffcb82d244ff9ab2230
+++ libpurple/pluginpref.h 065b4f0af7c76d9335d0f488ba0bbdda4496884f
@@ -50,9 +50,7 @@ typedef enum {
#include <glib.h>
#include "prefs.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
/**************************************************************************/
/** @name Plugin Preference API */
@@ -262,8 +260,6 @@ PurpleStringFormatType purple_plugin_pre
/*@}*/
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
#endif /* _PURPLE_PLUGINPREF_H_ */
============================================================
--- libpurple/cmds.h 0a8d713282bfe229eb7754bd3ed095ccbd49a707
+++ libpurple/cmds.h c1bf94e4b168e30667f2e6607abacb21c12c147e
@@ -99,9 +99,7 @@ typedef enum {
/*@}*/
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
/**************************************************************************/
/** @name Commands API */
@@ -240,8 +238,6 @@ void purple_cmds_uninit(void);
/*@}*/
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
#endif /* _PURPLE_CMDS_H_ */
============================================================
--- libpurple/savedstatuses.h b141ec2b5344dd3b0ca9c9007abb703bed5bbb63
+++ libpurple/savedstatuses.h ac40e5987ef31ffae371c400109c93af4b829f13
@@ -60,9 +60,7 @@ typedef struct _PurpleSavedStatusSub Pu
#include "status.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
/**************************************************************************/
/** @name Saved status subsystem */
@@ -418,8 +416,7 @@ void purple_savedstatuses_uninit(void);
/*@}*/
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
#endif /* _PURPLE_SAVEDSTATUSES_H_ */
+
============================================================
--- libpurple/mime.h f7adbecabf2a66395089be104c1ea7ff359d7e62
+++ libpurple/mime.h 40810a6d251f7bb6094a48188d71f789ed2cf513
@@ -26,10 +26,6 @@
#include <glib.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-
/**
* @file mime.h
* @ingroup core
@@ -48,6 +44,8 @@ typedef struct _PurpleMimePart PurpleMim
*/
typedef struct _PurpleMimePart PurpleMimePart;
+G_BEGIN_DECLS
+
/**
* Allocate an empty MIME document.
*/
@@ -211,8 +209,6 @@ void purple_mime_part_set_data(PurpleMim
void purple_mime_part_set_data(PurpleMimePart *part, const char *data);
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
#endif
============================================================
--- libpurple/dbus-useful.h 4d1b041bbe14d141132f74b2b7e565de11738454
+++ libpurple/dbus-useful.h b0e963f60dd75b0f970a6f85ba745527533d6b41
@@ -1,5 +1,7 @@
#include "conversation.h"
+G_BEGIN_DECLS
+
PurpleAccount *purple_accounts_find_ext(const char *name, const char *protocol_id,
gboolean (*account_test)(const PurpleAccount *account));
@@ -7,7 +9,5 @@ PurpleAccount *purple_accounts_find_conn
PurpleAccount *purple_accounts_find_connected(const char *name, const char *protocol);
+G_END_DECLS
-
-
-
============================================================
--- libpurple/dbus-bindings.h bebbe1122b524f649d0f49dee33ac45381c66db1
+++ libpurple/dbus-bindings.h 470c5ca68d5d564eeed3a8c3c6b9f39292a542ca
@@ -32,9 +32,7 @@
#include <dbus/dbus-glib-lowlevel.h>
#include <glib.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
gint purple_dbus_pointer_to_id(gconstpointer node);
gpointer purple_dbus_id_to_pointer(gint id, PurpleDBusType *type);
@@ -103,8 +101,6 @@ DBusConnection *purple_dbus_get_connecti
DBusConnection *purple_dbus_get_connection(void);
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
#endif
============================================================
--- libpurple/upnp.h 2ea60a027418eebaf076911ff392883f19ff2791
+++ libpurple/upnp.h 54ccf5f401c53a97522b44d9c064ee93ec0199fd
@@ -29,9 +29,7 @@ typedef struct _UPnPMappingAddRemove UPn
typedef struct _UPnPMappingAddRemove UPnPMappingAddRemove;
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
/**************************************************************************/
/** @name UPnP API */
@@ -125,8 +123,6 @@ UPnPMappingAddRemove *purple_upnp_remove
/*@}*/
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
#endif /* _PURPLE_UPNP_H_ */
============================================================
--- libpurple/stun.h 557efdb5016165d2b0146ae90a65a6d8f0228752
+++ libpurple/stun.h a3cbf53d7378441ff60ec478898d5e68a0c06df8
@@ -26,10 +26,6 @@
#ifndef _PURPLE_STUN_H_
#define _PURPLE_STUN_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
-
/**************************************************************************/
/** @name STUN API */
/**************************************************************************/
@@ -63,6 +59,8 @@ typedef void (*StunCallback) (PurpleStun
typedef void (*StunCallback) (PurpleStunNatDiscovery *);
+G_BEGIN_DECLS
+
/**
* Starts a NAT discovery. It returns a PurpleStunNatDiscovery if the discovery
* is already done. Otherwise the callback is called when the discovery is over
@@ -81,8 +79,6 @@ void purple_stun_init(void);
/*@}*/
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
#endif /* _PURPLE_STUN_H_ */
============================================================
--- libpurple/dnssrv.h 825eeaed2a50a30082cb00795b997d0ee7de808b
+++ libpurple/dnssrv.h 0c5fdb6db2fcc02e6a238211c907993ee811e7a4
@@ -24,10 +24,6 @@
#ifndef _PURPLE_DNSSRV_H
#define _PURPLE_DNSSRV_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
typedef struct _PurpleSrvTxtQueryData PurpleSrvTxtQueryData;
typedef struct _PurpleSrvResponse PurpleSrvResponse;
typedef struct _PurpleTxtResponse PurpleTxtResponse;
@@ -96,6 +92,8 @@ typedef void (*PurpleTxtCallback)(GList
*/
typedef void (*PurpleTxtCallback)(GList *responses, gpointer data);
+G_BEGIN_DECLS
+
/**
* Queries an SRV record.
*
@@ -184,9 +182,7 @@ int purple_srv_txt_query_get_type(Purple
*/
int purple_srv_txt_query_get_type(PurpleSrvTxtQueryData *query_data);
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
#endif /* _PURPLE_DNSSRV_H */
============================================================
--- libpurple/ntlm.h 7c1502b700ebf85e66166a0c4c7ed807b02c2d0a
+++ libpurple/ntlm.h 3c1e8141a1054240a6eb322fe8f818249ee3f755
@@ -27,9 +27,7 @@
#ifndef _PURPLE_NTLM_H
#define _PURPLE_NTLM_H
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
/**
* Generates the base64 encoded type 1 message needed for NTLM authentication
@@ -66,8 +64,6 @@ gchar *purple_ntlm_gen_type3(const gchar
*/
gchar *purple_ntlm_gen_type3(const gchar *username, const gchar *passw, const gchar *hostname, const gchar *domain, const guint8 *nonce, guint32 *flags);
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
#endif /* _PURPLE_NTLM_H */
============================================================
--- libpurple/whiteboard.h 95273da6e3fcb7cd06a9006d802fe210ed69a232
+++ libpurple/whiteboard.h c36e9874bc33ecc309d8f18c3575a9babfeb9ad1
@@ -79,9 +79,7 @@ struct _PurpleWhiteboardPrplOps
void (*_purple_reserved4)(void);
};
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
/******************************************************************************/
/** @name PurpleWhiteboard API */
@@ -330,8 +328,6 @@ gpointer purple_whiteboard_get_ui_data(c
/*@}*/
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
#endif /* _PURPLE_WHITEBOARD_H_ */
============================================================
--- libpurple/idle.h e0e45a46f2d7c4dddd51f5df46233b58dd70157d
+++ libpurple/idle.h c755e6ef259d5888031838c0a56cf9e0aacad871
@@ -41,9 +41,7 @@ typedef struct
void (*_purple_reserved4)(void);
} PurpleIdleUiOps;
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
/**************************************************************************/
/** @name Idle API */
@@ -97,8 +95,6 @@ void purple_idle_uninit(void);
/*@}*/
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
#endif /* _PURPLE_IDLE_H_ */
============================================================
--- libpurple/circbuffer.h 423fc024a802905912c62da588be2273fa94fb89
+++ libpurple/circbuffer.h 8fc331133d06bc4fd34332c3da2d831d30476876
@@ -26,10 +26,6 @@
#include <glib.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-
typedef struct _PurpleCircBuffer {
/** A pointer to the starting address of our chunk of memory. */
@@ -55,6 +51,8 @@ typedef struct _PurpleCircBuffer {
} PurpleCircBuffer;
+G_BEGIN_DECLS
+
/**
* Creates a new circular buffer. This will not allocate any memory for the
* actual buffer until data is appended to it.
@@ -111,8 +109,6 @@ gboolean purple_circ_buffer_mark_read(Pu
*/
gboolean purple_circ_buffer_mark_read(PurpleCircBuffer *buf, gsize len);
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
#endif /* _CIRCBUFFER_H */
============================================================
--- libpurple/dnsquery.h 9535c9eb1ab6c5e3a391ff5b8d9b148df37e745f
+++ libpurple/dnsquery.h 1befb7d8914604f4608cb92a8bfa207c3d3d6c78
@@ -76,9 +76,7 @@ typedef struct
void (*_purple_reserved4)(void);
} PurpleDnsQueryUiOps;
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
/**************************************************************************/
/** @name DNS query API */
@@ -154,8 +152,6 @@ void purple_dnsquery_uninit(void);
/*@}*/
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
#endif /* _PURPLE_DNSQUERY_H_ */
============================================================
--- libpurple/nat-pmp.h bdd85a3d88701be416dd3109e4776d7c8f1664c3
+++ libpurple/nat-pmp.h cf97dd2bf71b2458c09c84bd56bc504b42b39af0
@@ -41,6 +41,8 @@ typedef enum {
PURPLE_PMP_TYPE_TCP
} PurplePmpType;
+G_BEGIN_DECLS
+
/**
* Initialize nat-pmp
*/
@@ -73,5 +75,7 @@ gboolean purple_pmp_destroy_map(PurplePm
*/
gboolean purple_pmp_destroy_map(PurplePmpType type, unsigned short privateport);
+G_END_DECLS
+
#endif
============================================================
--- libpurple/certificate.h 5d633be617de911eac5f7758f1c36c88aa4e835e
+++ libpurple/certificate.h e37ec24bfa59f7b09286122c35d8c0ba888e61e9
@@ -34,11 +34,6 @@
#include <glib.h>
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
typedef enum
{
PURPLE_CERTIFICATE_INVALID = 0,
@@ -357,6 +352,8 @@ struct _PurpleCertificateVerificationReq
gpointer cb_data;
};
+G_BEGIN_DECLS
+
/*****************************************************************************/
/** @name Certificate Verification Functions */
/*****************************************************************************/
@@ -833,8 +830,6 @@ void purple_certificate_add_ca_search_pa
*/
void purple_certificate_add_ca_search_path(const char *path);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
#endif /* _PURPLE_CERTIFICATE_H */
============================================================
--- libpurple/media.h 0916e8525a5d2247daab3763459179a7e78ca2fb
+++ libpurple/media.h beced1994c3beb7c533185c4174ca6a8e9d865f1
@@ -27,14 +27,12 @@
#ifndef _PURPLE_MEDIA_H_
#define _PURPLE_MEDIA_H_
-#include "media/candidate.h"
-#include "media/codec.h"
-#include "media/enum-types.h"
-
#include <glib.h>
#include <glib-object.h>
-G_BEGIN_DECLS
+#include "media/candidate.h"
+#include "media/codec.h"
+#include "media/enum-types.h"
#define PURPLE_TYPE_MEDIA (purple_media_get_type())
#define PURPLE_MEDIA(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), PURPLE_TYPE_MEDIA, PurpleMedia))
@@ -49,9 +47,7 @@ typedef struct _PurpleMedia PurpleMedia;
#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(
*/
void purple_media_remove_output_windows(PurpleMedia *media);
-#ifdef __cplusplus
-}
-#endif
-
G_END_DECLS
#endif /* _PURPLE_MEDIA_H_ */
============================================================
--- libpurple/mediamanager.h 0a60e6949deb5ed3ecf5a0925b83cc9b172ebd13
+++ libpurple/mediamanager.h ceddfbe8ea306ee6b5a041a0e6fe8fff560a5567
@@ -38,8 +38,6 @@ typedef struct _PurpleMediaManagerClass
#include "account.h"
#include "media.h"
-G_BEGIN_DECLS
-
#define PURPLE_TYPE_MEDIA_MANAGER (purple_media_manager_get_type())
#define PURPLE_MEDIA_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), PURPLE_TYPE_MEDIA_MANAGER, PurpleMediaManager))
#define PURPLE_MEDIA_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), PURPLE_TYPE_MEDIA_MANAGER, PurpleMediaManagerClass))
@@ -47,9 +45,7 @@ G_BEGIN_DECLS
#define PURPLE_IS_MEDIA_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), PURPLE_TYPE_MEDIA_MANAGER))
#define PURPLE_MEDIA_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), PURPLE_TYPE_MEDIA_MANAGER, PurpleMediaManagerClass))
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
/**************************************************************************/
/** @name Media Manager API */
@@ -209,10 +205,6 @@ GType purple_media_manager_get_backend_t
/*}@*/
-#ifdef __cplusplus
-}
-#endif
-
G_END_DECLS
#endif /* _PURPLE_MEDIA_MANAGER_H_ */
============================================================
--- libpurple/smiley.h aed301f685799b3255c89bdde291c2545065af0d
+++ libpurple/smiley.h 295fa8603af177336b39daeb27e43d7d3108857f
@@ -50,9 +50,7 @@ typedef struct _PurpleSmileyClass Purp
#define PURPLE_IS_SMILEY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PURPLE_TYPE_SMILEY))
#define PURPLE_SMILEY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PURPLE_TYPE_SMILEY, PurpleSmileyClass))
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
/**************************************************************************/
/** @name Custom Smiley API */
@@ -253,9 +251,7 @@ void purple_smileys_uninit(void);
/*@}*/
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
#endif /* _PURPLE_SMILEY_H_ */
============================================================
--- libpurple/media-gst.h e550602d051b926df7f5560baf307c88190fc972
+++ libpurple/media-gst.h e3b10c48111231639cad56f632c5c3157c0518d6
@@ -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_ca
PurpleMediaElementInfo *info, PurpleMedia *media,
const gchar *session_id, const gchar *participant);
-#ifdef __cplusplus
-}
-#endif
-
G_END_DECLS
#endif /* _PURPLE_MEDIA_GST_H_ */
More information about the Commits
mailing list